You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2008/05/28 09:08:17 UTC
svn commit: r660839 - in /directory/apacheds/branches/bigbang:
protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
server-xml/src/main/resources/server.xml
Author: elecharny
Date: Wed May 28 00:08:17 2008
New Revision: 660839
URL: http://svn.apache.org/viewvc?rev=660839&view=rev
Log:
Injected David Jencks modification to the saslMechanisms handling in server.xml
Modified:
directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml
Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=660839&r1=660838&r2=660839&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Wed May 28 00:08:17 2008
@@ -800,15 +800,18 @@
}
- 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;
}
Modified: directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml?rev=660839&r1=660838&r2=660839&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml (original)
+++ directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml Wed May 28 00:08:17 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. -->