svn commit: r1026421 - in /directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans: LdapServerBean.java SaslMechHandlerBean.java

[el...@apache.org]

Author: elecharny
Date: Fri Oct 22 17:36:57 2010
New Revision: 1026421

URL: http://svn.apache.org/viewvc?rev=1026421&view=rev
Log:
Added the SaslMechHandler bean, fixed an issue in the LdapServerBean

Added:
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java
      - copied, changed from r1025786, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechanisHandlerBean.java
Modified:
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java?rev=1026421&r1=1026420&r2=1026421&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java Fri Oct 22 17:36:57 2010
@@ -63,7 +63,7 @@ public class LdapServerBean extends DSBa
     private int replprovider;
     
     /** The list of supported mechanisms */
-    private Set<SaslMechanisHandlerBean> saslmechhandlers = new HashSet<SaslMechanisHandlerBean>();
+    private List<SaslMechHandlerBean> saslmechhandlers = new ArrayList<SaslMechHandlerBean>();
     
     /** The list of supported extended operation handlers */
     private List<ExtendedOpHandlerBean> extendedophandlers = new ArrayList<ExtendedOpHandlerBean>();
@@ -275,7 +275,7 @@ public class LdapServerBean extends DSBa
     /**
      * @return the saslMechHandlers
      */
-    public Set<SaslMechanisHandlerBean> getSaslMechHandlers()
+    public List<SaslMechHandlerBean> getSaslMechHandlers()
     {
         return saslmechhandlers;
     }
@@ -284,7 +284,7 @@ public class LdapServerBean extends DSBa
     /**
      * @param saslMechHandlers the saslMechHandlers to set
      */
-    public void setSaslMechHandlers( Set<SaslMechanisHandlerBean> saslMechHandlers )
+    public void setSaslMechHandlers( List<SaslMechHandlerBean> saslMechHandlers )
     {
         this.saslmechhandlers = saslMechHandlers;
     }
@@ -293,9 +293,9 @@ public class LdapServerBean extends DSBa
     /**
      * @param saslMechHandlers the saslMechHandlers to add
      */
-    public void setSaslMechHandlers( SaslMechanisHandlerBean... saslMechHandlers )
+    public void setSaslMechHandlers( SaslMechHandlerBean... saslMechHandlers )
     {
-        for ( SaslMechanisHandlerBean saslMechHandler : saslMechHandlers )
+        for ( SaslMechHandlerBean saslMechHandler : saslMechHandlers )
         {
             this.saslmechhandlers.add( saslMechHandler );
         }
@@ -364,7 +364,7 @@ public class LdapServerBean extends DSBa
         {
             sb.append( tabs ).append( "  SASL mechanism handlers :\n" );
             
-            for ( SaslMechanisHandlerBean saslMechHandler : saslmechhandlers )
+            for ( SaslMechHandlerBean saslMechHandler : saslmechhandlers )
             {
                 sb.append( saslMechHandler.toString( tabs + "    " ) );
             }

Copied: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java (from r1025786, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechanisHandlerBean.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java?p2=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java&p1=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechanisHandlerBean.java&r1=1025786&r2=1026421&rev=1026421&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechanisHandlerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java Fri Oct 22 17:36:57 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SaslMechanisHandlerBean extends AdsBaseBean
+public class SaslMechHandlerBean extends AdsBaseBean
 {
     /** The SASL mechanism handler */
     private String saslmechname;
@@ -39,7 +39,7 @@ public class SaslMechanisHandlerBean ext
     /**
      * Create a new LdapServerSaslMechanisHandlerBean instance
      */
-    public SaslMechanisHandlerBean()
+    public SaslMechHandlerBean()
     {
         super();
     }
@@ -108,7 +108,7 @@ public class SaslMechanisHandlerBean ext
         sb.append( tabs ).append( "SASL mechanism handler :\n" );
         sb.append( tabs ).append( "  SASL mechanism name :" ).append( saslmechname ).append( '\n' );
         sb.append( tabs ).append( "  SASL mechanism class name :" ).append( saslmechclassname ).append( '\n' );
-        sb.append( tabs ).append( "  NTLM mechanism provider :" ).append( ntlmmechprovider ).append( '\n' );
+        sb.append( toString( tabs, "  NTLM mechanism provider", ntlmmechprovider ) );
         
         return sb.toString();
     }