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/

[el...@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
     {
     }