r4587 - trunk/src/edu/ucsb/nceas/metacat

[daigle at ecoinformatics.org]

Author: daigle
Date: 2008-11-19 15:12:14 -0800 (Wed, 19 Nov 2008)
New Revision: 4587

Modified:
   trunk/src/edu/ucsb/nceas/metacat/AuthLdap.java
Log:
change generic authentication properties from ldap.* to auth.*

Modified: trunk/src/edu/ucsb/nceas/metacat/AuthLdap.java
===================================================================
--- trunk/src/edu/ucsb/nceas/metacat/AuthLdap.java	2008-11-19 23:11:37 UTC (rev 4586)
+++ trunk/src/edu/ucsb/nceas/metacat/AuthLdap.java	2008-11-19 23:12:14 UTC (rev 4587)
@@ -92,8 +92,8 @@
 	public AuthLdap() throws InstantiationException {
 		// Read LDAP URI for directory service information
 		try {
-			this.ldapUrl = PropertyService.getProperty("ldap.url");
-			this.ldapsUrl = PropertyService.getProperty("ldap.surl");
+			this.ldapUrl = PropertyService.getProperty("auth.url");
+			this.ldapsUrl = PropertyService.getProperty("auth.surl");
 			// use the NCEAS base as a fallback.  Normally, the base will be
 			// parsed from the user during authentication
 			// TODO MCD this may need to remain always at NCEAS value
@@ -901,7 +901,7 @@
    * @param foruser the user for which the attribute list is requested
    * @returns HashMap a map of attribute name to a Vector of values
    */
-  public HashMap<String,Vector<String>> getAttributes(String foruser) throws ConnectException {
+  public HashMap<String, Vector<String>> getAttributes(String foruser) throws ConnectException {
     return getAttributes(null, null, foruser);
   }