You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dj...@apache.org on 2008/05/11 19:54:29 UTC

svn commit: r655345 - in /directory/apacheds/trunk: protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java server-xml/src/main/resources/server.xml

Author: djencks
Date: Sun May 11 10:54:29 2008
New Revision: 655345

URL: http://svn.apache.org/viewvc?rev=655345&view=rev
Log:
fix xbean map handling for sasl mechanisms

Modified:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/apacheds/trunk/server-xml/src/main/resources/server.xml

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=655345&r1=655344&r2=655345&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Sun May 11 10:54:29 2008
@@ -801,18 +801,22 @@
     }
 
 
-    public void setSaslMechanismHandlers( Map<String, MechanismHandler> saslMechanismHandlers )
+    /**
+     * @org.apache.xbean.Map flat="true" dups="replace" keyName="mech-name"
+     */
+    public Map<String, MechanismHandler> getSaslMechanismHandlers()
     {
-        this.saslMechanismHandlers = saslMechanismHandlers;
+        return saslMechanismHandlers;
     }
 
-
-    public Map<String, MechanismHandler> getSaslMechanismHandlers()
+    public void setSaslMechanismHandlers( Map<String, MechanismHandler> saslMechanismHandlers )
     {
-        return saslMechanismHandlers;
+        this.saslMechanismHandlers = saslMechanismHandlers;
+        LOG.warn("saslMechanismHandlers set to: " + saslMechanismHandlers);
     }
 
 
+
     public MechanismHandler addSaslMechanismHandler( String mechanism, MechanismHandler handler )
     {
         return this.saslMechanismHandlers.put( mechanism, handler );

Modified: directory/apacheds/trunk/server-xml/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/server.xml?rev=655345&r1=655344&r2=655345&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/server.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/server.xml Sun May 11 10:54:29 2008
@@ -157,24 +157,12 @@
 
     <!-- The list of supported authentication mechanisms.                   -->
     <saslMechanismHandlers>
-      <s:entry key="SIMPLE">
-        <simpleMechanismHandler/>
-      </s:entry>
-      <s:entry key="CRAM-MD5">
-        <cramMd5MechanismHandler directoryService="#directoryService"/>
-      </s:entry>
-      <s:entry key="DIGEST-MD5">
-        <digestMd5MechanismHandler directoryService="#directoryService" />
-      </s:entry>
-      <s:entry key="GSSAPI">
-        <gssapiMechanismHandler directoryService="#directoryService" />
-      </s:entry>
-      <s:entry key="NTLM">
-        <ntlmMechanismHandler ntlmProviderFqcn="com.foo.Bar" />
-      </s:entry>
-      <s:entry key="GSS-SPNEGO">
-        <ntlmMechanismHandler ntlmProviderFqcn="com.foo.Bar" />
-      </s:entry>
+      <simpleMechanismHandler mech-name="SIMPLE"/>
+      <cramMd5MechanismHandler mech-name="CRAM-MD5" directoryService="#directoryService"/>
+      <digestMd5MechanismHandler mech-name="DIGEST-MD5" directoryService="#directoryService"/>
+      <gssapiMechanismHandler mech-name="GSSAPI" directoryService="#directoryService"/>
+      <ntlmMechanismHandler mech-name="NTLM" ntlmProviderFqcn="com.foo.Bar"/>
+      <ntlmMechanismHandler mech-name="GSS-SPNEGO" ntlmProviderFqcn="com.foo.Bar"/>
     </saslMechanismHandlers>
 
     <!-- The desired quality-of-protection, used by DIGEST-MD5 and GSSAPI.  -->

Re: svn commit: r655345 - in /directory/apacheds/trunk: protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java server-xml/src/main/resources/server.xml

Posted by Alex Karasulu <ak...@apache.org>.
On Sun, May 11, 2008 at 1:54 PM, <dj...@apache.org> wrote:

>     <saslMechanismHandlers>
> -      <s:entry key="SIMPLE">
> -        <simpleMechanismHandler/>
> -      </s:entry>
> -      <s:entry key="CRAM-MD5">
> -        <cramMd5MechanismHandler directoryService="#directoryService"/>
> -      </s:entry>
> -      <s:entry key="DIGEST-MD5">
> -        <digestMd5MechanismHandler directoryService="#directoryService"
> />
> -      </s:entry>
> -      <s:entry key="GSSAPI">
> -        <gssapiMechanismHandler directoryService="#directoryService" />
> -      </s:entry>
> -      <s:entry key="NTLM">
> -        <ntlmMechanismHandler ntlmProviderFqcn="com.foo.Bar" />
> -      </s:entry>
> -      <s:entry key="GSS-SPNEGO">
> -        <ntlmMechanismHandler ntlmProviderFqcn="com.foo.Bar" />
> -      </s:entry>
> +      <simpleMechanismHandler mech-name="SIMPLE"/>
> +      <cramMd5MechanismHandler mech-name="CRAM-MD5"
> directoryService="#directoryService"/>
> +      <digestMd5MechanismHandler mech-name="DIGEST-MD5"
> directoryService="#directoryService"/>
> +      <gssapiMechanismHandler mech-name="GSSAPI"
> directoryService="#directoryService"/>
> +      <ntlmMechanismHandler mech-name="NTLM"
> ntlmProviderFqcn="com.foo.Bar"/>
> +      <ntlmMechanismHandler mech-name="GSS-SPNEGO"
> ntlmProviderFqcn="com.foo.Bar"/>
>     </saslMechanismHandlers>
>

That looks great! Thanks David.

Alex