directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r953093 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/interceptor/ core-api/src/test/java/org/apache/directory/server/core/ core/src/main/java/org/apache/directory/server/core/ core/src/main/java/or...
Date Wed, 09 Jun 2010 17:41:04 GMT
Author: elecharny
Date: Wed Jun  9 17:41:03 2010
New Revision: 953093

URL: http://svn.apache.org/viewvc?rev=953093&view=rev
Log:
o Added missing Javadoc
o Renamed opContext to moveContext

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.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/referral/ReferralInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -171,9 +171,12 @@ public abstract class BaseInterceptor im
     }
 
 
-    public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
+    /**
+     * {@inheritDoc}
+     */
+    public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
-        next.move( opContext );
+        next.move( moveContext );
     }
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
Wed Jun  9 17:41:03 2010
@@ -155,9 +155,9 @@ public class InterceptorChain
         }
 
 
-        public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
+        public void move( NextInterceptor next, MoveOperationContext moveContext ) throws
LdapException
         {
-            nexus.move( opContext );
+            nexus.move( moveContext );
         }
 
 

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=953093&r1=953092&r2=953093&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
Wed Jun  9 17:41:03 2010
@@ -149,10 +149,10 @@ public class MockInterceptor implements 
     }
 
 
-    public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
+    public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
         interceptors.add( this );
-        next.move( opContext );
+        next.move( moveContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
Wed Jun  9 17:41:03 2010
@@ -661,9 +661,9 @@ public class DefaultOperationManager imp
             DN dn = opContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
-            // Normalize the opContext DN
-            DN parentDn = opContext.getNewSuperior();
-            parentDn.normalize( directoryService.getSchemaManager().getNormalizerMapping()
);
+            // Normalize the opContext superior DN
+            DN newSuperiorDn = opContext.getNewSuperior();
+            newSuperiorDn.normalize( directoryService.getSchemaManager().getNormalizerMapping()
);
 
             // We have to deal with the referral first
             directoryService.getReferralManager().lockRead();
@@ -717,8 +717,8 @@ public class DefaultOperationManager imp
             // Now, check the destination
             // If he parent DN is a referral, or has a referral ancestor, we have to issue
a AffectMultipleDsas result
             // as stated by RFC 3296 Section 5.6.2
-            if ( directoryService.getReferralManager().isReferral( parentDn )
-                || directoryService.getReferralManager().hasParentReferral( parentDn ) )
+            if ( directoryService.getReferralManager().isReferral( newSuperiorDn )
+                || directoryService.getReferralManager().hasParentReferral( newSuperiorDn
) )
             {
                 // Unlock the referral manager
                 directoryService.getReferralManager().unlock();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -338,16 +338,19 @@ public class AuthenticationInterceptor e
     }
 
 
-    public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
+    /**
+     * {@inheritDoc}
+     */
+    public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
         if ( IS_DEBUG )
         {
-            LOG.debug( "Operation Context: {}", opContext );
+            LOG.debug( "Operation Context: {}", moveContext );
         }
 
-        checkAuthenticated( opContext );
-        next.move( opContext );
-        invalidateAuthenticatorCaches( opContext.getDn() );
+        checkAuthenticated( moveContext );
+        next.move( moveContext );
+        invalidateAuthenticatorCaches( moveContext.getDn() );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -906,6 +906,9 @@ public class AciAuthorizationInterceptor
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
         DN oriChildName = moveContext.getDn();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -319,14 +319,17 @@ public class DefaultAuthorizationInterce
     }
 
 
-    public void move( NextInterceptor nextInterceptor, MoveOperationContext opContext ) throws
LdapException
+    /**
+     * {@inheritDoc}
+     */
+    public void move( NextInterceptor nextInterceptor, MoveOperationContext moveContext )
throws LdapException
     {
-        if ( !opContext.getSession().getDirectoryService().isAccessControlEnabled() )
+        if ( !moveContext.getSession().getDirectoryService().isAccessControlEnabled() )
         {
-            protectDnAlterations( opContext.getDn() );
+            protectDnAlterations( moveContext.getDn() );
         }
 
-        nextInterceptor.move( opContext );
+        nextInterceptor.move( moveContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -352,21 +352,24 @@ public class ChangeLogInterceptor extend
     }
 
 
-    public void move ( NextInterceptor next, MoveOperationContext opCtx ) throws LdapException
+    /**
+     * {@inheritDoc}
+     */
+    public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
-        next.move( opCtx );
+        next.move( moveContext );
 
-        if ( ! changeLog.isEnabled() || ! opCtx.isFirstOperation() )
+        if ( ! changeLog.isEnabled() || ! moveContext.isFirstOperation() )
         {
             return;
         }
 
         LdifEntry forward = new LdifEntry();
         forward.setChangeType( ChangeType.ModDn );
-        forward.setDn( opCtx.getDn() );
-        forward.setNewSuperior( opCtx.getNewSuperior().getName() );
+        forward.setDn( moveContext.getDn() );
+        forward.setNewSuperior( moveContext.getNewSuperior().getName() );
 
-        LdifEntry reverse = LdifRevertor.reverseMove( opCtx.getNewSuperior(), opCtx.getDn()
);
-        opCtx.setChangeLogEvent( changeLog.log( getPrincipal(), forward, reverse ) );
+        LdifEntry reverse = LdifRevertor.reverseMove( moveContext.getNewSuperior(), moveContext.getDn()
);
+        moveContext.setChangeLogEvent( changeLog.log( getPrincipal(), forward, reverse )
);
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -266,12 +266,15 @@ public class EventInterceptor extends Ba
     }
 
 
-    public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
+    /**
+     * {@inheritDoc}
+     */
+    public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
-        Entry oriEntry = opContext.getEntry();
-        List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(),
oriEntry );
+        Entry oriEntry = moveContext.getEntry();
+        List<RegistrationEntry> selecting = getSelectingRegistrations( moveContext.getDn(),
oriEntry );
 
-        next.move( opContext );
+        next.move( moveContext );
 
         if ( selecting.isEmpty() )
         {
@@ -282,7 +285,7 @@ public class EventInterceptor extends Ba
         {
             if ( EventType.isMove( registration.getCriteria().getEventMask() ) )
             {
-                fire( opContext, EventType.MOVE, registration.getListener() );
+                fire( moveContext, EventType.MOVE, registration.getListener() );
             }
         }
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -379,12 +379,11 @@ public class ExceptionInterceptor extend
 
 
     /**
-     * Checks to see the entry being moved exists, and so does its parent, otherwise throws
the appropriate
-     * LdapException.
+     * {@inheritDoc}
      */
-    public void move( NextInterceptor nextInterceptor, MoveOperationContext opContext ) throws
LdapException
+    public void move( NextInterceptor nextInterceptor, MoveOperationContext moveContext )
throws LdapException
     {
-        DN oriChildName = opContext.getDn();
+        DN oriChildName = moveContext.getDn();
 
         if ( oriChildName.equals( subschemSubentryDn ) )
         {
@@ -392,7 +391,7 @@ public class ExceptionInterceptor extend
                 subschemSubentryDn, subschemSubentryDn ) );
         }
 
-        nextInterceptor.move( opContext );
+        nextInterceptor.move( moveContext );
 
         // Remove the original entry from the NotAlias cache, if needed
         synchronized ( notAliasCache )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -329,7 +329,7 @@ public class JournalInterceptor extends 
     /**
      * {@inheritDoc}
      */
-    public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
+    public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
         long opRevision = 0;
         
@@ -340,15 +340,15 @@ public class JournalInterceptor extends 
             // Store the moved entry
             LdifEntry ldif = new LdifEntry();
             ldif.setChangeType( ChangeType.ModDn );
-            ldif.setDn( opContext.getDn() );
-            ldif.setNewSuperior( opContext.getNewSuperior().getNormName() );
+            ldif.setDn( moveContext.getDn() );
+            ldif.setNewSuperior( moveContext.getNewSuperior().getNormName() );
             
             journal.log( getPrincipal(), opRevision, ldif );
         }
         
         try
         {
-            next.move( opContext );
+            next.move( moveContext );
             
             if ( journalEnabled )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -431,10 +431,10 @@ public class TimerInterceptor implements
     /**
      * {@inheritDoc}
      */
-    public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
+    public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
         long t0 = System.nanoTime();
-        next.move( opContext );
+        next.move( moveContext );
         long delta = System.nanoTime() - t0;
         
         if ( IS_DEBUG_STATS )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -327,19 +327,22 @@ public class OperationalAttributeInterce
     }
 
 
-    public void move( NextInterceptor nextInterceptor, MoveOperationContext opContext ) throws
LdapException
+    /**
+     * {@inheritDoc}
+     */
+    public void move( NextInterceptor nextInterceptor, MoveOperationContext moveContext )
throws LdapException
     {
-        nextInterceptor.move( opContext );
+        nextInterceptor.move( moveContext );
 
         // add operational attributes after call in case the operation fails
-        Entry serverEntry = new DefaultEntry( schemaManager, opContext.getDn() );
+        Entry serverEntry = new DefaultEntry( schemaManager, moveContext.getDn() );
         serverEntry.put( SchemaConstants.MODIFIERS_NAME_AT, getPrincipal().getName() );
         serverEntry.put( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
 
         List<Modification> items = ModifyOperationContext.createModItems( serverEntry,
             ModificationOperation.REPLACE_ATTRIBUTE );
 
-        ModifyOperationContext newModify = new ModifyOperationContext( opContext.getSession(),
opContext.getNewSuperior(),
+        ModifyOperationContext newModify = new ModifyOperationContext( moveContext.getSession(),
moveContext.getNewSuperior(),
             items );
 
         service.getPartitionNexus().modify( newModify );

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?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- 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
Wed Jun  9 17:41:03 2010
@@ -697,10 +697,15 @@ public class DefaultPartitionNexus exten
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.partition.PartitionNexus#move(org.apache.directory.server.core.interceptor.context.MoveOperationContext)
      */
-    public void move( MoveOperationContext opContext ) throws LdapException
+    public void move( MoveOperationContext moveContext ) throws LdapException
     {
-        Partition backend = getPartition( opContext.getDn() );
-        backend.move( opContext );
+        // Get the current partition
+        Partition backend = getPartition( moveContext.getDn() );
+        
+        // We also have to get the new partition as it can be different
+        //Partition newBackend = getPartition( opContext.getNewDn() );
+        
+        backend.move( moveContext );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -289,26 +289,26 @@ public class ReferralInterceptor extends
     /**
      * {@inheritDoc}
      **/
-    public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
+    public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
-        DN newDn = opContext.getNewDn();
+        DN newDn = moveContext.getNewDn();
 
         // Check if the entry is a referral itself
-        boolean isReferral = isReferral( opContext.getEntry() );
+        boolean isReferral = isReferral( moveContext.getEntry() );
 
-        next.move( opContext );
+        next.move( moveContext );
 
         if ( isReferral )
         {
             // Update the referralManager
-            LookupOperationContext lookupContext = new LookupOperationContext( opContext.getSession(),
newDn );
+            LookupOperationContext lookupContext = new LookupOperationContext( moveContext.getSession(),
newDn );
 
             Entry newEntry = nexus.lookup( lookupContext );
 
             referralManager.lockWrite();
 
             referralManager.addReferral( newEntry );
-            referralManager.removeReferral( opContext.getEntry() );
+            referralManager.removeReferral( moveContext.getEntry() );
 
             referralManager.unlock();
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -961,12 +961,15 @@ public class SubentryInterceptor extends
     }
 
 
-    public void move( NextInterceptor next, MoveOperationContext opContext ) throws LdapException
+    /**
+     * {@inheritDoc}
+     */
+    public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
-        DN oriChildName = opContext.getDn();
-        DN newParentName = opContext.getNewSuperior();
+        DN oriChildName = moveContext.getDn();
+        DN newParentName = moveContext.getNewSuperior();
 
-        Entry entry = opContext.getEntry();
+        Entry entry = moveContext.getEntry();
 
         EntryAttribute objectClasses = entry.get( SchemaConstants.OBJECT_CLASS_AT );
 
@@ -984,7 +987,7 @@ public class SubentryInterceptor extends
 
             String newNormName = newName.getNormName();
             subentryCache.setSubentry( newNormName, ss, subentry.getTypes() );
-            next.move( opContext );
+            next.move( moveContext );
 
             subentry = subentryCache.getSubentry( newNormName );
 
@@ -994,7 +997,7 @@ public class SubentryInterceptor extends
             controls.setReturningAttributes( new String[]
                 { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES
} );
 
-            SearchOperationContext searchOperationContext = new SearchOperationContext( opContext.getSession(),
baseDn,
+            SearchOperationContext searchOperationContext = new SearchOperationContext( moveContext.getSession(),
baseDn,
                 filter, controls );
             searchOperationContext.setAliasDerefMode( AliasDerefMode.NEVER_DEREF_ALIASES
);
 
@@ -1010,7 +1013,7 @@ public class SubentryInterceptor extends
     
                     if ( evaluator.evaluate( ss, apName, dn, candidate ) )
                     {
-                        nexus.modify( new ModifyOperationContext( opContext.getSession(),
dn, getOperationalModsForReplace(
+                        nexus.modify( new ModifyOperationContext( moveContext.getSession(),
dn, getOperationalModsForReplace(
                             oriChildName, newName, subentry, candidate ) ) );
                     }
                 }
@@ -1024,23 +1027,23 @@ public class SubentryInterceptor extends
         }
         else
         {
-            if ( hasAdministrativeDescendant( opContext, oriChildName ) )
+            if ( hasAdministrativeDescendant( moveContext, oriChildName ) )
             {
                 String msg = I18n.err( I18n.ERR_308 );
                 LOG.warn( msg );
                 throw new LdapSchemaViolationException( ResultCodeEnum.NOT_ALLOWED_ON_RDN,
msg );
             }
 
-            next.move( opContext );
+            next.move( moveContext );
 
             // calculate the new DN now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
-            DN newName = opContext.getNewDn();
+            DN newName = moveContext.getNewDn();
             List<Modification> mods = getModsOnEntryRdnChange( oriChildName, newName,
entry );
 
             if ( mods.size() > 0 )
             {
-                nexus.modify( new ModifyOperationContext( opContext.getSession(), newName,
mods ) );
+                nexus.modify( new ModifyOperationContext( moveContext.getSession(), newName,
mods ) );
             }
         }
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=953093&r1=953092&r2=953093&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
Wed Jun  9 17:41:03 2010
@@ -480,6 +480,9 @@ public class TriggerInterceptor extends 
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
         // Bypass trigger handling if the service is disabled.



Mime
View raw message