svn commit: r524878 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition: DefaultPartitionNexus.java PartitionNexusProxy.java

[el...@apache.org]

Author: elecharny
Date: Mon Apr  2 11:27:30 2007
New Revision: 524878

URL: http://svn.apache.org/viewvc?view=rev&rev=524878
Log:
Changed the bind() operation interface

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=524878&r1=524877&r2=524878
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Apr  2 11:27:30 2007
@@ -44,6 +44,8 @@
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
+import org.apache.directory.server.core.interceptor.context.BindServiceContext;
+import org.apache.directory.server.core.interceptor.context.ServiceContext;
 import org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
@@ -659,13 +661,11 @@
     // ------------------------------------------------------------------------
     // DirectoryPartition Interface Method Implementations
     // ------------------------------------------------------------------------
-
-    public void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId ) throws NamingException
+    public void bind( ServiceContext bindContext ) throws NamingException
     {
-        Partition partition = getBackend( bindDn );
-        partition.bind( bindDn, credentials, mechanisms, saslAuthId );
+        Partition partition = getBackend( ((BindServiceContext)bindContext).getNormalizedBindDn() );
+        partition.bind( bindContext );
     }
-
 
     public void unbind( LdapDN bindDn ) throws NamingException
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?view=diff&rev=524878&r1=524877&r2=524878
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java Mon Apr  2 11:27:30 2007
@@ -24,7 +24,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -48,6 +47,7 @@
 import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
 import org.apache.directory.server.core.event.EventService;
 import org.apache.directory.server.core.interceptor.InterceptorChain;
+import org.apache.directory.server.core.interceptor.context.ServiceContext;
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
@@ -671,19 +671,19 @@
      * @param bypass
      * @throws NamingException
      */
-    public void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId, Collection bypass )
+    public void bind( ServiceContext bindContext, Collection bypass )
         throws NamingException
     {
         ensureStarted();
         InvocationStack stack = InvocationStack.getInstance();
         Object[] args = new Object[]
-            { bindDn, credentials, mechanisms, saslAuthId };
+            { bindContext };
         
         stack.push( new Invocation( this, caller, "bind", args, bypass ) );
         
         try
         {
-            this.configuration.getInterceptorChain().bind( bindDn, credentials, mechanisms, saslAuthId );
+            configuration.getInterceptorChain().bind( bindContext );
         }
         finally
         {
@@ -691,7 +691,6 @@
         }
     }
 
-
     public void unbind( LdapDN bindDn, Collection bypass ) throws NamingException
     {
         ensureStarted();
@@ -710,9 +709,9 @@
     }
 
 
-    public void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId ) throws NamingException
+    public void bind( ServiceContext bindContext ) throws NamingException
     {
-        bind( bindDn, credentials, mechanisms, saslAuthId, null );
+        bind( bindContext, null );
     }