directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r524867 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor: BaseInterceptor.java Interceptor.java InterceptorChain.java NextInterceptor.java
Date Mon, 02 Apr 2007 18:16:39 GMT
Author: elecharny
Date: Mon Apr  2 11:16:39 2007
New Revision: 524867

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

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?view=diff&rev=524867&r1=524866&r2=524867
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
Mon Apr  2 11:16:39 2007
@@ -21,7 +21,6 @@
 
 
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import javax.naming.Context;
@@ -35,6 +34,7 @@
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
 import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.interceptor.context.ServiceContext;
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.jndi.ServerContext;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -221,10 +221,10 @@
     }
 
 
-    public void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List<String>
mechanisms, String saslAuthId )
-        throws NamingException
+    public void bind( NextInterceptor next, ServiceContext bindContext )
+    throws NamingException
     {
-        next.bind( bindDn, credentials, mechanisms, saslAuthId );
+        next.bind( bindContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?view=diff&rev=524867&r1=524866&r2=524867
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
Mon Apr  2 11:16:39 2007
@@ -21,7 +21,6 @@
 
 
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import javax.naming.NamingEnumeration;
@@ -32,6 +31,7 @@
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
 import org.apache.directory.server.core.configuration.InterceptorConfiguration;
+import org.apache.directory.server.core.interceptor.context.ServiceContext;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -239,13 +239,11 @@
     void move( NextInterceptor next, LdapDN oldName, LdapDN newParentName, String newRn,
boolean deleteOldRn )
         throws NamingException;
 
-
     /**
      * Filters {@link Partition#bind(org.apache.directory.shared.ldap.name.LdapDN,byte[],java.util.List,String)}
call.
      */
-    void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List<String>
mechanisms, String saslAuthId )
+    void bind( NextInterceptor next, ServiceContext bindContext )
         throws NamingException;
-
 
     /**
      * Filters {@link Partition#unbind(org.apache.directory.shared.ldap.name.LdapDN)} call.

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?view=diff&rev=524867&r1=524866&r2=524867
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
Mon Apr  2 11:16:39 2007
@@ -37,6 +37,7 @@
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
 import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.configuration.MutableInterceptorConfiguration;
+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.server.core.partition.PartitionNexus;
@@ -202,10 +203,9 @@
         }
 
 
-        public void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List<String>
mechanisms, String saslAuthId )
-            throws NamingException
+        public void bind( NextInterceptor next, ServiceContext bindContext )  throws NamingException
         {
-            nexus.bind( bindDn, credentials, mechanisms, saslAuthId );
+            nexus.bind( bindContext );
         }
 
 
@@ -721,14 +721,14 @@
     }
 
 
-    public void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String
saslAuthId ) throws NamingException
+    public void bind( ServiceContext bindContext ) throws NamingException
     {
         Entry node = getStartingEntry();
         Interceptor head = node.configuration.getInterceptor();
         NextInterceptor next = node.nextInterceptor;
         try
         {
-            head.bind( next, bindDn, credentials, mechanisms, saslAuthId );
+            head.bind( next, bindContext );
         }
         catch ( NamingException ne )
         {
@@ -1424,15 +1424,14 @@
                 }
 
 
-                public void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms,
String saslAuthId )
-                    throws NamingException
+                public void bind( ServiceContext bindContext ) throws NamingException
                 {
                     Entry next = getNextEntry();
                     Interceptor interceptor = next.configuration.getInterceptor();
-
+    
                     try
                     {
-                        interceptor.bind( next.nextInterceptor, bindDn, credentials, mechanisms,
saslAuthId );
+                        interceptor.bind( next.nextInterceptor, bindContext );
                     }
                     catch ( NamingException ne )
                     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?view=diff&rev=524867&r1=524866&r2=524867
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
Mon Apr  2 11:16:39 2007
@@ -21,7 +21,6 @@
 
 
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import javax.naming.NamingEnumeration;
@@ -30,6 +29,7 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
+import org.apache.directory.server.core.interceptor.context.ServiceContext;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
@@ -170,8 +170,7 @@
     /**
      * Calls the next interceptor's {@link Interceptor#bind(NextInterceptor,org.apache.directory.shared.ldap.name.LdapDN,byte[],java.util.List,String)}
      */
-    void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId
) throws NamingException;
-
+    void bind( ServiceContext bindContext ) throws NamingException;
 
     /**
      * Calls the next interceptor's {@link Interceptor#unbind(NextInterceptor,org.apache.directory.shared.ldap.name.LdapDN)}



Mime
View raw message