r4592 - trunk/src/edu/ucsb/nceas/metacat/admin

[daigle at ecoinformatics.org]

Author: daigle
Date: 2008-11-19 15:26:42 -0800 (Wed, 19 Nov 2008)
New Revision: 4592

Modified:
   trunk/src/edu/ucsb/nceas/metacat/admin/MetaCatAdminServlet.java
Log:
Rename LDAPUtil to AuthUtil

Modified: trunk/src/edu/ucsb/nceas/metacat/admin/MetaCatAdminServlet.java
===================================================================
--- trunk/src/edu/ucsb/nceas/metacat/admin/MetaCatAdminServlet.java	2008-11-19 23:26:23 UTC (rev 4591)
+++ trunk/src/edu/ucsb/nceas/metacat/admin/MetaCatAdminServlet.java	2008-11-19 23:26:42 UTC (rev 4592)
@@ -42,7 +42,7 @@
 import edu.ucsb.nceas.metacat.service.PropertyService;
 import edu.ucsb.nceas.metacat.service.SessionService;
 import edu.ucsb.nceas.metacat.service.XMLSchemaService;
-import edu.ucsb.nceas.metacat.util.LDAPUtil;
+import edu.ucsb.nceas.metacat.util.AuthUtil;
 import edu.ucsb.nceas.metacat.util.MetaCatUtil;
 //import edu.ucsb.nceas.metacat.util.OrganizationUtil;
 import edu.ucsb.nceas.metacat.util.RequestUtil;
@@ -105,21 +105,21 @@
 				SessionService.touchSession(httpSession.getId());
 			}
 			
-			// if ldap isn't configured, change the action to ldap.  ldap
-			// needs to be set up before we do anything else
-			if (!LDAPUtil.isLDAPConfigured()) {
-				processingMessage.add("You must configure LDAP before "
+			// if authentication isn't configured, change the action to auth.  
+			// Authentication needs to be set up before we do anything else
+			if (!AuthUtil.isAuthConfigured()) {
+				processingMessage.add("You must configure authentication before "
 						+ "you can continue with MetaCat configuration.");
 				RequestUtil.setRequestMessage(request, processingMessage);
-				action = "ldap";
-				logMetacat.debug("Admin action changed to 'ldap'");
+				action = "auth";
+				logMetacat.debug("Admin action changed to 'auth'");
 			}
 
-			// Once ldap is configured, see if the user is logged in
+			// Once auth is configured, see if the user is logged in
 			// as an administrator.  If not, they need to log in before
 			// they can continue with configuration.
-			if (LDAPUtil.isLDAPConfigured()
-					&& !LDAPUtil.isUserLoggedInAsAdmin(request)) {
+			if (AuthUtil.isAuthConfigured()
+					&& !AuthUtil.isUserLoggedInAsAdmin(request)) {
 				processingMessage.add("You must log in as an administrative " + "" +
 						"user before you can continue with MetaCat configuration.");
 				RequestUtil.setRequestMessage(request, processingMessage);
@@ -131,7 +131,7 @@
 				// Forward the request main configuration page
 				request.setAttribute("metaCatVersion", SystemUtil.getMetacatVersion()); 
 			    request.setAttribute("propsConfigured", new Boolean(PropertyService.arePropertiesConfigured()));
-			    request.setAttribute("ldapConfigured", new Boolean(LDAPUtil.isLDAPConfigured()));
+			    request.setAttribute("authConfigured", new Boolean(AuthUtil.isAuthConfigured()));
 			    // TODO MCD figure out if we still need an org section
 			    //request.setAttribute("orgsConfigured", new Boolean(OrganizationUtil.areOrganizationsConfigured()));
 			    request.setAttribute("skinsConfigured", new Boolean(SkinUtil.areSkinsConfigured()));
@@ -159,9 +159,9 @@
 				// process database
 				DBAdmin.getInstance().configureDatabase(request, response);
 				return;
-			} else if (action.equals("ldap")) {
-				// process ldap
-				LDAPAdmin.getInstance().configureLDAP(request, response);
+			} else if (action.equals("auth")) {
+				// process authentication
+				AuthAdmin.getInstance().configureAuth(request, response);
 				return;
 			// TODO MCD figure out if org configuration is still needed	
 //			} else if (action.equals("organization")) {
@@ -170,7 +170,7 @@
 //				return;
 			} else if (action.equals("login")) {
 				// process login
-				AuthAdmin.getInstance().authenticateUser(request, response);
+				LoginAdmin.getInstance().authenticateUser(request, response);
 				return;
 			} else if (action.equals("geoserver")) {
 				// process geoserver password change