Project

General

Profile

« Previous | Next » 

Revision 5030

Added by daigle over 14 years ago

Change location of PropertyService to properties directory

View differences:

AuthAdmin.java
39 39 
import org.apache.log4j.Logger;
40 40 

  		




  41
  41
  
    
import edu.ucsb.nceas.metacat.AuthSession;


  		




  42
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  42
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  43
  43
  
    
import edu.ucsb.nceas.metacat.util.RequestUtil;


  		




  44
  44
  
    
import edu.ucsb.nceas.utilities.GeneralPropertyException;


  		




  45
  45
  
    
import edu.ucsb.nceas.utilities.MetaDataProperty;


  		




  46
  46
  
    
import edu.ucsb.nceas.utilities.PropertiesMetaData;


  		




  47
  
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  48
  47
  
    
import edu.ucsb.nceas.utilities.SortedProperties;


  		




  49
  48
  
    
import edu.ucsb.nceas.utilities.StringUtil;


  		




  50
  49
  
    

  		




  ......




  133
  132
  
    
				// Forward the request to the JSP page


  		




  134
  133
  
    
				RequestUtil.forwardRequest(request, response,


  		




  135
  134
  
    
						"/admin/auth-configuration.jsp", null);


  		




  136
  
  
    
			} catch (PropertyNotFoundException pnfe) {


  		




  137
  
  
    
				throw new AdminException("Problem getting property while initializing "


  		




  138
  
  
    
						+ "LDAP properties page: " + pnfe.getMessage());


  		




  
  135
  
    
			} catch (GeneralPropertyException gpe) {


  		




  
  136
  
    
				throw new AdminException("AuthAdmin.configureAuth - Problem getting property " + 


  		




  
  137
  
    
						"while initializing LDAP properties page: " + gpe.getMessage());


  		




  139
  138
  
    
			} catch (IOException ioe) {


  		




  140
  
  
    
				throw new AdminException("IO problem while initializing "


  		




  
  139
  
    
				throw new AdminException("AuthAdmin.configureAuth - IO problem while initializing "


  		




  141
  140
  
    
						+ "LDAP properties page:" + ioe.getMessage());


  		




  142
  141
  
    
			} catch (ServletException se) {


  		




  143
  
  
    
				throw new AdminException("problem forwarding request while " 


  		




  
  142
  
    
				throw new AdminException("AuthAdmin.configureAuth - problem forwarding request while " 


  		




  144
  143
  
    
						+ "initializing LDAP properties page: " + se.getMessage());


  		




  145
  144
  
    
			}


  		




  146
  145
  
    
		} else {


  		




  ......




  203
  202
  
    
				}


  		




  204
  203
  
    
			


  		




  205
  204
  
    
			} catch (GeneralPropertyException gpe) {


  		




  206
  
  
    
				String errorMessage = "Problem getting or setting property while "


  		




  
  205
  
    
				String errorMessage = "AuthAdmin.configureAuth - Problem getting or setting property while "


  		




  207
  206
  
    
					+ "processing LDAP properties page: " + gpe.getMessage();


  		




  208
  207
  
    
				logMetacat.error(errorMessage);


  		




  209
  208
  
    
				processingErrors.add(errorMessage);


  		




  ......




  229
  228
  
    
							"/admin?configureType=configure&processForm=false", null);


  		




  230
  229
  
    
				}


  		




  231
  230
  
    
			} catch (ServletException se) {


  		




  232
  
  
    
				throw new AdminException("problem forwarding request while "


  		




  
  231
  
    
				throw new AdminException("AuthAdmin.configureAuth - problem forwarding request while "


  		




  233
  232
  
    
						+ "processing LDAP properties page: " + se.getMessage());


  		




  234
  233
  
    
			} catch (IOException ioe) {


  		




  235
  
  
    
				throw new AdminException("IO problem while processing Authentication "


  		




  
  234
  
    
				throw new AdminException("AuthAdmin.configureAuth - IO problem while processing Authentication "


  		




  236
  235
  
    
						+ "properties page: " + ioe.getMessage());


  		




  237
  236
  
    
			} catch (GeneralPropertyException gpe) {


  		




  238
  
  
    
				String errorMessage = "Problem getting or setting property while "


  		




  
  237
  
    
				String errorMessage = "AuthAdmin.configureAuth - Problem getting or setting property while "


  		




  239
  238
  
    
					+ "processing Authentication properties page: " + gpe.getMessage();


  		




  240
  239
  
    
				logMetacat.error(errorMessage);


  		




  241
  240
  
    
				processingErrors.add(errorMessage);


  		




  ......




  271
  270
  
    
				}


  		




  272
  271
  
    
			}


  		




  273
  272
  
    
		} catch (InstantiationException ie) {


  		




  274
  
  
    
			errorVector.add("Instantiation error while verifying Metacat Administrators : "


  		




  
  273
  
    
			errorVector.add("AuthAdmin.validateOptions - Instantiation error while verifying Metacat Administrators : "


  		




  275
  274
  
    
							+ ie.getMessage());


  		




  276
  275
  
    
		} catch (Exception e) {


  		




  277
  
  
    
			errorVector.add("Error while verifying Metacat Administrators : "


  		




  
  276
  
    
			errorVector.add("AuthAdmin.validateOptions - Error while verifying Metacat Administrators : "


  		




  278
  277
  
    
					+ e.getMessage());


  		




  279
  278
  
    
		}


  		




  280
  279
  
    

  		












Also available in:  Unified diff