directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r955056 [5/5] - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/ apacheds/trunk/core-api/src/main/java/org/apache/directory/...
Date Tue, 15 Jun 2010 21:15:06 GMT
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=955056&r1=955055&r2=955056&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
Tue Jun 15 21:15:04 2010
@@ -325,37 +325,37 @@ public class TriggerInterceptor extends 
     }
 
 
-    public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws LdapException
+    public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws
LdapException
     {
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )
         {
-            next.modify( opContext );
+            next.modify( modifyContext );
             return;
         }
 
-        DN normName = opContext.getDn();
+        DN normName = modifyContext.getDn();
 
         // Gather supplementary data.
-        Entry originalEntry = opContext.getEntry();
+        Entry originalEntry = modifyContext.getEntry();
 
-        StoredProcedureParameterInjector injector = new ModifyStoredProcedureParameterInjector(
opContext );
+        StoredProcedureParameterInjector injector = new ModifyStoredProcedureParameterInjector(
modifyContext );
 
         // Gather Trigger Specifications which apply to the entry being modified.
         List<TriggerSpecification> triggerSpecs = new ArrayList<TriggerSpecification>();
-        addPrescriptiveTriggerSpecs( opContext, triggerSpecs, normName, originalEntry );
+        addPrescriptiveTriggerSpecs( modifyContext, triggerSpecs, normName, originalEntry
);
         addEntryTriggerSpecs( triggerSpecs, originalEntry );
 
         Map<ActionTime, List<TriggerSpecification>> triggerMap = getActionTimeMappedTriggerSpecsForOperation(
             triggerSpecs, LdapOperation.MODIFY );
 
-        next.modify( opContext );
+        next.modify( modifyContext );
 
-        triggerSpecCache.subentryModified( opContext, originalEntry );
+        triggerSpecCache.subentryModified( modifyContext, originalEntry );
 
         // Fire AFTER Triggers.
         List<TriggerSpecification> afterTriggerSpecs = triggerMap.get( ActionTime.AFTER
);
-        executeTriggers( opContext, afterTriggerSpecs, injector );
+        executeTriggers( modifyContext, afterTriggerSpecs, injector );
     }
 
 
@@ -616,5 +616,4 @@ public class TriggerInterceptor extends 
             throw lne;
         }
     }
-
 }

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?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- 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
Tue Jun 15 21:15:04 2010
@@ -90,12 +90,12 @@ public class InterceptorChainTest
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(),
AuthenticationLevel.STRONG ),
             ds );
-        LookupOperationContext opContext = new LookupOperationContext( session, dn );
-        InvocationStack.getInstance().push( opContext );
+        LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
+        InvocationStack.getInstance().push( lookupContext );
 
         try
         {
-            chain.lookup( opContext );
+            chain.lookup( lookupContext );
         }
         catch ( Exception e )
         {
@@ -116,13 +116,13 @@ public class InterceptorChainTest
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(),
AuthenticationLevel.STRONG ),
             ds );
-        LookupOperationContext opContext = new LookupOperationContext( session, dn );
-        opContext.setByPassed( Collections.singleton( "0" ) );
-        InvocationStack.getInstance().push( opContext );
+        LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
+        lookupContext.setByPassed( Collections.singleton( "0" ) );
+        InvocationStack.getInstance().push( lookupContext );
 
         try
         {
-            chain.lookup( opContext );
+            chain.lookup( lookupContext );
         }
         catch ( Exception e )
         {
@@ -143,16 +143,16 @@ public class InterceptorChainTest
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(),
AuthenticationLevel.STRONG ),
             ds );
-        LookupOperationContext opContext = new LookupOperationContext( session, dn );
+        LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
         Set<String> bypass = new HashSet<String>();
         bypass.add( "0" );
         bypass.add( "1" );
-        opContext.setByPassed( bypass );
-        InvocationStack.getInstance().push( opContext );
+        lookupContext.setByPassed( bypass );
+        InvocationStack.getInstance().push( lookupContext );
 
         try
         {
-            chain.lookup( opContext );
+            chain.lookup( lookupContext );
         }
         catch ( Exception e )
         {
@@ -173,16 +173,16 @@ public class InterceptorChainTest
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(),
AuthenticationLevel.STRONG ),
             ds );
-        LookupOperationContext opContext = new LookupOperationContext( session, dn );
+        LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
         Set<String> bypass = new HashSet<String>();
         bypass.add( "0" );
         bypass.add( "4" );
-        opContext.setByPassed( bypass );
-        InvocationStack.getInstance().push( opContext );
+        lookupContext.setByPassed( bypass );
+        InvocationStack.getInstance().push( lookupContext );
 
         try
         {
-            chain.lookup( opContext );
+            chain.lookup( lookupContext );
         }
         catch ( Exception e )
         {
@@ -202,16 +202,16 @@ public class InterceptorChainTest
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(),
AuthenticationLevel.STRONG ),
             ds );
-        LookupOperationContext opContext = new LookupOperationContext( session, dn );
+        LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
         Set<String> bypass = new HashSet<String>();
         bypass.add( "1" );
         bypass.add( "3" );
-        opContext.setByPassed( bypass );
-        InvocationStack.getInstance().push( opContext );
+        lookupContext.setByPassed( bypass );
+        InvocationStack.getInstance().push( lookupContext );
 
         try
         {
-            chain.lookup( opContext );
+            chain.lookup( lookupContext );
         }
         catch ( Exception e )
         {
@@ -231,13 +231,13 @@ public class InterceptorChainTest
         DirectoryService ds = new MockDirectoryService( 0 );
         DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(),
AuthenticationLevel.STRONG ),
             ds );
-        LookupOperationContext opContext = new LookupOperationContext( session, dn );
-        opContext.setByPassed( ByPassConstants.BYPASS_ALL_COLLECTION );
-        InvocationStack.getInstance().push( opContext );
+        LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
+        lookupContext.setByPassed( ByPassConstants.BYPASS_ALL_COLLECTION );
+        InvocationStack.getInstance().push( lookupContext );
 
         try
         {
-            chain.lookup( opContext );
+            chain.lookup( lookupContext );
         }
         catch ( Exception e )
         {

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
(original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
Tue Jun 15 21:15:04 2010
@@ -344,7 +344,7 @@ public class SimpleBindRequestTest exten
                 /**
                  * Wait 1 second before going any further
                  */
-                public void bind( NextInterceptor next, BindOperationContext opContext )
throws LdapException
+                public void bind( NextInterceptor next, BindOperationContext bindContext
) throws LdapException
                 {
                     // Wait 1 second
                     try
@@ -356,7 +356,7 @@ public class SimpleBindRequestTest exten
                         // Ok, get out
                     }
                     
-                    next.bind( opContext );
+                    next.bind( bindContext );
                 }
             } );
             

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
Tue Jun 15 21:15:04 2010
@@ -104,14 +104,14 @@ public class BindHandler extends LdapReq
 
         // create a new Bind context, with a null session, as we don't have 
         // any context yet.
-        BindOperationContext opContext = new BindOperationContext( null );
+        BindOperationContext bindContext = new BindOperationContext( null );
         
         // Stores the DN of the user to check, and its password
-        opContext.setDn( bindRequest.getName() );
-        opContext.setCredentials( bindRequest.getCredentials() );
+        bindContext.setDn( bindRequest.getName() );
+        bindContext.setCredentials( bindRequest.getCredentials() );
 
         // Stores the request controls into the operation context
-        LdapProtocolUtils.setRequestControls( opContext, bindRequest );
+        LdapProtocolUtils.setRequestControls( bindContext, bindRequest );
 
         try
         {
@@ -172,10 +172,10 @@ public class BindHandler extends LdapReq
             // opContext.setEntry( principalEntry );
 
             // And call the OperationManager bind operation.
-            getLdapServer().getDirectoryService().getOperationManager().bind( opContext );
+            getLdapServer().getDirectoryService().getOperationManager().bind( bindContext
);
 
             // As a result, store the created session in the Core Session
-            ldapSession.setCoreSession( opContext.getSession() );
+            ldapSession.setCoreSession( bindContext.getSession() );
 
             // And set the current state accordingly
             if ( !ldapSession.getCoreSession().isAnonymous() )

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
Tue Jun 15 21:15:04 2010
@@ -127,7 +127,7 @@ public class PersistentSearchListener im
     }
 
 
-    public void entryAdded( AddOperationContext opContext )
+    public void entryAdded( AddOperationContext addContext )
     {
         if ( ! control.isNotificationEnabled( ChangeType.ADD ) )
         {
@@ -135,14 +135,14 @@ public class PersistentSearchListener im
         }
     
         InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
-        respEntry.setObjectName( opContext.getDn() );
-        respEntry.setEntry( opContext.getEntry() );
-        setECResponseControl( respEntry, opContext, ChangeType.ADD );
+        respEntry.setObjectName( addContext.getDn() );
+        respEntry.setEntry( addContext.getEntry() );
+        setECResponseControl( respEntry, addContext, ChangeType.ADD );
         session.getIoSession().write( respEntry );
     }
 
 
-    public void entryDeleted( DeleteOperationContext opContext )
+    public void entryDeleted( DeleteOperationContext deleteContext )
     {
         if ( ! control.isNotificationEnabled( ChangeType.DELETE ) )
         {
@@ -150,14 +150,14 @@ public class PersistentSearchListener im
         }
     
         InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
-        respEntry.setObjectName( opContext.getDn() );
-        respEntry.setEntry( opContext.getEntry() );
-        setECResponseControl( respEntry, opContext, ChangeType.DELETE );
+        respEntry.setObjectName( deleteContext.getDn() );
+        respEntry.setEntry( deleteContext.getEntry() );
+        setECResponseControl( respEntry, deleteContext, ChangeType.DELETE );
         session.getIoSession().write( respEntry );
     }
 
 
-    public void entryModified( ModifyOperationContext opContext )
+    public void entryModified( ModifyOperationContext modifyContext )
     {
         if ( ! control.isNotificationEnabled( ChangeType.MODIFY ) )
         {
@@ -165,14 +165,14 @@ public class PersistentSearchListener im
         }
     
         InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
-        respEntry.setObjectName( opContext.getDn() );
-        respEntry.setEntry( opContext.getAlteredEntry() );
-        setECResponseControl( respEntry, opContext, ChangeType.MODIFY );
+        respEntry.setObjectName( modifyContext.getDn() );
+        respEntry.setEntry( modifyContext.getAlteredEntry() );
+        setECResponseControl( respEntry, modifyContext, ChangeType.MODIFY );
         session.getIoSession().write( respEntry );
     }
 
 
-    public void entryMoved( MoveOperationContext opContext )
+    public void entryMoved( MoveOperationContext moveContext )
     {
         if ( ! control.isNotificationEnabled( ChangeType.MODDN ) )
         {
@@ -180,20 +180,20 @@ public class PersistentSearchListener im
         }
     
         InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
-        respEntry.setObjectName( opContext.getDn() );
-        respEntry.setEntry( opContext.getEntry() );
-        setECResponseControl( respEntry, opContext, ChangeType.MODDN );
+        respEntry.setObjectName( moveContext.getDn() );
+        respEntry.setEntry( moveContext.getEntry() );
+        setECResponseControl( respEntry, moveContext, ChangeType.MODDN );
         session.getIoSession().write( respEntry );
     }
 
 
-    public void entryMovedAndRenamed( MoveAndRenameOperationContext opContext )
+    public void entryMovedAndRenamed( MoveAndRenameOperationContext moveAndRenameContext
)
     {
-        entryRenamed( opContext );
+        entryRenamed( moveAndRenameContext );
     }
 
 
-    public void entryRenamed( RenameOperationContext opContext )
+    public void entryRenamed( RenameOperationContext renameContext )
     {
         if ( ! control.isNotificationEnabled( ChangeType.MODDN ) )
         {
@@ -201,9 +201,9 @@ public class PersistentSearchListener im
         }
     
         InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
-        respEntry.setObjectName( opContext.getModifiedEntry().getDn() );
-        respEntry.setEntry( opContext.getModifiedEntry() );
-        setECResponseControl( respEntry, opContext, ChangeType.MODDN );
+        respEntry.setObjectName( renameContext.getModifiedEntry().getDn() );
+        respEntry.setEntry( renameContext.getModifiedEntry() );
+        setECResponseControl( respEntry, renameContext, ChangeType.MODDN );
         session.getIoSession().write( respEntry );
     }
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
Tue Jun 15 21:15:04 2010
@@ -55,29 +55,29 @@ public class SimpleMechanismHandler impl
     {
         // create a new Bind context, with a null session, as we don't have 
         // any context yet.
-        BindOperationContext opContext = new BindOperationContext( null );
+        BindOperationContext bindContext = new BindOperationContext( null );
         
         // Stores the DN of the user to check, and its password
-        opContext.setDn( bindRequest.getName() );
-        opContext.setCredentials( bindRequest.getCredentials() );
+        bindContext.setDn( bindRequest.getName() );
+        bindContext.setCredentials( bindRequest.getCredentials() );
 
         // Stores the request controls into the operation context
-        LdapProtocolUtils.setRequestControls( opContext, bindRequest );
+        LdapProtocolUtils.setRequestControls( bindContext, bindRequest );
         
         try
         {
             CoreSession adminSession = ldapSession.getLdapServer().getDirectoryService().getAdminSession();
 
             // And call the OperationManager bind operation.
-            adminSession.getDirectoryService().getOperationManager().bind( opContext );
+            adminSession.getDirectoryService().getOperationManager().bind( bindContext );
             
             // As a result, store the created session in the Core Session
-            ldapSession.setCoreSession( opContext.getSession() );
+            ldapSession.setCoreSession( bindContext.getSession() );
             
             // Return the successful response
             InternalBindResponse response = ( InternalBindResponse ) bindRequest.getResultResponse();
             response.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
-            LdapProtocolUtils.setResponseControls( opContext, response );
+            LdapProtocolUtils.setResponseControls( bindContext, response );
             
             // Write it back to the client
             ldapSession.getIoSession().write( response );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
Tue Jun 15 21:15:04 2010
@@ -130,9 +130,9 @@ public class SyncReplSearchListener impl
     }
 
 
-    public void entryAdded( AddOperationContext opContext )
+    public void entryAdded( AddOperationContext addContext )
     {
-        Entry entry = opContext.getEntry();
+        Entry entry = addContext.getEntry();
 
         LOG.debug( "sending added entry {}", entry.getDn() );
         
@@ -157,7 +157,7 @@ public class SyncReplSearchListener impl
             }
             else
             {
-                clientMsgLog.log( EventType.ADD, opContext.getEntry() );
+                clientMsgLog.log( EventType.ADD, addContext.getEntry() );
             }
         }
         catch ( LdapInvalidAttributeValueException e )
@@ -168,9 +168,9 @@ public class SyncReplSearchListener impl
     }
 
 
-    public void entryDeleted( DeleteOperationContext opContext )
+    public void entryDeleted( DeleteOperationContext deleteContext )
     {
-        sendDeletedEntry( opContext.getEntry() );
+        sendDeletedEntry( deleteContext.getEntry() );
     }
 
 
@@ -210,9 +210,9 @@ public class SyncReplSearchListener impl
     }
     
     
-    public void entryModified( ModifyOperationContext opContext )
+    public void entryModified( ModifyOperationContext modifyContext )
     {
-        Entry alteredEntry = opContext.getAlteredEntry();
+        Entry alteredEntry = modifyContext.getAlteredEntry();
 
         LOG.debug( "sending modified entry {}", alteredEntry.getDn() );
 
@@ -222,7 +222,7 @@ public class SyncReplSearchListener impl
             {
                 
                 InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
-                respEntry.setObjectName( opContext.getDn() );
+                respEntry.setObjectName( modifyContext.getDn() );
                 respEntry.setEntry( alteredEntry );
 
                 SyncStateValueControl syncModify = new SyncStateValueControl();
@@ -239,7 +239,7 @@ public class SyncReplSearchListener impl
             }
             else
             {
-                clientMsgLog.log( EventType.MODIFY, opContext.getAlteredEntry() );
+                clientMsgLog.log( EventType.MODIFY, modifyContext.getAlteredEntry() );
             }
         }
         catch ( Exception e )
@@ -249,28 +249,28 @@ public class SyncReplSearchListener impl
     }
 
 
-    public void entryMoved( MoveOperationContext opContext )
+    public void entryMoved( MoveOperationContext moveContext )
     {
-        Entry entry = opContext.getEntry();
+        Entry entry = moveContext.getEntry();
 
         LOG.debug( "sending moved entry {}", entry.getDn() );
 
         try
         {
-            if( ! opContext.getNewSuperior().isChildOf( clientMsgLog.getSearchCriteria().getBase()
) )
+            if( ! moveContext.getNewSuperior().isChildOf( clientMsgLog.getSearchCriteria().getBase()
) )
             {
-                sendDeletedEntry( opContext.getEntry() );
+                sendDeletedEntry( moveContext.getEntry() );
                 return;
             }
             
             SyncModifyDnControl modDnControl = new SyncModifyDnControl( SyncModifyDnType.MOVE
);
-            modDnControl.setEntryDn( opContext.getDn().getNormName() );
-            modDnControl.setNewSuperiorDn( opContext.getNewSuperior().getNormName() );
+            modDnControl.setEntryDn( moveContext.getDn().getNormName() );
+            modDnControl.setNewSuperiorDn( moveContext.getNewSuperior().getNormName() );
 
             if ( pushInRealTime )
             {
                 InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
-                respEntry.setObjectName( opContext.getDn() );
+                respEntry.setObjectName( moveContext.getDn() );
                 respEntry.setEntry( entry );
 
                 SyncStateValueControl syncModify = new SyncStateValueControl();
@@ -287,7 +287,7 @@ public class SyncReplSearchListener impl
             }
             else
             {
-                clientMsgLog.log( new ReplicaEventMessage( modDnControl, opContext.getEntry()
) );
+                clientMsgLog.log( new ReplicaEventMessage( modDnControl, moveContext.getEntry()
) );
             }
         }
         catch ( Exception e )
@@ -297,31 +297,31 @@ public class SyncReplSearchListener impl
     }
 
 
-    public void entryMovedAndRenamed( MoveAndRenameOperationContext opContext )
+    public void entryMovedAndRenamed( MoveAndRenameOperationContext moveAndRenameContext
)
     {
         
-        LOG.debug( "sending moveAndRenamed entry {}", opContext.getDn() );
+        LOG.debug( "sending moveAndRenamed entry {}", moveAndRenameContext.getDn() );
 
         try
         {
-            if( ! opContext.getNewSuperiorDn().isChildOf( clientMsgLog.getSearchCriteria().getBase()
) )
+            if( ! moveAndRenameContext.getNewSuperiorDn().isChildOf( clientMsgLog.getSearchCriteria().getBase()
) )
             {
-                sendDeletedEntry( opContext.getEntry() );
+                sendDeletedEntry( moveAndRenameContext.getEntry() );
                 return;
             }
 
             SyncModifyDnControl modDnControl = new SyncModifyDnControl( SyncModifyDnType.MOVEANDRENAME
);
-            modDnControl.setEntryDn( opContext.getDn().getNormName() );
-            modDnControl.setNewSuperiorDn( opContext.getNewSuperiorDn().getNormName() );
-            modDnControl.setNewRdn( opContext.getNewRdn().getNormName() );
-            modDnControl.setDeleteOldRdn( opContext.getDeleteOldRdn() );
+            modDnControl.setEntryDn( moveAndRenameContext.getDn().getNormName() );
+            modDnControl.setNewSuperiorDn( moveAndRenameContext.getNewSuperiorDn().getNormName()
);
+            modDnControl.setNewRdn( moveAndRenameContext.getNewRdn().getNormName() );
+            modDnControl.setDeleteOldRdn( moveAndRenameContext.getDeleteOldRdn() );
 
             if ( pushInRealTime )
             {
-                Entry alteredEntry = opContext.getModifiedEntry();
+                Entry alteredEntry = moveAndRenameContext.getModifiedEntry();
                 
                 InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId()
);
-                respEntry.setObjectName( opContext.getModifiedEntry().getDn() );
+                respEntry.setObjectName( moveAndRenameContext.getModifiedEntry().getDn()
);
                 respEntry.setEntry( alteredEntry );
 
                 SyncStateValueControl syncModify = new SyncStateValueControl();
@@ -338,7 +338,7 @@ public class SyncReplSearchListener impl
             }
             else
             {
-                clientMsgLog.log( new ReplicaEventMessage( modDnControl, opContext.getEntry()
) );
+                clientMsgLog.log( new ReplicaEventMessage( modDnControl, moveAndRenameContext.getEntry()
) );
             }
         }
         catch ( Exception e )
@@ -348,9 +348,9 @@ public class SyncReplSearchListener impl
     }
 
 
-    public void entryRenamed( RenameOperationContext opContext )
+    public void entryRenamed( RenameOperationContext renameContext )
     {
-        Entry entry = opContext.getEntry();
+        Entry entry = renameContext.getEntry();
         
         LOG.debug( "sending renamed entry {}", entry.getDn() );
         
@@ -358,9 +358,9 @@ public class SyncReplSearchListener impl
         {
             SyncModifyDnControl modDnControl = new SyncModifyDnControl();
             modDnControl.setModDnType( SyncModifyDnType.RENAME );
-            modDnControl.setEntryDn( opContext.getDn().getName() );
-            modDnControl.setNewRdn( opContext.getNewRdn().getName() );
-            modDnControl.setDeleteOldRdn( opContext.getDeleteOldRdn() );
+            modDnControl.setEntryDn( renameContext.getDn().getName() );
+            modDnControl.setNewRdn( renameContext.getNewRdn().getName() );
+            modDnControl.setDeleteOldRdn( renameContext.getDeleteOldRdn() );
 
             if ( pushInRealTime )
             {
@@ -372,17 +372,17 @@ public class SyncReplSearchListener impl
                 syncModify.setSyncStateType( SyncStateTypeEnum.MODDN );
                 syncModify.setEntryUUID( StringTools.uuidToBytes( entry.get(
                     SchemaConstants.ENTRY_UUID_AT ).getString() ) );
-                syncModify.setCookie( getCookie( opContext.getModifiedEntry() ) );
+                syncModify.setCookie( getCookie( renameContext.getModifiedEntry() ) );
                 respEntry.add( syncModify );
                 respEntry.add( modDnControl );
                 
                 WriteFuture future = session.getIoSession().write( respEntry );
                 
-                handleWriteFuture( future, opContext.getModifiedEntry(), null, modDnControl
);
+                handleWriteFuture( future, renameContext.getModifiedEntry(), null, modDnControl
);
             }
             else
             {
-                clientMsgLog.log( new ReplicaEventMessage( modDnControl, opContext.getEntry()
) );
+                clientMsgLog.log( new ReplicaEventMessage( modDnControl, renameContext.getEntry()
) );
             }
         }
         catch ( Exception e )

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
Tue Jun 15 21:15:04 2010
@@ -134,9 +134,9 @@ public class SearchLimitsIT extends Abst
         private Long delayMillis;
 
         
-        public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext
opContext ) throws LdapException
+        public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext
searchContext ) throws LdapException
         {
-            EntryFilteringCursor cursor = next.search( opContext );
+            EntryFilteringCursor cursor = next.search( searchContext );
             cursor.addEntryFilter( new EntryFilter() {
                 public boolean accept( SearchingOperationContext operation, ClonedServerEntry
result ) throws Exception
                 {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
Tue Jun 15 21:15:04 2010
@@ -233,9 +233,9 @@ public abstract class BTreePartition<ID>
     /**
      * {@inheritDoc}
      */
-    public void delete( DeleteOperationContext opContext ) throws LdapException
+    public void delete( DeleteOperationContext deleteContext ) throws LdapException
     {
-        DN dn = opContext.getDn();
+        DN dn = deleteContext.getDn();
 
         ID id = getEntryId( dn );
 
@@ -256,30 +256,30 @@ public abstract class BTreePartition<ID>
     }
 
 
-    public abstract void add( AddOperationContext opContext ) throws LdapException;
+    public abstract void add( AddOperationContext addContext ) throws LdapException;
 
 
-    public abstract void modify( ModifyOperationContext opContext ) throws LdapException;
+    public abstract void modify( ModifyOperationContext modifyContext ) throws LdapException;
 
 
-    public EntryFilteringCursor list( ListOperationContext opContext ) throws LdapException
+    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
     {
-        return new BaseEntryFilteringCursor( new ServerEntryCursorAdaptor<ID>( this,
list( getEntryId( opContext
-            .getDn() ) ) ), opContext );
+        return new BaseEntryFilteringCursor( new ServerEntryCursorAdaptor<ID>( this,
list( getEntryId( listContext
+            .getDn() ) ) ), listContext );
     }
 
 
-    public EntryFilteringCursor search( SearchOperationContext opContext ) throws LdapException
+    public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException
     {
         try
         {
-            SearchControls searchCtls = opContext.getSearchControls();
+            SearchControls searchCtls = searchContext.getSearchControls();
             IndexCursor<ID, Entry, ID> underlying;
     
-            underlying = searchEngine.cursor( opContext.getDn(), opContext.getAliasDerefMode(),
opContext.getFilter(),
+            underlying = searchEngine.cursor( searchContext.getDn(), searchContext.getAliasDerefMode(),
searchContext.getFilter(),
                 searchCtls );
     
-            return new BaseEntryFilteringCursor( new ServerEntryCursorAdaptor<ID>(
this, underlying ), opContext );
+            return new BaseEntryFilteringCursor( new ServerEntryCursorAdaptor<ID>(
this, underlying ), searchContext );
         }
         catch ( Exception e )
         {
@@ -288,9 +288,9 @@ public abstract class BTreePartition<ID>
     }
 
 
-    public ClonedServerEntry lookup( LookupOperationContext opContext ) throws LdapException
+    public ClonedServerEntry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
-        ID id = getEntryId( opContext.getDn() );
+        ID id = getEntryId( lookupContext.getDn() );
 
         if ( id == null )
         {
@@ -299,14 +299,14 @@ public abstract class BTreePartition<ID>
 
         ClonedServerEntry entry = lookup( id );
 
-        if ( ( opContext.getAttrsId() == null ) || ( opContext.getAttrsId().size() == 0 )
)
+        if ( ( lookupContext.getAttrsId() == null ) || ( lookupContext.getAttrsId().size()
== 0 ) )
         {
             return entry;
         }
 
         for ( AttributeType attributeType : ( ( Entry ) entry.getOriginalEntry() ).getAttributeTypes()
)
         {
-            if ( !opContext.getAttrsId().contains( attributeType.getOid() ) )
+            if ( !lookupContext.getAttrsId().contains( attributeType.getOid() ) )
             {
                 entry.removeAttributes( attributeType );
             }
@@ -316,16 +316,16 @@ public abstract class BTreePartition<ID>
     }
 
 
-    public boolean hasEntry( EntryOperationContext opContext ) throws LdapException
+    public boolean hasEntry( EntryOperationContext hasEntryContext ) throws LdapException
     {
-        return null != getEntryId( opContext.getDn() );
+        return null != getEntryId( hasEntryContext.getDn() );
     }
 
 
-    public abstract void rename( RenameOperationContext opContext ) throws LdapException;
+    public abstract void rename( RenameOperationContext renameContext ) throws LdapException;
 
 
-    public abstract void move( MoveOperationContext opContext ) throws LdapException;
+    public abstract void move( MoveOperationContext moveContext ) throws LdapException;
 
 
     public abstract void moveAndRename( MoveAndRenameOperationContext opContext ) throws
LdapException;

Modified: directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java?rev=955056&r1=955055&r2=955056&view=diff
==============================================================================
--- directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
(original)
+++ directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
Tue Jun 15 21:15:04 2010
@@ -645,11 +645,11 @@ public class Service implements DaemonAp
             if( ! mods.isEmpty() )
             {
                 LOG.debug( "modifying the entry {} after adding missing manadatory operational
attributes", entry.getDn() );
-                ModifyOperationContext modOpContext = new ModifyOperationContext( session
);
-                modOpContext.setEntry( entry );
-                modOpContext.setDn( entry.getDn() );
-                modOpContext.setModItems( mods );
-                partition.modify( modOpContext );
+                ModifyOperationContext modifyContext = new ModifyOperationContext( session
);
+                modifyContext.setEntry( entry );
+                modifyContext.setDn( entry.getDn() );
+                modifyContext.setModItems( mods );
+                partition.modify( modifyContext );
             }
             
             mods.clear();



Mime
View raw message