Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 57666 invoked from network); 14 Jun 2010 14:55:18 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Jun 2010 14:55:18 -0000 Received: (qmail 24347 invoked by uid 500); 14 Jun 2010 14:55:18 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 24310 invoked by uid 500); 14 Jun 2010 14:55:17 -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 24301 invoked by uid 99); 14 Jun 2010 14:55:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jun 2010 14:55:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jun 2010 14:55:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 646FF23889B3; Mon, 14 Jun 2010 14:54:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r954501 - in /directory/apacheds/trunk/core-api/src: main/java/org/apache/directory/server/core/schema/ test/java/org/apache/directory/server/core/ Date: Mon, 14 Jun 2010 14:54:28 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100614145428.646FF23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Jun 14 14:54:27 2010 New Revision: 954501 URL: http://svn.apache.org/viewvc?rev=954501&view=rev Log: Renamed the opContext param to moveAndRenameContext for the MoveAndRename operation Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=954501&r1=954500&r2=954501&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Mon Jun 14 14:54:27 2010 @@ -384,13 +384,13 @@ public final class SchemaPartition exten /* (non-Javadoc) * @see org.apache.directory.server.core.partition.Partition#moveAndRename(org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext) */ - public void moveAndRename( MoveAndRenameOperationContext opContext ) throws LdapException + public void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException { - boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID ); - Entry entry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS ); - synchronizer.moveAndRename( opContext, entry, cascade ); - wrapped.moveAndRename( opContext ); - updateSchemaModificationAttributes( opContext ); + boolean cascade = moveAndRenameContext.hasRequestControl( CascadeControl.CONTROL_OID ); + Entry entry = moveAndRenameContext.lookup( moveAndRenameContext.getDn(), ByPassConstants.LOOKUP_BYPASS ); + synchronizer.moveAndRename( moveAndRenameContext, entry, cascade ); + wrapped.moveAndRename( moveAndRenameContext ); + updateSchemaModificationAttributes( moveAndRenameContext ); } Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java?rev=954501&r1=954500&r2=954501&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java Mon Jun 14 14:54:27 2010 @@ -156,10 +156,10 @@ public class MockInterceptor implements } - public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext ) throws LdapException + public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException { interceptors.add( this ); - next.moveAndRename( opContext ); + next.moveAndRename( moveAndRenameContext ); } Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java?rev=954501&r1=954500&r2=954501&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java Mon Jun 14 14:54:27 2010 @@ -96,7 +96,7 @@ public class MockOperationManager implem { } - public void moveAndRename( MoveAndRenameOperationContext opContext ) throws LdapException + public void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException { }