svn commit: r1088202 - in /esme/trunk/server/src/main: resources/ESMELdap.properties scala/org/apache/esme/model/UserAuth.scala

[le...@apache.org]

Author: lester
Date: Sun Apr  3 03:20:08 2011
New Revision: 1088202

URL: http://svn.apache.org/viewvc?rev=1088202&view=rev
Log:
ESME-214: set 'default' flag to false for container-managed authentication module. Renamed key in ldap property file.

Modified:
    esme/trunk/server/src/main/resources/ESMELdap.properties
    esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala

Modified: esme/trunk/server/src/main/resources/ESMELdap.properties
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/resources/ESMELdap.properties?rev=1088202&r1=1088201&r2=1088202&view=diff
==============================================================================
--- esme/trunk/server/src/main/resources/ESMELdap.properties (original)
+++ esme/trunk/server/src/main/resources/ESMELdap.properties Sun Apr  3 03:20:08 2011
@@ -18,7 +18,7 @@ ldap.server.referral=follow
 # Initial context factory class
 ldap.server.initial_context_factory=com.sun.jndi.ldap.LdapCtxFactory
 
-# Prefix for user to whom additional LDAP attributes belong, for example 'uid' or 'cn'
-ldap.cnPrefix=uid
+# Prefix for user to whom additional LDAP attributes belong, for example 'uid' or 'sAMAccountName'
+ldap.uidPrefix=uid
 # User base DN for user to whom additional LDAP attributes belong
 ldap.userBase=ou=esme,dc=somedomain,dc=org
\ No newline at end of file

Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala?rev=1088202&r1=1088201&r2=1088202&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala Sun Apr  3 03:20:08 2011
@@ -309,13 +309,13 @@ object ContainerManagedAuthModule extend
   }
 
   def getAttrs(who : String) : Map[String, List[String]] = {
-    val cnPrefix = S.?("ldap.cnPrefix")
-    info("LDAP CN prefix: %s".format(cnPrefix))
+    val uidPrefix = S.?("ldap.uidPrefix")
+    info("LDAP uid prefix: %s".format(uidPrefix))
     val userBase = S.?("ldap.userBase")
     info("LDAP user base: %s".format(userBase))
 
     var attrsMap = Map.empty[String, List[String]]
-    val dn = "%s=%s,%s".format(cnPrefix, who, userBase)
+    val dn = "%s=%s,%s".format(uidPrefix, who, userBase)
     info("Distinguished name: %s".format(dn))
     val attrs : Attributes = myLdap.attributesFromDn(dn)
     if (attrs != null) {
@@ -342,7 +342,7 @@ object ContainerManagedAuthModule extend
     "esme-users"
   )
 
-  override def isDefault = true
+  override def isDefault = false
 
   def loginPresentation: Box[NodeSeq] = Empty