directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r529046 [5/5] - in /directory/apacheds/trunk/core/src: main/java/org/apache/directory/server/core/ main/java/org/apache/directory/server/core/authn/ main/java/org/apache/directory/server/core/authz/ main/java/org/apache/directory/server/cor...
Date Sun, 15 Apr 2007 19:08:15 GMT
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
Sun Apr 15 12:08:12 2007
@@ -31,13 +31,13 @@
 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.AddServiceContext;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
-import org.apache.directory.server.core.interceptor.context.RenameServiceContext;
-import org.apache.directory.server.core.interceptor.context.ModifyServiceContext;
-import org.apache.directory.server.core.interceptor.context.MoveAndRenameServiceContext;
-import org.apache.directory.server.core.interceptor.context.MoveServiceContext;
-import org.apache.directory.server.core.interceptor.context.ServiceContext;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.partition.PartitionNexus;
@@ -224,9 +224,9 @@
     // Methods/Code dealing with Subentry Visibility
     // -----------------------------------------------------------------------
 
-    public NamingEnumeration list( NextInterceptor nextInterceptor, LdapDN base ) throws
NamingException
+    public NamingEnumeration list( NextInterceptor nextInterceptor, OperationContext opContext
) throws NamingException
     {
-        NamingEnumeration e = nextInterceptor.list( base );
+        NamingEnumeration e = nextInterceptor.list( opContext );
         Invocation invocation = InvocationStack.getInstance().peek();
 
         if ( !isSubentryVisible( invocation ) )
@@ -373,10 +373,10 @@
     }
 
 
-    public void add( NextInterceptor next, ServiceContext addContext ) throws NamingException
+    public void add( NextInterceptor next, OperationContext opContext ) throws NamingException
     {
-    	LdapDN name = addContext.getDn();
-    	Attributes entry = ((AddServiceContext)addContext).getEntry();
+    	LdapDN name = opContext.getDn();
+    	Attributes entry = ((AddOperationContext)opContext).getEntry();
     	
         Attribute objectClasses = entry.get( SchemaConstants.OBJECT_CLASS_AT );
 
@@ -385,7 +385,7 @@
             // get the name of the administrative point and its administrativeRole attributes
             LdapDN apName = ( LdapDN ) name.clone();
             apName.remove( name.size() - 1 );
-            Attributes ap = nexus.lookup( new LookupServiceContext( apName ) );
+            Attributes ap = nexus.lookup( new LookupOperationContext( apName ) );
             Attribute administrativeRole = ap.get( "administrativeRole" );
 
             // check that administrativeRole has something valid in it for us
@@ -431,7 +431,7 @@
             }
             
             subentryCache.setSubentry( name.getNormName(), ss, getSubentryTypes( entry )
);
-            next.add( addContext );
+            next.add( opContext );
 
             /* ----------------------------------------------------------------
              * Find the baseDn for the subentry and use that to search the tree
@@ -536,7 +536,7 @@
                 }
             }
 
-            next.add( addContext );
+            next.add( opContext );
         }
     }
 
@@ -545,16 +545,16 @@
     // Methods dealing subentry deletion
     // -----------------------------------------------------------------------
 
-    public void delete( NextInterceptor next, ServiceContext deleteContext ) throws NamingException
+    public void delete( NextInterceptor next, OperationContext opContext ) throws NamingException
     {
-    	LdapDN name = deleteContext.getDn();
-        Attributes entry = nexus.lookup( new LookupServiceContext( name ) );
+    	LdapDN name = opContext.getDn();
+        Attributes entry = nexus.lookup( new LookupOperationContext( name ) );
         Attribute objectClasses = AttributeUtils.getAttribute( entry, objectClassType );
 
         if ( AttributeUtils.containsValueCaseIgnore( objectClasses, SchemaConstants.SUBENTRY_OC
) )
         {
             SubtreeSpecification ss = subentryCache.removeSubentry( name.toNormName() ).getSubtreeSpecification();
-            next.delete( deleteContext );
+            next.delete( opContext );
 
             /* ----------------------------------------------------------------
              * Find the baseDn for the subentry and use that to search the tree
@@ -592,7 +592,7 @@
         }
         else
         {
-            next.delete( deleteContext );
+            next.delete( opContext );
         }
     }
 
@@ -699,12 +699,12 @@
     }
 
 
-    public void rename( NextInterceptor next, ServiceContext renameContext ) throws NamingException
+    public void rename( NextInterceptor next, OperationContext opContext ) throws NamingException
     {
-        LdapDN name = renameContext.getDn();
-        String newRdn = ((RenameServiceContext)renameContext).getNewRdn();
+        LdapDN name = opContext.getDn();
+        String newRdn = ((RenameOperationContext)opContext).getNewRdn();
         
-        Attributes entry = nexus.lookup( new LookupServiceContext( name ) );
+        Attributes entry = nexus.lookup( new LookupOperationContext( name ) );
         Attribute objectClasses = AttributeUtils.getAttribute( entry, objectClassType );
 
         if ( AttributeUtils.containsValueCaseIgnore( objectClasses, SchemaConstants.SUBENTRY_OC
) )
@@ -725,7 +725,7 @@
 
             String newNormName = newName.toNormName();
             subentryCache.setSubentry( newNormName, ss, subentry.getTypes() );
-            next.rename( renameContext );
+            next.rename( opContext );
 
             subentry = subentryCache.getSubentry( newNormName );
             ExprNode filter = new PresenceNode( oidRegistry.getOid( SchemaConstants.OBJECT_CLASS_AT
) );
@@ -756,7 +756,7 @@
                 throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN
);
             }
             
-            next.rename( renameContext );
+            next.rename( opContext );
 
             // calculate the new DN now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
@@ -774,15 +774,15 @@
     }
 
 
-    public void moveAndRename( NextInterceptor next, ServiceContext moveAndRenameContext
)
+    public void moveAndRename( NextInterceptor next, OperationContext opContext )
         throws NamingException
     {
-        LdapDN oriChildName = moveAndRenameContext.getDn();
-        LdapDN parent = ((MoveAndRenameServiceContext)moveAndRenameContext).getParent();
-        String newRn = ((RenameServiceContext)moveAndRenameContext).getNewRdn();
+        LdapDN oriChildName = opContext.getDn();
+        LdapDN parent = ((MoveAndRenameOperationContext)opContext).getParent();
+        String newRn = ((RenameOperationContext)opContext).getNewRdn();
         
         
-        Attributes entry = nexus.lookup( new LookupServiceContext( oriChildName ) );
+        Attributes entry = nexus.lookup( new LookupOperationContext( oriChildName ) );
         Attribute objectClasses = AttributeUtils.getAttribute( entry, objectClassType );
 
         if ( AttributeUtils.containsValueCaseIgnore( objectClasses, SchemaConstants.SUBENTRY_OC
) )
@@ -803,7 +803,7 @@
             
             String newNormName = newName.toNormName();
             subentryCache.setSubentry( newNormName, ss, subentry.getTypes() );
-            next.moveAndRename( moveAndRenameContext );
+            next.moveAndRename( opContext );
 
             subentry = subentryCache.getSubentry( newNormName );
 
@@ -836,7 +836,7 @@
                 throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN
);
             }
             
-            next.moveAndRename( moveAndRenameContext );
+            next.moveAndRename( opContext );
 
             // calculate the new DN now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
@@ -853,12 +853,12 @@
     }
 
 
-    public void move( NextInterceptor next, ServiceContext moveContext ) throws NamingException
+    public void move( NextInterceptor next, OperationContext opContext ) throws NamingException
     {
-        LdapDN oriChildName = moveContext.getDn();
-        LdapDN newParentName = ((MoveServiceContext)moveContext).getParent();
+        LdapDN oriChildName = opContext.getDn();
+        LdapDN newParentName = ((MoveOperationContext)opContext).getParent();
         
-        Attributes entry = nexus.lookup( new LookupServiceContext( oriChildName ) );
+        Attributes entry = nexus.lookup( new LookupOperationContext( oriChildName ) );
         Attribute objectClasses = entry.get( SchemaConstants.OBJECT_CLASS_AT );
 
         if ( AttributeUtils.containsValueCaseIgnore( objectClasses, SchemaConstants.SUBENTRY_OC
) )
@@ -875,7 +875,7 @@
 
             String newNormName = newName.toNormName();
             subentryCache.setSubentry( newNormName, ss, subentry.getTypes() );
-            next.move( moveContext );
+            next.move( opContext );
 
             subentry = subentryCache.getSubentry( newNormName );
 
@@ -909,7 +909,7 @@
                 throw new LdapSchemaViolationException( msg, ResultCodeEnum.NOT_ALLOWED_ON_RDN
);
             }
             
-            next.move( moveContext );
+            next.move( opContext );
 
             // calculate the new DN now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
@@ -1001,13 +1001,13 @@
     }
 
 
-    public void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException
+    public void modify( NextInterceptor next, OperationContext opContext ) throws NamingException
     {
-    	LdapDN name = modifyContext.getDn(); 
-    	int modOp = ((ModifyServiceContext)modifyContext).getModOp(); 
-    	Attributes mods = ((ModifyServiceContext)modifyContext).getMods(); 
+    	LdapDN name = opContext.getDn(); 
+    	int modOp = ((ModifyOperationContext)opContext).getModOp(); 
+    	Attributes mods = ((ModifyOperationContext)opContext).getMods(); 
     	
-        Attributes entry = nexus.lookup( new LookupServiceContext( name ) );
+        Attributes entry = nexus.lookup( new LookupOperationContext( name ) );
         Attributes oldEntry = (Attributes) entry.clone();
         Attribute objectClasses = AttributeUtils.getAttribute( entry, objectClassType );
 
@@ -1028,7 +1028,7 @@
             }
 
             subentryCache.setSubentry( name.toNormName(), ssNew, getSubentryTypes( entry,
modOp, mods ) );
-            next.modify( modifyContext );
+            next.modify( opContext );
 
             // search for all entries selected by the old SS and remove references to subentry
             LdapDN apName = ( LdapDN ) name.clone();
@@ -1077,11 +1077,11 @@
         }
         else
         {
-            next.modify( modifyContext );
+            next.modify( opContext );
             
             if ( !AttributeUtils.containsValueCaseIgnore( objectClasses, SchemaConstants.SUBENTRY_OC
) )
             {
-	            Attributes newEntry = nexus.lookup( new LookupServiceContext( name ) );
+	            Attributes newEntry = nexus.lookup( new LookupOperationContext( name ) );
 	            
 	            ModificationItemImpl[] subentriesOpAttrMods =  getModsOnEntryModification(name,
oldEntry, newEntry);
 	            
@@ -1096,7 +1096,7 @@
 
     public void modify( NextInterceptor next, LdapDN name, ModificationItemImpl[] mods )
throws NamingException
     {
-        Attributes entry = nexus.lookup( new LookupServiceContext( name ) );
+        Attributes entry = nexus.lookup( new LookupOperationContext( name ) );
         Attributes oldEntry = (Attributes) entry.clone();
         Attribute objectClasses = AttributeUtils.getAttribute( entry, objectClassType );
         boolean isSubtreeSpecificationModification = false;
@@ -1179,7 +1179,7 @@
             
             if ( !AttributeUtils.containsValueCaseIgnore( objectClasses, SchemaConstants.SUBENTRY_OC
) )
             {
-	            Attributes newEntry = nexus.lookup( new LookupServiceContext( name ) );
+	            Attributes newEntry = nexus.lookup( new LookupOperationContext( name ) );
 	            
 	            ModificationItemImpl[] subentriesOpAttrMods =  getModsOnEntryModification(name,
oldEntry, newEntry);
 	            if ( subentriesOpAttrMods.length > 0)

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
Sun Apr 15 12:08:12 2007
@@ -26,7 +26,7 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -74,7 +74,7 @@
          * Using LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS here to exclude operational attributes
          * especially subentry related ones like "triggerExecutionSubentries".
          */
-        Attributes deletedEntry = proxy.lookup( new LookupServiceContext( deletedEntryName
), PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
+        Attributes deletedEntry = proxy.lookup( new LookupOperationContext( deletedEntryName
), PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
         return deletedEntry;
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
Sun Apr 15 12:08:12 2007
@@ -27,9 +27,9 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
-import org.apache.directory.server.core.interceptor.context.ModifyServiceContext;
-import org.apache.directory.server.core.interceptor.context.ServiceContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
@@ -51,11 +51,11 @@
         init( modifiedEntryName, modifications );
     }
     
-    public ModifyStoredProcedureParameterInjector( Invocation invocation, ServiceContext
modifyContext ) throws NamingException
+    public ModifyStoredProcedureParameterInjector( Invocation invocation, OperationContext
modifyContext ) throws NamingException
     {
         super( invocation );
-        Attributes modifications = ((ModifyServiceContext)modifyContext).getMods();
-        int modOp = ((ModifyServiceContext)modifyContext).getModOp();
+        Attributes modifications = ((ModifyOperationContext)modifyContext).getMods();
+        int modOp = ((ModifyOperationContext)modifyContext).getModOp();
 
         ModificationItemImpl[] mods = new ModificationItemImpl[ modifications.size() ];
         NamingEnumeration modEnum = modifications.getAll();
@@ -124,7 +124,7 @@
          * Using LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS here to exclude operational attributes
          * especially subentry related ones like "triggerExecutionSubentries".
          */
-        return proxy.lookup( new LookupServiceContext( modifiedEntryName ), PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS
);
+        return proxy.lookup( new LookupOperationContext( modifiedEntryName ), PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS
);
     }
 
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
Sun Apr 15 12:08:12 2007
@@ -40,12 +40,12 @@
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.InterceptorChain;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
-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;
-import org.apache.directory.server.core.interceptor.context.MoveAndRenameServiceContext;
-import org.apache.directory.server.core.interceptor.context.MoveServiceContext;
-import org.apache.directory.server.core.interceptor.context.ServiceContext;
+import org.apache.directory.server.core.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
+import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
+import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.jndi.ServerLdapContext;
@@ -136,7 +136,7 @@
         {
             LdapDN parentDn = ( LdapDN ) dn.clone();
             parentDn.remove( dn.size() - 1 );
-            entry = proxy.lookup( new LookupServiceContext( parentDn ), PartitionNexusProxy.LOOKUP_BYPASS
);
+            entry = proxy.lookup( new LookupOperationContext( parentDn ), PartitionNexusProxy.LOOKUP_BYPASS
);
         }
 
         Attribute subentries = entry.get( TRIGGER_SUBENTRIES_ATTR );
@@ -237,10 +237,10 @@
         this.enabled = true; // TODO: Get this from the configuration if needed.
     }
 
-    public void add( NextInterceptor next, ServiceContext addContext ) throws NamingException
+    public void add( NextInterceptor next, OperationContext addContext ) throws NamingException
     {
     	LdapDN name = addContext.getDn();
-    	Attributes entry = ((AddServiceContext)addContext).getEntry();
+    	Attributes entry = ((AddOperationContext)addContext).getEntry();
     	
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )
@@ -274,7 +274,7 @@
         executeTriggers( afterTriggerSpecs, injector, callerRootCtx );
     }
 
-    public void delete( NextInterceptor next, ServiceContext deleteContext ) throws NamingException
+    public void delete( NextInterceptor next, OperationContext deleteContext ) throws NamingException
     {
     	LdapDN name = deleteContext.getDn();
     	
@@ -288,7 +288,7 @@
         // Gather supplementary data.
         Invocation invocation = InvocationStack.getInstance().peek();
         PartitionNexusProxy proxy = invocation.getProxy();
-        Attributes deletedEntry = proxy.lookup( new LookupServiceContext( name ), PartitionNexusProxy.LOOKUP_BYPASS
);
+        Attributes deletedEntry = proxy.lookup( new LookupOperationContext( name ), PartitionNexusProxy.LOOKUP_BYPASS
);
         ServerLdapContext callerRootCtx = ( ServerLdapContext ) ( ( ServerLdapContext ) invocation.getCaller()
).getRootContext();
         StoredProcedureParameterInjector injector = new DeleteStoredProcedureParameterInjector(
invocation, name );
 
@@ -308,7 +308,7 @@
         executeTriggers( afterTriggerSpecs, injector, callerRootCtx );
     }
     
-    public void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException
+    public void modify( NextInterceptor next, OperationContext modifyContext ) throws NamingException
     {
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )
@@ -320,7 +320,7 @@
         // Gather supplementary data.
         Invocation invocation = InvocationStack.getInstance().peek();
         PartitionNexusProxy proxy = invocation.getProxy();
-        Attributes modifiedEntry = proxy.lookup( new LookupServiceContext( modifyContext.getDn()
), PartitionNexusProxy.LOOKUP_BYPASS );
+        Attributes modifiedEntry = proxy.lookup( new LookupOperationContext( modifyContext.getDn()
), PartitionNexusProxy.LOOKUP_BYPASS );
         ServerLdapContext callerRootCtx = ( ServerLdapContext ) ( ( ServerLdapContext ) invocation.getCaller()
).getRootContext();
         StoredProcedureParameterInjector injector = new ModifyStoredProcedureParameterInjector(
invocation, modifyContext );
 
@@ -353,7 +353,7 @@
         // Gather supplementary data.
         Invocation invocation = InvocationStack.getInstance().peek();
         PartitionNexusProxy proxy = invocation.getProxy();
-        Attributes modifiedEntry = proxy.lookup( new LookupServiceContext( normName ), PartitionNexusProxy.LOOKUP_BYPASS
);
+        Attributes modifiedEntry = proxy.lookup( new LookupOperationContext( normName ),
PartitionNexusProxy.LOOKUP_BYPASS );
         ServerLdapContext callerRootCtx = ( ServerLdapContext ) ( ( ServerLdapContext ) invocation.getCaller()
).getRootContext();
         StoredProcedureParameterInjector injector = new ModifyStoredProcedureParameterInjector(
invocation, normName, mods );
 
@@ -374,11 +374,11 @@
     }
     
 
-    public void rename( NextInterceptor next, ServiceContext renameContext ) throws NamingException
+    public void rename( NextInterceptor next, OperationContext renameContext ) throws NamingException
     {
         LdapDN name = renameContext.getDn();
-        String newRdn = ((RenameServiceContext)renameContext).getNewRdn();
-        boolean deleteOldRn = ((RenameServiceContext)renameContext).getDelOldDn();
+        String newRdn = ((RenameOperationContext)renameContext).getNewRdn();
+        boolean deleteOldRn = ((RenameOperationContext)renameContext).getDelOldDn();
         
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )
@@ -390,7 +390,7 @@
         // Gather supplementary data.        
         Invocation invocation = InvocationStack.getInstance().peek();
         PartitionNexusProxy proxy = invocation.getProxy();
-        Attributes renamedEntry = proxy.lookup( new LookupServiceContext( name ), PartitionNexusProxy.LOOKUP_BYPASS
);
+        Attributes renamedEntry = proxy.lookup( new LookupOperationContext( name ), PartitionNexusProxy.LOOKUP_BYPASS
);
         ServerLdapContext callerRootCtx = ( ServerLdapContext ) ( ( ServerLdapContext ) invocation.getCaller()
).getRootContext();
         
         LdapDN oldRDN = new LdapDN( name.getRdn().getUpName() );
@@ -421,12 +421,12 @@
         executeTriggers( afterTriggerSpecs, injector, callerRootCtx );
     }
     
-    public void moveAndRename( NextInterceptor next, ServiceContext moveAndRenameContext
) throws NamingException
+    public void moveAndRename( NextInterceptor next, OperationContext moveAndRenameContext
) throws NamingException
     {
         LdapDN oriChildName = moveAndRenameContext.getDn();
-        LdapDN parent = ((MoveAndRenameServiceContext)moveAndRenameContext).getParent();
-        String newRn = ((MoveAndRenameServiceContext)moveAndRenameContext).getNewRdn();
-        boolean deleteOldRn = ((MoveAndRenameServiceContext)moveAndRenameContext).getDelOldDn();
+        LdapDN parent = ((MoveAndRenameOperationContext)moveAndRenameContext).getParent();
+        String newRn = ((MoveAndRenameOperationContext)moveAndRenameContext).getNewRdn();
+        boolean deleteOldRn = ((MoveAndRenameOperationContext)moveAndRenameContext).getDelOldDn();
 
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )
@@ -438,7 +438,7 @@
         // Gather supplementary data.        
         Invocation invocation = InvocationStack.getInstance().peek();
         PartitionNexusProxy proxy = invocation.getProxy();
-        Attributes movedEntry = proxy.lookup( new LookupServiceContext( oriChildName ), PartitionNexusProxy.LOOKUP_BYPASS
);
+        Attributes movedEntry = proxy.lookup( new LookupOperationContext( oriChildName ),
PartitionNexusProxy.LOOKUP_BYPASS );
         ServerLdapContext callerRootCtx = ( ServerLdapContext ) ( ( ServerLdapContext ) invocation.getCaller()
).getRootContext();
         
         LdapDN oldRDN = new LdapDN( oriChildName.getRdn().getUpName() );
@@ -463,7 +463,7 @@
         // will not be valid at the new location.
         // This will certainly be fixed by the SubentryService,
         // but after this service.
-        Attributes importedEntry = proxy.lookup( new LookupServiceContext( oriChildName ),
PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
+        Attributes importedEntry = proxy.lookup( new LookupOperationContext( oriChildName
), PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
         // As the target entry does not exist yet and so
         // its subentry operational attributes are not there,
         // we need to construct an entry to represent it
@@ -499,7 +499,7 @@
     }
     
     
-    public void move( NextInterceptor next, ServiceContext moveContext ) throws NamingException
+    public void move( NextInterceptor next, OperationContext moveContext ) throws NamingException
     {
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )
@@ -509,12 +509,12 @@
         }
         
         LdapDN oriChildName = moveContext.getDn();
-        LdapDN newParentName = ((MoveServiceContext)moveContext).getParent();
+        LdapDN newParentName = ((MoveOperationContext)moveContext).getParent();
         
         // Gather supplementary data.        
         Invocation invocation = InvocationStack.getInstance().peek();
         PartitionNexusProxy proxy = invocation.getProxy();
-        Attributes movedEntry = proxy.lookup( new LookupServiceContext( oriChildName ), PartitionNexusProxy.LOOKUP_BYPASS
);
+        Attributes movedEntry = proxy.lookup( new LookupOperationContext( oriChildName ),
PartitionNexusProxy.LOOKUP_BYPASS );
         ServerLdapContext callerRootCtx = ( ServerLdapContext ) ( ( ServerLdapContext ) invocation.getCaller()
).getRootContext();
         
         LdapDN oldRDN = new LdapDN( oriChildName.getRdn().getUpName() );
@@ -539,7 +539,7 @@
         // will not be valid at the new location.
         // This will certainly be fixed by the SubentryService,
         // but after this service.
-        Attributes importedEntry = proxy.lookup( new LookupServiceContext( oriChildName ),
PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
+        Attributes importedEntry = proxy.lookup( new LookupOperationContext( oriChildName
), PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
         // As the target entry does not exist yet and so
         // its subentry operational attributes are not there,
         // we need to construct an entry to represent it

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?view=diff&rev=529046&r1=529045&r2=529046
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
Sun Apr 15 12:08:12 2007
@@ -38,8 +38,8 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.interceptor.context.ModifyServiceContext;
-import org.apache.directory.server.core.interceptor.context.ServiceContext;
+import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -221,14 +221,14 @@
     }
 
 
-    public void subentryModified( ServiceContext modifyContext, Attributes entry ) throws
NamingException
+    public void subentryModified( OperationContext modifyContext, Attributes entry ) throws
NamingException
     {
         if ( !hasPrescriptiveTrigger( entry ) )
         {
             return;
         }
 
-        if ( ((ModifyServiceContext)modifyContext).getMods().get( PRESCRIPTIVE_TRIGGER_ATTR
) != null )
+        if ( ((ModifyOperationContext)modifyContext).getMods().get( PRESCRIPTIVE_TRIGGER_ATTR
) != null )
         {
             subentryDeleted( modifyContext.getDn(), entry );
             subentryAdded( modifyContext.getDn(), entry );

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=529046&r1=529045&r2=529046
==============================================================================
--- 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
Sun Apr 15 12:08:12 2007
@@ -37,8 +37,8 @@
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
 import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.configuration.MutableInterceptorConfiguration;
-import org.apache.directory.server.core.interceptor.context.LookupServiceContext;
-import org.apache.directory.server.core.interceptor.context.ServiceContext;
+import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.jndi.DeadContext;
@@ -102,7 +102,7 @@
 
         try
         {
-            chain.lookup( new LookupServiceContext( dn ) );
+            chain.lookup( new LookupOperationContext( dn ) );
         }
         catch ( Exception e )
         {
@@ -128,7 +128,7 @@
 
         try
         {
-            chain.lookup( new LookupServiceContext( dn ) );
+            chain.lookup( new LookupOperationContext( dn ) );
         }
         catch ( Exception e )
         {
@@ -161,7 +161,7 @@
 
         try
         {
-            chain.lookup( new LookupServiceContext( dn ) );
+            chain.lookup( new LookupOperationContext( dn ) );
         }
         catch ( Exception e )
         {
@@ -195,7 +195,7 @@
 
         try
         {
-            chain.lookup( new LookupServiceContext( dn ) );
+            chain.lookup( new LookupOperationContext( dn ) );
         }
         catch ( Exception e )
         {
@@ -225,7 +225,7 @@
 
         try
         {
-            chain.lookup( new LookupServiceContext( dn ) );
+            chain.lookup( new LookupOperationContext( dn ) );
         }
         catch ( Exception e )
         {
@@ -252,7 +252,7 @@
 
         try
         {
-            chain.lookup( new LookupServiceContext( dn ) );
+            chain.lookup( new LookupOperationContext( dn ) );
         }
         catch ( Exception e )
         {
@@ -289,35 +289,35 @@
         }
 
 
-        public Attributes getRootDSE( NextInterceptor next, ServiceContext getRootDSEContext
) throws NamingException
+        public Attributes getRootDSE( NextInterceptor next, OperationContext getRootDSEContext
) throws NamingException
         {
             interceptors.add( this );
             return next.getRootDSE( getRootDSEContext );
         }
 
 
-        public LdapDN getMatchedName ( NextInterceptor next, ServiceContext getMatchedNameContext
) throws NamingException
+        public LdapDN getMatchedName ( NextInterceptor next, OperationContext getMatchedNameContext
) throws NamingException
         {
             interceptors.add( this );
             return next.getMatchedName( getMatchedNameContext );
         }
 
 
-        public LdapDN getSuffix ( NextInterceptor next, ServiceContext getSuffixContext )
throws NamingException
+        public LdapDN getSuffix ( NextInterceptor next, OperationContext getSuffixContext
) throws NamingException
         {
             interceptors.add( this );
             return next.getSuffix( getSuffixContext );
         }
 
 
-        public Iterator listSuffixes ( NextInterceptor next, ServiceContext emptyContext
) throws NamingException
+        public Iterator listSuffixes ( NextInterceptor next, OperationContext emptyContext
) throws NamingException
         {
             interceptors.add( this );
             return next.listSuffixes( emptyContext );
         }
 
 
-        public void addContextPartition( NextInterceptor next, ServiceContext addContextPartitionContext
)
+        public void addContextPartition( NextInterceptor next, OperationContext addContextPartitionContext
)
             throws NamingException
         {
             interceptors.add( this );
@@ -325,28 +325,28 @@
         }
 
 
-        public void removeContextPartition( NextInterceptor next, ServiceContext removeContextPartition
) throws NamingException
+        public void removeContextPartition( NextInterceptor next, OperationContext removeContextPartition
) throws NamingException
         {
             interceptors.add( this );
             next.removeContextPartition( removeContextPartition );
         }
 
 
-        public boolean compare( NextInterceptor next, ServiceContext compareContext ) throws
NamingException
+        public boolean compare( NextInterceptor next, OperationContext compareContext ) throws
NamingException
         {
             interceptors.add( this );
             return next.compare( compareContext );
         }
 
 
-        public void delete( NextInterceptor next, ServiceContext deleteContext ) throws NamingException
+        public void delete( NextInterceptor next, OperationContext deleteContext ) throws
NamingException
         {
             interceptors.add( this );
             next.delete( deleteContext );
         }
 
 
-        public void add(NextInterceptor next, ServiceContext addContext )
+        public void add(NextInterceptor next, OperationContext addContext )
             throws NamingException
         {
             interceptors.add( this );
@@ -354,7 +354,7 @@
         }
 
 
-        public void modify( NextInterceptor next, ServiceContext modifyContext ) throws NamingException
+        public void modify( NextInterceptor next, OperationContext modifyContext ) throws
NamingException
         {
             interceptors.add( this );
             next.modify( modifyContext );
@@ -368,10 +368,10 @@
         }
 
 
-        public NamingEnumeration list( NextInterceptor next, LdapDN baseName ) throws NamingException
+        public NamingEnumeration list( NextInterceptor next, OperationContext opContext )
throws NamingException
         {
             interceptors.add( this );
-            return next.list( baseName );
+            return next.list( opContext );
         }
 
 
@@ -383,21 +383,21 @@
         }
 
 
-        public Attributes lookup( NextInterceptor next, ServiceContext lookupContext ) throws
NamingException
+        public Attributes lookup( NextInterceptor next, OperationContext lookupContext )
throws NamingException
         {
             interceptors.add( this );
             return next.lookup( lookupContext );
         }
 
 
-        public boolean hasEntry( NextInterceptor next, ServiceContext entryContext ) throws
NamingException
+        public boolean hasEntry( NextInterceptor next, OperationContext entryContext ) throws
NamingException
         {
             interceptors.add( this );
             return next.hasEntry( entryContext );
         }
 
 
-        public void rename( NextInterceptor next, ServiceContext renameContext )
+        public void rename( NextInterceptor next, OperationContext renameContext )
             throws NamingException
         {
             interceptors.add( this );
@@ -405,14 +405,14 @@
         }
 
 
-        public void move( NextInterceptor next, ServiceContext moveContext ) throws NamingException
+        public void move( NextInterceptor next, OperationContext moveContext ) throws NamingException
         {
             interceptors.add( this );
             next.move( moveContext );
         }
 
 
-        public void moveAndRename( NextInterceptor next, ServiceContext moveAndRenameContext
)
+        public void moveAndRename( NextInterceptor next, OperationContext moveAndRenameContext
)
             throws NamingException
         {
             interceptors.add( this );
@@ -420,7 +420,7 @@
         }
 
 
-        public void bind( NextInterceptor next, ServiceContext bindContext )
+        public void bind( NextInterceptor next, OperationContext bindContext )
         throws NamingException
         {
             interceptors.add( this );
@@ -428,7 +428,7 @@
         }
 
 
-        public void unbind( NextInterceptor next, ServiceContext unbindContext ) throws NamingException
+        public void unbind( NextInterceptor next, OperationContext unbindContext ) throws
NamingException
         {
             interceptors.add( this );
             next.unbind( unbindContext );



Mime
View raw message