r4582 - trunk/lib

[daigle at ecoinformatics.org]

Author: daigle
Date: 2008-11-19 15:08:23 -0800 (Wed, 19 Nov 2008)
New Revision: 4582

Modified:
   trunk/lib/metacat.properties
Log:
change generic authentication properties from ldap.* to auth.*

Modified: trunk/lib/metacat.properties
===================================================================
--- trunk/lib/metacat.properties	2008-11-19 23:05:57 UTC (rev 4581)
+++ trunk/lib/metacat.properties	2008-11-19 23:08:23 UTC (rev 4582)
@@ -8,7 +8,7 @@
 
 configutil.propertiesConfigured=false
 ## configutil.organizationsConfigured=false
-configutil.ldapConfigured=false
+configutil.authConfigured=false
 configutil.skinsConfigured=false
 configutil.databaseConfigured=false
 configutil.geoserverConfigured=false
@@ -112,17 +112,16 @@
 #datamanager.srb.endpoint=
 #datamanager.srb.machinename=
 
-######## LDAP ##############################################
+######## Authentication and LDAP ##############################################
 
 auth.class=edu.ucsb.nceas.metacat.AuthLdap
 auth.timeoutMinutes=180
-
-# ldap.administrators=uid=jones,o=NCEAS,dc=ecoinformatics,dc=org
-ldap.administrators=
-ldap.url=ldap://ldap.ecoinformatics.org:389/
-ldap.surl=ldap://ldap.ecoinformatics.org:389/
-ldap.allowedSubmitters=
-ldap.deniedSubmitters=
+# auth.administrators=uid=jones,o=NCEAS,dc=ecoinformatics,dc=org
+auth.administrators=
+auth.url=ldap://ldap.ecoinformatics.org:389/
+auth.surl=ldap://ldap.ecoinformatics.org:389/
+auth.allowedSubmitters=
+auth.deniedSubmitters=
 # time in milliseconds allowed for ldap server connections
 ldap.connectTimeLimit=5000
 # time in milliseconds allowed for ldap server searches