Project

General

Profile

« Previous | Next » 

Revision 5030

Added by daigle over 14 years ago

Change location of PropertyService to properties directory

View differences:

LoginAdmin.java
89 89 
				RequestUtil.forwardRequest(request, response,
90 90 
						"/admin/admin-login.jsp", null);
91 91 
			} catch (MetacatUtilException mue) {
92 
				throw new AdminException("Utility problem while processing login page: "
93 
						+ mue.getMessage());
92 
				throw new AdminException("LoginAdmin.authenticateUser - Utility problem while " +
93 
						"processing login page: " + mue.getMessage());
94 94 
			} catch (IOException ioe) {
95 
				throw new AdminException("IO problem while initializing "
95 
				throw new AdminException("LoginAdmin.authenticateUser -IO problem while initializing "
96 96 
						+ "user login page:" + ioe.getMessage());
97 97 
			} catch (ServletException se) {
98 
				throw new AdminException("problem forwarding request while "
98 
				throw new AdminException("LoginAdmin.authenticateUser -problem forwarding request while "
99 99 
						+ "initializing user login page: " + se.getMessage());
100 100 
			}
101 101 
		} else {
......
121 121 
					try {
122 122 
						isLoggedIn = AuthUtil.logUserIn(request, userName, password);
123 123 
					} catch (MetacatUtilException ue) {
124 
						String errorMessage = "Could not log in as: " + userName
124 
						String errorMessage = "LoginAdmin.authenticateUser - Could not log in as: " + userName
125 125 
						+ " : " + ue.getMessage() + ". Please try again";
126 126 
						processingErrors.add(errorMessage);
127 127 
						logMetacat.error(errorMessage);
......
144 144 
							"/admin?configureType=configure&processForm=false", null);
145 145 
				}
146 146 
			} catch (IOException ioe) {
147 
				throw new AdminException("IO problem while processing login page: "
147 
				throw new AdminException("LoginAdmin.authenticateUser - IO problem while processing login page: "
148 148 
						+ ioe.getMessage());
149 149 
			} catch (ServletException se) {
150 
				throw new AdminException("problem forwarding request while "
150 
				throw new AdminException("LoginAdmin.authenticateUser - problem forwarding request while "
151 151 
						+ "processoing login page: " + se.getMessage());
152 152 
			}
153 153 
		}

Also available in: Unified diff