Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 95152 invoked from network); 14 Apr 2007 14:27:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Apr 2007 14:27:51 -0000 Received: (qmail 68741 invoked by uid 500); 14 Apr 2007 14:27:57 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 68686 invoked by uid 500); 14 Apr 2007 14:27:57 -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 68675 invoked by uid 99); 14 Apr 2007 14:27:56 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Apr 2007 07:27:56 -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; Sat, 14 Apr 2007 07:27:49 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 664C81A9838; Sat, 14 Apr 2007 07:27:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r528813 - in /directory/apacheds/trunk/core/src: main/java/org/apache/directory/server/core/ main/java/org/apache/directory/server/core/interceptor/ main/java/org/apache/directory/server/core/interceptor/context/ main/java/org/apache/direct... Date: Sat, 14 Apr 2007 14:27:28 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070414142729.664C81A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sat Apr 14 07:27:27 2007 New Revision: 528813 URL: http://svn.apache.org/viewvc?view=rev&rev=528813 Log: Added the ADdContextPartitionServiceContext, and modified the interceptors to use it Added: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionServiceContext.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java 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 directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java 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/PartitionNexus.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=528813&r1=528812&r2=528813 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sat Apr 14 07:27:27 2007 @@ -41,6 +41,7 @@ import org.apache.directory.server.core.configuration.StartupConfiguration; import org.apache.directory.server.core.interceptor.Interceptor; import org.apache.directory.server.core.interceptor.InterceptorChain; +import org.apache.directory.server.core.interceptor.context.AddContextPartitionServiceContext; import org.apache.directory.server.core.interceptor.context.AddServiceContext; import org.apache.directory.server.core.interceptor.context.EntryServiceContext; import org.apache.directory.server.core.interceptor.context.LookupServiceContext; @@ -988,7 +989,7 @@ partitionNexus = new DefaultPartitionNexus( new AttributesImpl() ); partitionNexus.init( configuration, null ); - partitionNexus.addContextPartition( schemaPartitionConfig ); + partitionNexus.addContextPartition( new AddContextPartitionServiceContext( schemaPartitionConfig ) ); interceptorChain = new InterceptorChain(); interceptorChain.init( configuration ); 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=528813&r1=528812&r2=528813 ============================================================================== --- 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 Sat Apr 14 07:27:27 2007 @@ -32,7 +32,6 @@ import org.apache.directory.server.core.DirectoryServiceConfiguration; 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; @@ -191,9 +190,9 @@ } - public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) throws NamingException + public void addContextPartition( NextInterceptor next, ServiceContext addContextPartitionContext ) throws NamingException { - next.addContextPartition( cfg ); + next.addContextPartition( addContextPartitionContext ); } 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=528813&r1=528812&r2=528813 ============================================================================== --- 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 Sat Apr 14 07:27:27 2007 @@ -143,9 +143,9 @@ /** - * Filters {@link PartitionNexus#addContextPartition(PartitionConfiguration)} call. + * Filters {@link PartitionNexus#addContextPartition( ServiceContext )} call. */ - void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) throws NamingException; + void addContextPartition( NextInterceptor next, ServiceContext addContextPartitionContext ) throws NamingException; /** 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=528813&r1=528812&r2=528813 ============================================================================== --- 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 Sat Apr 14 07:27:27 2007 @@ -91,19 +91,19 @@ } - public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedNameContext ) throws NamingException + public LdapDN getMatchedName( NextInterceptor next, ServiceContext getMatchedNameContext ) throws NamingException { return ( LdapDN ) nexus.getMatchedName( getMatchedNameContext ).clone(); } - public LdapDN getSuffix ( NextInterceptor next, ServiceContext getSuffixContext ) throws NamingException + public LdapDN getSuffix( NextInterceptor next, ServiceContext getSuffixContext ) throws NamingException { return ( LdapDN ) nexus.getSuffix( getSuffixContext ).clone(); } - public Iterator listSuffixes ( NextInterceptor next, ServiceContext emptyContext ) throws NamingException + public Iterator listSuffixes( NextInterceptor next, ServiceContext emptyContext ) throws NamingException { return nexus.listSuffixes( emptyContext ); } @@ -115,7 +115,7 @@ } - public void add(NextInterceptor next, ServiceContext addContext ) throws NamingException + public void add( NextInterceptor next, ServiceContext addContext ) throws NamingException { nexus.add( addContext ); } @@ -178,10 +178,10 @@ } - public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) + public void addContextPartition( NextInterceptor next, ServiceContext addContextPartitionContext ) throws NamingException { - nexus.addContextPartition( cfg ); + nexus.addContextPartition( addContextPartitionContext ); } @@ -565,7 +565,7 @@ } - public LdapDN getSuffix ( ServiceContext getSuffixContext ) throws NamingException + public LdapDN getSuffix( ServiceContext getSuffixContext ) throws NamingException { Entry entry = getStartingEntry(); Interceptor head = entry.configuration.getInterceptor(); @@ -629,14 +629,15 @@ } - public void addContextPartition( PartitionConfiguration cfg ) throws NamingException + public void addContextPartition( ServiceContext addContextPartitionContext ) throws NamingException { Entry entry = getStartingEntry(); Interceptor head = entry.configuration.getInterceptor(); NextInterceptor next = entry.nextInterceptor; + try { - head.addContextPartition( next, cfg ); + head.addContextPartition( next, addContextPartitionContext ); } catch ( NamingException ne ) { @@ -1371,14 +1372,14 @@ } - public void addContextPartition( PartitionConfiguration cfg ) throws NamingException + public void addContextPartition( ServiceContext addContextPartitionContext ) throws NamingException { Entry next = getNextEntry(); Interceptor interceptor = next.configuration.getInterceptor(); try { - interceptor.addContextPartition( next.nextInterceptor, cfg ); + interceptor.addContextPartition( next.nextInterceptor, addContextPartitionContext ); } 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=528813&r1=528812&r2=528813 ============================================================================== --- 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 Sat Apr 14 07:27:27 2007 @@ -28,7 +28,6 @@ import javax.naming.directory.Attributes; 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; @@ -76,9 +75,9 @@ /** - * Calls the next interceptor's {@link PartitionNexus#addContextPartition(PartitionConfiguration)}. + * Calls the next interceptor's {@link PartitionNexus#addContextPartition( ServiceContext )}. */ - void addContextPartition( PartitionConfiguration cfg ) throws NamingException; + void addContextPartition( ServiceContext addContextPartitionContext ) throws NamingException; /** Added: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionServiceContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionServiceContext.java?view=auto&rev=528813 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionServiceContext.java (added) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionServiceContext.java Sat Apr 14 07:27:27 2007 @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.directory.server.core.interceptor.context; + +import org.apache.directory.server.core.configuration.PartitionConfiguration; + +/** + * A AddContextPartition context used for Interceptors. It contains all the informations + * needed for the addContextPartition operation, and used by all the interceptors + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class AddContextPartitionServiceContext extends EmptyServiceContext +{ + /** The context partition configuration */ + private PartitionConfiguration cfg; + + /** + * Creates a new instance of AddContextPartitionServiceContext. + */ + public AddContextPartitionServiceContext() + { + } + + /** + * Creates a new instance of AddContextPartitionServiceContext. + * + * @param entryDn The Entry DN to unbind + */ + public AddContextPartitionServiceContext( PartitionConfiguration cfg ) + { + super(); + this.cfg = cfg; + } + + /** + * @see Object#toString() + */ + public String toString() + { + return "AddContextPartitionServiceContext for partition context '" + getDn().getUpName() + "'"; + } + + /** + * @return The partition configuration + */ + public PartitionConfiguration getCfg() + { + return cfg; + } + + /** + * Set the partition configuration + * + * @param cfg The configuration + */ + public void setCfg( PartitionConfiguration cfg ) + { + this.cfg = cfg; + } +} Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java?view=diff&rev=528813&r1=528812&r2=528813 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java Sat Apr 14 07:27:27 2007 @@ -36,6 +36,7 @@ import org.apache.directory.server.core.configuration.ShutdownConfiguration; import org.apache.directory.server.core.configuration.StartupConfiguration; import org.apache.directory.server.core.configuration.SyncConfiguration; +import org.apache.directory.server.core.interceptor.context.AddContextPartitionServiceContext; import org.apache.directory.server.core.partition.PartitionNexusProxy; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.util.StringTools; @@ -122,10 +123,12 @@ } else if ( cfg instanceof AddPartitionConfiguration ) { - new PartitionNexusProxy( - service.getJndiContext( principalDn, principal, credential, authentication, "" ), - service ).addContextPartition( ( ( AddPartitionConfiguration ) cfg ) - .getDirectoryPartitionConfiguration() ); + AddContextPartitionServiceContext ctxPartition = + new AddContextPartitionServiceContext( ( ( AddPartitionConfiguration ) cfg ).getDirectoryPartitionConfiguration() ); + + Context ctx = service.getJndiContext( principalDn, principal, credential, authentication, "" ); + + new PartitionNexusProxy( ctx, service ).addContextPartition( ctxPartition ); } else if ( cfg instanceof RemovePartitionConfiguration ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?view=diff&rev=528813&r1=528812&r2=528813 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java Sat Apr 14 07:27:27 2007 @@ -398,9 +398,9 @@ } - public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) throws NamingException + public void addContextPartition( NextInterceptor next, ServiceContext addContextPartitionContext ) throws NamingException { - next.addContextPartition( cfg ); + next.addContextPartition( addContextPartitionContext ); } 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=528813&r1=528812&r2=528813 ============================================================================== --- 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 Sat Apr 14 07:27:27 2007 @@ -44,6 +44,7 @@ import org.apache.directory.server.core.DirectoryServiceConfiguration; import org.apache.directory.server.core.configuration.PartitionConfiguration; +import org.apache.directory.server.core.interceptor.context.AddContextPartitionServiceContext; import org.apache.directory.server.core.interceptor.context.CompareServiceContext; import org.apache.directory.server.core.interceptor.context.EntryServiceContext; import org.apache.directory.server.core.interceptor.context.LookupServiceContext; @@ -210,7 +211,7 @@ while ( i.hasNext() ) { PartitionConfiguration c = ( PartitionConfiguration ) i.next(); - addContextPartition( c ); + addContextPartition( new AddContextPartitionServiceContext( c ) ); initializedPartitionCfgs.add( 0, c ); } initialized = true; @@ -532,8 +533,9 @@ } - public synchronized void addContextPartition( PartitionConfiguration config ) throws NamingException + public synchronized void addContextPartition( ServiceContext addContextPartitionContext ) throws NamingException { + PartitionConfiguration config = ((AddContextPartitionServiceContext)addContextPartitionContext).getCfg(); Partition partition = config.getContextPartition(); // Turn on default indices Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?view=diff&rev=528813&r1=528812&r2=528813 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java Sat Apr 14 07:27:27 2007 @@ -196,7 +196,7 @@ public abstract boolean compare( ServiceContext compareContext ) throws NamingException; - public abstract void addContextPartition( PartitionConfiguration config ) throws NamingException; + public abstract void addContextPartition( ServiceContext addContextPartitionContext ) throws NamingException; public abstract void removeContextPartition( LdapDN suffix ) 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=528813&r1=528812&r2=528813 ============================================================================== --- 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 Sat Apr 14 07:27:27 2007 @@ -703,21 +703,21 @@ } - public void addContextPartition( PartitionConfiguration config ) throws NamingException + public void addContextPartition( ServiceContext addContextPartitionContext ) throws NamingException { - addContextPartition( config, null ); + addContextPartition( addContextPartitionContext, null ); } - public void addContextPartition( PartitionConfiguration config, Collection bypass ) throws NamingException + public void addContextPartition( ServiceContext addContextPartitionContext, Collection bypass ) throws NamingException { ensureStarted(); InvocationStack stack = InvocationStack.getInstance(); stack.push( new Invocation( this, caller, "addContextPartition", new Object[] - { config }, bypass ) ); + { addContextPartitionContext }, bypass ) ); try { - this.configuration.getInterceptorChain().addContextPartition( config ); + this.configuration.getInterceptorChain().addContextPartition( addContextPartitionContext ); } finally { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?view=diff&rev=528813&r1=528812&r2=528813 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Sat Apr 14 07:27:27 2007 @@ -39,13 +39,13 @@ import javax.naming.directory.SearchResult; 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.enumeration.ReferralHandlingEnumeration; import org.apache.directory.server.core.enumeration.SearchResultFilter; import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration; import org.apache.directory.server.core.interceptor.BaseInterceptor; import org.apache.directory.server.core.interceptor.NextInterceptor; +import org.apache.directory.server.core.interceptor.context.AddContextPartitionServiceContext; import org.apache.directory.server.core.interceptor.context.AddServiceContext; import org.apache.directory.server.core.interceptor.context.LookupServiceContext; import org.apache.directory.server.core.interceptor.context.RenameServiceContext; @@ -868,12 +868,12 @@ } - public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) throws NamingException + public void addContextPartition( NextInterceptor next, ServiceContext addContextPartitionContext ) throws NamingException { - next.addContextPartition( cfg ); + next.addContextPartition( addContextPartitionContext ); // add referrals immediately after adding the new partition - Partition partition = cfg.getContextPartition(); + Partition partition = ((AddContextPartitionServiceContext)addContextPartitionContext).getCfg().getContextPartition(); LdapDN suffix = partition.getSuffix(); Invocation invocation = InvocationStack.getInstance().peek(); NamingEnumeration list = invocation.getProxy().search( suffix, env, getReferralFilter(), getControls(), Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?view=diff&rev=528813&r1=528812&r2=528813 ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Sat Apr 14 07:27:27 2007 @@ -317,11 +317,11 @@ } - public void addContextPartition( NextInterceptor next, PartitionConfiguration cfg ) + public void addContextPartition( NextInterceptor next, ServiceContext addContextPartitionContext ) throws NamingException { interceptors.add( this ); - next.addContextPartition( cfg ); + next.addContextPartition( addContextPartitionContext ); }