From commits-return-13136-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Mon Apr 02 18:17:06 2007 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 37344 invoked from network); 2 Apr 2007 18:17:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Apr 2007 18:17:04 -0000 Received: (qmail 36982 invoked by uid 500); 2 Apr 2007 18:17:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 36950 invoked by uid 500); 2 Apr 2007 18:17:08 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 36908 invoked by uid 99); 2 Apr 2007 18:17:08 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2007 11:17:08 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2007 11:17:00 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E97911A983A; Mon, 2 Apr 2007 11:16:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070402181639.E97911A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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 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 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 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 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 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)}