directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r583278 [1/2] - in /directory/apacheds/branches/bigbang: apacheds-xbean-spring/ core-unit/src/test/java/org/apache/directory/server/core/authz/ core-unit/src/test/java/org/apache/directory/server/core/operational/ core-unit/src/test/java/or...
Date Tue, 09 Oct 2007 19:54:59 GMT
Author: akarasulu
Date: Tue Oct  9 12:54:55 2007
New Revision: 583278

URL: http://svn.apache.org/viewvc?rev=583278&view=rev
Log:
renaming all XxxService interceptors to be XxxInterceptor to be absolutely clear on the functionality and make way for having services that are not interceptors

Added:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
    directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationService.java
    directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyService.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java   (contents, props changed)
      - copied, changed from r583255, directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
Removed:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
    directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationService.java
    directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyService.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
Modified:
    directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngineConfig.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/DefaultReplicationContext.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationContext.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationLogCleanJob.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientProtocolHandler.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerProtocolHandler.java
    directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/FastSearchTest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/KeyDerivationServiceITest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslGssapiBindITest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SearchITest.java
    directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml

Modified: directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml (original)
+++ directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml Tue Oct  9 12:54:55 2007
@@ -72,7 +72,7 @@
       <version>${pom.version}</version>
       <classifier>sources</classifier>
     </dependency>
-      <!-- replication service xbean config metadata -->
+      <!-- replication interceptor xbean config metadata -->
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>mitosis</artifactId>

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java Tue Oct  9 12:54:55 2007
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
 import org.apache.directory.server.core.unit.AbstractTestCase;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
@@ -296,9 +296,9 @@
         Attributes ap = adminCtx.getAttributes( "", new String[]
             { "administrativeRole" } );
         Attribute administrativeRole = ap.get( "administrativeRole" );
-        if ( administrativeRole == null || !administrativeRole.contains( SubentryService.AC_AREA ) )
+        if ( administrativeRole == null || !administrativeRole.contains( SubentryInterceptor.AC_AREA ) )
         {
-            Attributes changes = new AttributesImpl( "administrativeRole", SubentryService.AC_AREA, true );
+            Attributes changes = new AttributesImpl( "administrativeRole", SubentryInterceptor.AC_AREA, true );
             adminCtx.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, changes );
         }
 

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupITest.java Tue Oct  9 12:54:55 2007
@@ -64,7 +64,7 @@
      * Checks to make sure a non-admin user which is not in the Administrators 
      * group cannot access entries under ou=groups,ou=system.  Also check that 
      * after adding that user to the group they see those groups.  This test 
-     * does NOT use the DefaultAuthorizationService but uses the one based on
+     * does NOT use the DefaultAuthorizationInterceptor but uses the one based on
      * ACI.
      */
     public void testNonAdminReadAccessToGroups() throws Exception

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java Tue Oct  9 12:54:55 2007
@@ -26,6 +26,7 @@
 import javax.naming.directory.DirContext;
 
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -33,7 +34,7 @@
 
 /**
  * Tests to see that the binary property filtering in the schema service's
- * filter class {@link org.apache.directory.server.core.schema.SchemaService} is working
+ * filter class {@link SchemaInterceptor} is working
  * properly.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java Tue Oct  9 12:54:55 2007
@@ -40,7 +40,7 @@
 
 
 /**
- * Testcases for the SubentryService. Investigation on some serious problems.
+ * Testcases for the SubentryInterceptor. Investigation on some serious problems.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingITest.java Tue Oct  9 12:54:55 2007
@@ -40,7 +40,7 @@
 
 
 /**
- * Testcases for the SubentryService. Investigation on handling Subtree Refinement
+ * Testcases for the SubentryInterceptor. Investigation on handling Subtree Refinement
  * Selection Membership upon entry modifications. As we allow any LDAP filter to be
  * specified as specificationFilter in subtreeSpecifications, any modification on
  * entries can cause changes on subentry operational attributes.

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java Tue Oct  9 12:54:55 2007
@@ -41,7 +41,7 @@
 
 
 /**
- * Testcases for the SubentryService.
+ * Testcases for the SubentryInterceptor.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingITest.java Tue Oct  9 12:54:55 2007
@@ -40,7 +40,7 @@
 
 
 /**
- * Testcases for the SubentryService. Investigation on handling Subtree Refinement
+ * Testcases for the SubentryInterceptor. Investigation on handling Subtree Refinement
  * Selection Membership upon objectClass attribute value changes.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java Tue Oct  9 12:54:55 2007
@@ -41,7 +41,7 @@
 
 
 /**
- * Testcases for the SubentryService for Triggers.
+ * Testcases for the SubentryInterceptor for Triggers.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev:$

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java Tue Oct  9 12:54:55 2007
@@ -33,7 +33,7 @@
 
 
 /**
- * Integration tests for TriggerService.
+ * Integration tests for TriggerInterceptor.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev:$

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Tue Oct  9 12:54:55 2007
@@ -20,20 +20,20 @@
 package org.apache.directory.server.core;
 
 
-import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authn.AuthenticationInterceptor;
 import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.server.core.authz.AuthorizationService;
-import org.apache.directory.server.core.authz.DefaultAuthorizationService;
-import org.apache.directory.server.core.collective.CollectiveAttributeService;
-import org.apache.directory.server.core.event.EventService;
-import org.apache.directory.server.core.exception.ExceptionService;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
+import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
+import org.apache.directory.server.core.event.EventInterceptor;
+import org.apache.directory.server.core.exception.ExceptionInterceptor;
 import org.apache.directory.server.core.interceptor.Interceptor;
 import org.apache.directory.server.core.interceptor.InterceptorChain;
 import org.apache.directory.server.core.interceptor.context.*;
 import org.apache.directory.server.core.jndi.DeadContext;
 import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.server.core.normalization.NormalizationService;
-import org.apache.directory.server.core.operational.OperationalAttributeService;
+import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
 import org.apache.directory.server.core.partition.DefaultPartitionNexus;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
@@ -41,13 +41,13 @@
 import org.apache.directory.server.core.partition.impl.btree.Index;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.apache.directory.server.core.referral.ReferralService;
+import org.apache.directory.server.core.referral.ReferralInterceptor;
 import org.apache.directory.server.core.schema.PartitionSchemaLoader;
 import org.apache.directory.server.core.schema.SchemaManager;
 import org.apache.directory.server.core.schema.SchemaPartitionDao;
-import org.apache.directory.server.core.schema.SchemaService;
-import org.apache.directory.server.core.subtree.SubentryService;
-import org.apache.directory.server.core.trigger.TriggerService;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
+import org.apache.directory.server.core.trigger.TriggerInterceptor;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.bootstrap.*;
 import org.apache.directory.server.schema.bootstrap.partition.DbFileListing;
@@ -459,18 +459,18 @@
         // Set default interceptor chains
         List<Interceptor> list = new ArrayList<Interceptor>();
 
-        list.add( new NormalizationService() );
-        list.add( new AuthenticationService() );
-        list.add( new ReferralService() );
-        list.add( new AuthorizationService() );
-        list.add( new DefaultAuthorizationService() );
-        list.add( new ExceptionService() );
-        list.add( new OperationalAttributeService() );
-        list.add( new SchemaService() );
-        list.add( new SubentryService() );
-        list.add( new CollectiveAttributeService() );
-        list.add( new EventService() );
-        list.add( new TriggerService() );
+        list.add( new NormalizationInterceptor() );
+        list.add( new AuthenticationInterceptor() );
+        list.add( new ReferralInterceptor() );
+        list.add( new AciAuthorizationInterceptor() );
+        list.add( new DefaultAuthorizationInterceptor() );
+        list.add( new ExceptionInterceptor() );
+        list.add( new OperationalAttributeInterceptor() );
+        list.add( new SchemaInterceptor() );
+        list.add( new SubentryInterceptor() );
+        list.add( new CollectiveAttributeInterceptor() );
+        list.add( new EventInterceptor() );
+        list.add( new TriggerInterceptor() );
 
         setInterceptors( list );
     }
@@ -843,7 +843,7 @@
 
             partitionNexus.add( new AddOperationContext( name, attributes ) );
             
-            Interceptor authzInterceptor = interceptorChain.get( AuthorizationService.class.getName() );
+            Interceptor authzInterceptor = interceptorChain.get( AciAuthorizationInterceptor.class.getName() );
             
             if ( authzInterceptor == null )
             {
@@ -851,7 +851,7 @@
                 throw new NamingException( "The Authorization service is null" );
             }
             
-            if ( !( authzInterceptor instanceof AuthorizationService) )
+            if ( !( authzInterceptor instanceof AciAuthorizationInterceptor ) )
             {
                 LOG.error( "The Authorization service is not set correctly : '{}' is an incorect interceptor",
                     authzInterceptor.getClass().getName() );
@@ -859,7 +859,7 @@
                 
             }
 
-            AuthorizationService authzSrvc = ( AuthorizationService ) authzInterceptor;
+            AciAuthorizationInterceptor authzSrvc = ( AciAuthorizationInterceptor ) authzInterceptor;
             authzSrvc.cacheNewGroup( name, attributes );
 
         }

Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Tue Oct  9 12:54:55 2007
@@ -51,9 +51,9 @@
  * @version $Rev$, $Date$
  * @org.apache.xbean.XBean
  */
-public class AuthenticationService extends BaseInterceptor
+public class AuthenticationInterceptor extends BaseInterceptor
 {
-    private static final Logger LOG = LoggerFactory.getLogger( AuthenticationService.class );
+    private static final Logger LOG = LoggerFactory.getLogger( AuthenticationInterceptor.class );
 
     /**
      * Speedup for logs
@@ -66,7 +66,7 @@
     /**
      * Creates an authentication service interceptor.
      */
-    public AuthenticationService()
+    public AuthenticationInterceptor()
     {
     }
 
@@ -104,7 +104,7 @@
     }
 
     /**
-     * @param authenticators authenticators to be used by this AuthenticationService
+     * @param authenticators authenticators to be used by this AuthenticationInterceptor
      * @org.apache.xbean.Property nestedType="org.apache.directory.server.core.authn.Authenticator"
      */
     public void setAuthenticators( Set<Authenticator> authenticators )

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct  9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java Tue Oct  9 12:54:55 2007
@@ -33,9 +33,9 @@
  * Authenticates users who access {@link PartitionNexus}.
  * <p>
  * {@link Authenticator}s are registered to and configured by
- * {@link AuthenticationService} interceptor.
+ * {@link AuthenticationInterceptor} interceptor.
  * <p>
- * {@link AuthenticationService} authenticates users by calling
+ * {@link AuthenticationInterceptor} authenticates users by calling
  * {@link #authenticate(LdapDN,ServerContext)}, and then {@link Authenticator}
  * checks JNDI {@link Context} environment properties
  * ({@link Context#SECURITY_PRINCIPAL} and {@link Context#SECURITY_CREDENTIALS})
@@ -55,14 +55,14 @@
 
 
     /**
-     * Called by {@link AuthenticationService} to indicate that this
+     * Called by {@link AuthenticationInterceptor} to indicate that this
      * authenticator is being placed into service.
      */
     public void init( DirectoryService directoryService ) throws NamingException;
 
 
     /**
-     * Called by {@link AuthenticationService} to indicate that this
+     * Called by {@link AuthenticationInterceptor} to indicate that this
      * authenticator is being removed from service.
      */
     public void destroy();

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Tue Oct  9 12:54:55 2007
@@ -41,17 +41,17 @@
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.jndi.ServerContext;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.normalization.NormalizationService;
-import org.apache.directory.server.core.referral.ReferralService;
-import org.apache.directory.server.core.authz.AuthorizationService;
-import org.apache.directory.server.core.authz.DefaultAuthorizationService;
-import org.apache.directory.server.core.exception.ExceptionService;
-import org.apache.directory.server.core.operational.OperationalAttributeService;
-import org.apache.directory.server.core.schema.SchemaService;
-import org.apache.directory.server.core.subtree.SubentryService;
-import org.apache.directory.server.core.collective.CollectiveAttributeService;
-import org.apache.directory.server.core.event.EventService;
-import org.apache.directory.server.core.trigger.TriggerService;
+import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.core.referral.ReferralInterceptor;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
+import org.apache.directory.server.core.exception.ExceptionInterceptor;
+import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
+import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
+import org.apache.directory.server.core.event.EventInterceptor;
+import org.apache.directory.server.core.trigger.TriggerInterceptor;
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.LdapSecurityConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -112,18 +112,18 @@
     static
     {
         Set<String> c = new HashSet<String>();
-        c.add( NormalizationService.class.getName() );
-        c.add( AuthenticationService.class.getName() );
-        c.add( ReferralService.class.getName() );
-        c.add( AuthorizationService.class.getName() );
-        c.add( DefaultAuthorizationService.class.getName() );
-        c.add( ExceptionService.class.getName() );
-        c.add( OperationalAttributeService.class.getName() );
-        c.add( SchemaService.class.getName() );
-        c.add( SubentryService.class.getName() );
-        c.add( CollectiveAttributeService.class.getName() );
-        c.add( EventService.class.getName() );
-        c.add( TriggerService.class.getName() );
+        c.add( NormalizationInterceptor.class.getName() );
+        c.add( AuthenticationInterceptor.class.getName() );
+        c.add( ReferralInterceptor.class.getName() );
+        c.add( AciAuthorizationInterceptor.class.getName() );
+        c.add( DefaultAuthorizationInterceptor.class.getName() );
+        c.add( ExceptionInterceptor.class.getName() );
+        c.add( OperationalAttributeInterceptor.class.getName() );
+        c.add( SchemaInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
+        c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( EventInterceptor.class.getName() );
+        c.add( TriggerInterceptor.class.getName() );
         USERLOOKUP_BYPASS = Collections.unmodifiableCollection( c );
     }
 

Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Tue Oct  9 12:54:55 2007
@@ -34,7 +34,7 @@
 import org.apache.directory.server.core.jndi.ServerContext;
 import org.apache.directory.server.core.jndi.ServerLdapContext;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
 import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.OidRegistry;
@@ -70,10 +70,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class AuthorizationService extends BaseInterceptor
+public class AciAuthorizationInterceptor extends BaseInterceptor
 {
     /** the logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( AuthorizationService.class );
+    private static final Logger LOG = LoggerFactory.getLogger( AciAuthorizationInterceptor.class );
 
     /**
      * the multivalued op attr used to track the perscriptive access control
@@ -405,8 +405,8 @@
         }
 
         // perform checks below here for all non-admin users
-        SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.class.getName() );
-        Attributes subentryAttrs = subentryService.getSubentryAttributes( name, entry );
+        SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
+        Attributes subentryAttrs = subentryInterceptor.getSubentryAttributes( name, entry );
         NamingEnumeration<? extends Attribute> attrList = entry.getAll();
         
         while ( attrList.hasMore() )
@@ -807,7 +807,7 @@
         // Get the entry again without operational attributes
         // because access control subentry operational attributes
         // will not be valid at the new location.
-        // This will certainly be fixed by the SubentryService,
+        // This will certainly be fixed by the SubentryInterceptor,
         // but after this service.
         Attributes importedEntry = proxy.lookup( new LookupOperationContext( oriChildName ), 
             PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
@@ -817,8 +817,8 @@
         // we need to construct an entry to represent it
         // at least with minimal requirements which are object class
         // and access control subentry operational attributes.
-        SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.class.getName() );
-        Attributes subentryAttrs = subentryService.getSubentryAttributes( newName, importedEntry );
+        SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
+        Attributes subentryAttrs = subentryInterceptor.getSubentryAttributes( newName, importedEntry );
         NamingEnumeration<? extends Attribute> attrList = importedEntry.getAll();
         
         while ( attrList.hasMore() )
@@ -883,7 +883,7 @@
         // Get the entry again without operational attributes
         // because access control subentry operational attributes
         // will not be valid at the new location.
-        // This will certainly be fixed by the SubentryService,
+        // This will certainly be fixed by the SubentryInterceptor,
         // but after this service.
         Attributes importedEntry = proxy.lookup( new LookupOperationContext( oriChildName ), 
             PartitionNexusProxy.LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS );
@@ -892,8 +892,8 @@
         // we need to construct an entry to represent it
         // at least with minimal requirements which are object class
         // and access control subentry operational attributes.
-        SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.class.getName() );
-        Attributes subentryAttrs = subentryService.getSubentryAttributes( newName, importedEntry );
+        SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
+        Attributes subentryAttrs = subentryInterceptor.getSubentryAttributes( newName, importedEntry );
         NamingEnumeration<? extends Attribute> attrList = importedEntry.getAll();
         
         while ( attrList.hasMore() )

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct  9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Tue Oct  9 12:54:55 2007
@@ -68,10 +68,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class DefaultAuthorizationService extends BaseInterceptor
+public class DefaultAuthorizationInterceptor extends BaseInterceptor
 {
     /** the logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( DefaultAuthorizationService.class );
+    private static final Logger LOG = LoggerFactory.getLogger( DefaultAuthorizationInterceptor.class );
 
     /**
      * the base distinguished {@link Name} for all users
@@ -107,7 +107,7 @@
     /**
      * Creates a new instance.
      */
-    public DefaultAuthorizationService()
+    public DefaultAuthorizationInterceptor()
     {
     }
 
@@ -508,7 +508,7 @@
             public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
                 throws NamingException
             {
-                return DefaultAuthorizationService.this.isSearchable( invocation, result );
+                return DefaultAuthorizationInterceptor.this.isSearchable( invocation, result );
             }
         }, "Search Default Authorization filter" );
     }
@@ -530,7 +530,7 @@
             public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
                 throws NamingException
             {
-                return DefaultAuthorizationService.this.isSearchable( invocation, result );
+                return DefaultAuthorizationInterceptor.this.isSearchable( invocation, result );
             }
         }, "List Default Authorization filter" );
     }

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct  9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Tue Oct  9 12:54:55 2007
@@ -29,22 +29,22 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.directory.server.core.authn.AuthenticationService;
-import org.apache.directory.server.core.authz.AuthorizationService;
-import org.apache.directory.server.core.authz.DefaultAuthorizationService;
+import org.apache.directory.server.core.authn.AuthenticationInterceptor;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
 import org.apache.directory.server.core.event.Evaluator;
-import org.apache.directory.server.core.event.EventService;
+import org.apache.directory.server.core.event.EventInterceptor;
 import org.apache.directory.server.core.event.ExpressionEvaluator;
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
-import org.apache.directory.server.core.normalization.NormalizationService;
-import org.apache.directory.server.core.operational.OperationalAttributeService;
+import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
 import org.apache.directory.server.core.subtree.RefinementEvaluator;
 import org.apache.directory.server.core.subtree.RefinementLeafEvaluator;
-import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
 import org.apache.directory.server.core.subtree.SubtreeEvaluator;
-import org.apache.directory.server.core.trigger.TriggerService;
+import org.apache.directory.server.core.trigger.TriggerInterceptor;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -142,18 +142,18 @@
     static
     {
         Collection<String> c = new HashSet<String>();
-        c.add( NormalizationService.class.getName() );
-        c.add( AuthenticationService.class.getName() );
-//        c.add( ReferralService.class.getName() );
-        c.add( AuthorizationService.class.getName() );
-        c.add( DefaultAuthorizationService.class.getName() );
-//        c.add( ExceptionService.class.getName() );
-        c.add( OperationalAttributeService.class.getName() );
-        c.add( SchemaService.class.getName() );
-        c.add( SubentryService.class.getName() );
-//        c.add( CollectiveAttributeService.class.getName() );
-        c.add( EventService.class.getName() );
-        c.add( TriggerService.class.getName() );
+        c.add( NormalizationInterceptor.class.getName() );
+        c.add( AuthenticationInterceptor.class.getName() );
+//        c.add( ReferralInterceptor.class.getName() );
+        c.add( AciAuthorizationInterceptor.class.getName() );
+        c.add( DefaultAuthorizationInterceptor.class.getName() );
+//        c.add( ExceptionInterceptor.class.getName() );
+        c.add( OperationalAttributeInterceptor.class.getName() );
+        c.add( SchemaInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
+//        c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( EventInterceptor.class.getName() );
+        c.add( TriggerInterceptor.class.getName() );
         USER_LOOKUP_BYPASS = Collections.unmodifiableCollection( c );
     }
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Tue Oct  9 12:54:55 2007
@@ -35,14 +35,14 @@
 
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.normalization.NormalizationService;
-import org.apache.directory.server.core.authn.AuthenticationService;
-import org.apache.directory.server.core.authz.AuthorizationService;
-import org.apache.directory.server.core.authz.DefaultAuthorizationService;
-import org.apache.directory.server.core.operational.OperationalAttributeService;
-import org.apache.directory.server.core.schema.SchemaService;
-import org.apache.directory.server.core.subtree.SubentryService;
-import org.apache.directory.server.core.event.EventService;
+import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.core.authn.AuthenticationInterceptor;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
+import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
+import org.apache.directory.server.core.event.EventInterceptor;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
@@ -141,18 +141,18 @@
     static
     {
         Collection<String> c = new HashSet<String>();
-        c.add( NormalizationService.class.getName() );
-        c.add( AuthenticationService.class.getName() );
-//        c.add( ReferralService.class.getName() );
-        c.add( AuthorizationService.class.getName() );
-        c.add( DefaultAuthorizationService.class.getName() );
-//        c.add( ExceptionService.class.getName() );
-        c.add( OperationalAttributeService.class.getName() );
-        c.add( SchemaService.class.getName() );
-        c.add( SubentryService.class.getName() );
-//        c.add( CollectiveAttributeService.class.getName() );
-        c.add( EventService.class.getName() );
-//        c.add( TriggerService.class.getName() );
+        c.add( NormalizationInterceptor.class.getName() );
+        c.add( AuthenticationInterceptor.class.getName() );
+//        c.add( ReferralInterceptor.class.getName() );
+        c.add( AciAuthorizationInterceptor.class.getName() );
+        c.add( DefaultAuthorizationInterceptor.class.getName() );
+//        c.add( ExceptionInterceptor.class.getName() );
+        c.add( OperationalAttributeInterceptor.class.getName() );
+        c.add( SchemaInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
+//        c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( EventInterceptor.class.getName() );
+//        c.add( TriggerInterceptor.class.getName() );
         SEARCH_BYPASS = Collections.unmodifiableCollection( c );
     }
 

Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Tue Oct  9 12:54:55 2007
@@ -59,7 +59,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class CollectiveAttributeService extends BaseInterceptor
+public class CollectiveAttributeInterceptor extends BaseInterceptor
 {
     public static final String EXCLUDE_ALL_COLLECTIVE_ATTRIBUTES_OID = "2.5.18.0";
     public static final String EXCLUDE_ALL_COLLECTIVE_ATTRIBUTES = "excludeAllCollectiveAttributes";

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct  9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Tue Oct  9 12:54:55 2007
@@ -58,9 +58,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class EventService extends BaseInterceptor
+public class EventInterceptor extends BaseInterceptor
 {
-    private static Logger log = LoggerFactory.getLogger( EventService.class );
+    private static Logger log = LoggerFactory.getLogger( EventInterceptor.class );
     
     private PartitionNexus nexus;
     private Map<NamingListener, Object> sources = new HashMap<NamingListener, Object>();

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct  9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Tue Oct  9 12:54:55 2007
@@ -56,7 +56,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ExceptionService extends BaseInterceptor
+public class ExceptionInterceptor extends BaseInterceptor
 {
     private PartitionNexus nexus;
     private LdapDN subschemSubentryDn;
@@ -93,7 +93,7 @@
     /**
      * Creates an interceptor that is also the exception handling service.
      */
-    public ExceptionService()
+    public ExceptionInterceptor()
     {
     }
 

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct  9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Tue Oct  9 12:54:55 2007
@@ -40,7 +40,6 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.event.EventContext;
@@ -50,7 +49,7 @@
 import javax.naming.spi.DirectoryManager;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.authn.AuthenticationInterceptor;
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -459,10 +458,10 @@
      * Sets the principal of the authenticated user which also happens to own.
      * This method can be invoked only once to keep this property safe.  This
      * method has been changed to be public but it can only be set by the
-     * AuthenticationService to prevent malicious code from changing the
+     * AuthenticationInterceptor to prevent malicious code from changing the
      * effective principal.
      */
-    public void setPrincipal( AuthenticationService.TrustedPrincipalWrapper wrapper )
+    public void setPrincipal( AuthenticationInterceptor.TrustedPrincipalWrapper wrapper )
     {
         this.principal = wrapper.getPrincipal();
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Tue Oct  9 12:54:55 2007
@@ -33,7 +33,7 @@
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
-import org.apache.directory.server.core.referral.ReferralService;
+import org.apache.directory.server.core.referral.ReferralInterceptor;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -47,7 +47,7 @@
 public class ServerLdapContext extends ServerDirContext implements LdapContext
 {
     /** A reference to the RTeferralService interceptor */
-    private transient ReferralService refService; 
+    private transient ReferralInterceptor refService;
     
 
     /**
@@ -60,7 +60,7 @@
     public ServerLdapContext( DirectoryService service, Hashtable<String, Object> env ) throws NamingException
     {
         super( service, env );
-        refService = ( ( ReferralService ) service.getInterceptorChain().get( ReferralService.class.getName() ) );
+        refService = ( ( ReferralInterceptor ) service.getInterceptorChain().get( ReferralInterceptor.class.getName() ) );
     }
 
 
@@ -76,7 +76,7 @@
     public ServerLdapContext( DirectoryService service, LdapPrincipal principal, LdapDN dn ) throws NamingException
     {
         super( service, principal, dn );
-        refService = ( ( ReferralService ) service.getInterceptorChain().get( ReferralService.class.getName() ) );
+        refService = ( ( ReferralInterceptor ) service.getInterceptorChain().get( ReferralInterceptor.class.getName() ) );
     }
 
 

Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Tue Oct  9 12:54:55 2007
@@ -53,10 +53,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class NormalizationService extends BaseInterceptor
+public class NormalizationInterceptor extends BaseInterceptor
 {
     /** logger used by this class */
-    private static final Logger LOG = LoggerFactory.getLogger( NormalizationService.class );
+    private static final Logger LOG = LoggerFactory.getLogger( NormalizationInterceptor.class );
 
     /** a filter node value normalizer and undefined node remover */
     private NormalizingVisitor normVisitor;

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct  9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Tue Oct  9 12:54:55 2007
@@ -60,7 +60,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class OperationalAttributeService extends BaseInterceptor
+public class OperationalAttributeInterceptor extends BaseInterceptor
 {
     private final SearchResultFilter DENORMALIZING_SEARCH_FILTER = new SearchResultFilter()
     {
@@ -99,7 +99,7 @@
     /**
      * Creates the operational attribute management service interceptor.
      */
-    public OperationalAttributeService()
+    public OperationalAttributeInterceptor()
     {
     }
 

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct  9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java Tue Oct  9 12:54:55 2007
@@ -40,12 +40,12 @@
 import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.AuthenticationService;
-import org.apache.directory.server.core.authz.AuthorizationService;
-import org.apache.directory.server.core.authz.DefaultAuthorizationService;
+import org.apache.directory.server.core.authn.AuthenticationInterceptor;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
 import org.apache.directory.server.core.enumeration.SearchResultFilter;
 import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
-import org.apache.directory.server.core.event.EventService;
+import org.apache.directory.server.core.event.EventInterceptor;
 import org.apache.directory.server.core.interceptor.InterceptorChain;
 import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -68,12 +68,12 @@
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.invocation.InvocationStack;
-import org.apache.directory.server.core.normalization.NormalizationService;
-import org.apache.directory.server.core.operational.OperationalAttributeService;
-import org.apache.directory.server.core.referral.ReferralService;
-import org.apache.directory.server.core.schema.SchemaService;
-import org.apache.directory.server.core.subtree.SubentryService;
-import org.apache.directory.server.core.trigger.TriggerService;
+import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
+import org.apache.directory.server.core.referral.ReferralInterceptor;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
+import org.apache.directory.server.core.trigger.TriggerInterceptor;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
 import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
@@ -144,48 +144,48 @@
     static
     {
         Collection<String> c = new HashSet<String>();
-        c.add( NormalizationService.class.getName() );
-        c.add( AuthenticationService.class.getName() );
-        c.add( ReferralService.class.getName() );
-        c.add( AuthorizationService.class.getName() );
-        c.add( DefaultAuthorizationService.class.getName() );
-//        c.add( ExceptionService.class.getName() );
-        c.add( OperationalAttributeService.class.getName() );
-        c.add( SchemaService.class.getName() );
-        c.add( SubentryService.class.getName() );
-//        c.add( CollectiveAttributeService.class.getName() );
-        c.add( EventService.class.getName() );
-//        c.add( TriggerService.class.getName() );
+        c.add( NormalizationInterceptor.class.getName() );
+        c.add( AuthenticationInterceptor.class.getName() );
+        c.add( ReferralInterceptor.class.getName() );
+        c.add( AciAuthorizationInterceptor.class.getName() );
+        c.add( DefaultAuthorizationInterceptor.class.getName() );
+//        c.add( ExceptionInterceptor.class.getName() );
+        c.add( OperationalAttributeInterceptor.class.getName() );
+        c.add( SchemaInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
+//        c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( EventInterceptor.class.getName() );
+//        c.add( TriggerInterceptor.class.getName() );
         LOOKUP_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
-//        c.add( NormalizationService.class.getName() );
-        c.add( AuthenticationService.class.getName() );
-        c.add( ReferralService.class.getName() );
-        c.add( AuthorizationService.class.getName() );
-        c.add( DefaultAuthorizationService.class.getName() );
-//        c.add( ExceptionService.class.getName() );
-        c.add( SchemaService.class.getName() );
-        c.add( OperationalAttributeService.class.getName() );
-        c.add( SubentryService.class.getName() );
-//        c.add( CollectiveAttributeService.class.getName() );
-        c.add( EventService.class.getName() );
-//        c.add( TriggerService.class.getName() );
+//        c.add( NormalizationInterceptor.class.getName() );
+        c.add( AuthenticationInterceptor.class.getName() );
+        c.add( ReferralInterceptor.class.getName() );
+        c.add( AciAuthorizationInterceptor.class.getName() );
+        c.add( DefaultAuthorizationInterceptor.class.getName() );
+//        c.add( ExceptionInterceptor.class.getName() );
+        c.add( SchemaInterceptor.class.getName() );
+        c.add( OperationalAttributeInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
+//        c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( EventInterceptor.class.getName() );
+//        c.add( TriggerInterceptor.class.getName() );
         GETMATCHEDDN_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
-        c.add( NormalizationService.class.getName() );
-        c.add( AuthenticationService.class.getName() );
-        c.add( ReferralService.class.getName() );
-        c.add( AuthorizationService.class.getName() );
-        c.add( DefaultAuthorizationService.class.getName() );
-//        c.add( ExceptionService.class.getName() );
-//        c.add( OperationalAttributeService.class.getName() );
-        c.add( SchemaService.class.getName() );
-        c.add( SubentryService.class.getName() );
-//        c.add( CollectiveAttributeService.class.getName() );
-        c.add( EventService.class.getName() );
-        c.add( TriggerService.class.getName() );
+        c.add( NormalizationInterceptor.class.getName() );
+        c.add( AuthenticationInterceptor.class.getName() );
+        c.add( ReferralInterceptor.class.getName() );
+        c.add( AciAuthorizationInterceptor.class.getName() );
+        c.add( DefaultAuthorizationInterceptor.class.getName() );
+//        c.add( ExceptionInterceptor.class.getName() );
+//        c.add( OperationalAttributeInterceptor.class.getName() );
+        c.add( SchemaInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
+//        c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( EventInterceptor.class.getName() );
+        c.add( TriggerInterceptor.class.getName() );
         LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS = Collections.unmodifiableCollection( c );
     }
 
@@ -881,7 +881,7 @@
             NamingListener namingListener ) throws NamingException
     {
         InterceptorChain chain = service.getInterceptorChain();
-        EventService interceptor = ( EventService ) chain.get( EventService.class.getName() );
+        EventInterceptor interceptor = ( EventInterceptor ) chain.get( EventInterceptor.class.getName() );
         interceptor.addNamingListener( ctx, name, filter, searchControls, namingListener );
     }
 
@@ -893,7 +893,7 @@
         {
             return;
         }
-        EventService interceptor = ( EventService ) chain.get( EventService.class.getName() );
+        EventInterceptor interceptor = ( EventInterceptor ) chain.get( EventInterceptor.class.getName() );
         interceptor.removeNamingListener( ctx, namingListener );
     }
 }

Copied: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (from r583255, directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?p2=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java&p1=directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java&r1=583255&r2=583278&rev=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Tue Oct  9 12:54:55 2007
@@ -21,27 +21,27 @@
 
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.authn.AuthenticationService;
-import org.apache.directory.server.core.authz.AuthorizationService;
-import org.apache.directory.server.core.authz.DefaultAuthorizationService;
+import org.apache.directory.server.core.authn.AuthenticationInterceptor;
+import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
+import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor;
 import org.apache.directory.server.core.enumeration.ReferralHandlingEnumeration;
 import org.apache.directory.server.core.enumeration.SearchResultFilter;
 import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
-import org.apache.directory.server.core.event.EventService;
+import org.apache.directory.server.core.event.EventInterceptor;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.interceptor.context.*;
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.server.core.normalization.NormalizationService;
-import org.apache.directory.server.core.operational.OperationalAttributeService;
+import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+import org.apache.directory.server.core.operational.OperationalAttributeInterceptor;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.schema.SchemaService;
-import org.apache.directory.server.core.subtree.SubentryService;
-import org.apache.directory.server.core.trigger.TriggerService;
+import org.apache.directory.server.core.schema.SchemaInterceptor;
+import org.apache.directory.server.core.subtree.SubentryInterceptor;
+import org.apache.directory.server.core.trigger.TriggerInterceptor;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.NotImplementedException;
@@ -78,9 +78,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ReferralService extends BaseInterceptor
+public class ReferralInterceptor extends BaseInterceptor
 {
-    private static final Logger LOG = LoggerFactory.getLogger( ReferralService.class );
+    private static final Logger LOG = LoggerFactory.getLogger( ReferralInterceptor.class );
     private static final String IGNORE = "ignore";
     private static final String THROW_FINDING_BASE = "throw-finding-base";
     private static final String THROW = "throw";
@@ -101,18 +101,18 @@
          * partitions of the system during startup and during add/remove partition ops
          */
         Collection<String> c = new HashSet<String>();
-        c.add( NormalizationService.class.getName() );
-        c.add( AuthenticationService.class.getName() );
-        c.add( ReferralService.class.getName() );
-        c.add( AuthorizationService.class.getName() );
-        c.add( DefaultAuthorizationService.class.getName() );
-//        c.add( ExceptionService.class.getName() );
-        c.add( OperationalAttributeService.class.getName() );
-        c.add( SchemaService.class.getName() );
-        c.add( SubentryService.class.getName() );
-//        c.add( CollectiveAttributeService.class.getName() );
-        c.add( EventService.class.getName() );
-        c.add( TriggerService.class.getName() );
+        c.add( NormalizationInterceptor.class.getName() );
+        c.add( AuthenticationInterceptor.class.getName() );
+        c.add( ReferralInterceptor.class.getName() );
+        c.add( AciAuthorizationInterceptor.class.getName() );
+        c.add( DefaultAuthorizationInterceptor.class.getName() );
+//        c.add( ExceptionInterceptor.class.getName() );
+        c.add( OperationalAttributeInterceptor.class.getName() );
+        c.add( SchemaInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
+//        c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( EventInterceptor.class.getName() );
+        c.add( TriggerInterceptor.class.getName() );
         SEARCH_BYPASS = Collections.unmodifiableCollection( c );
     }
 
@@ -162,7 +162,7 @@
             	
             	if ( ref == null )
             	{
-            		// very unlikely, as we have already checked the entry in SchemaService
+            		// very unlikely, as we have already checked the entry in SchemaInterceptor
             		String message = "An entry with a 'referral' ObjectClass must contains a 'ref' Attribute";
             		LOG.error( message );
             		throw new NamingException( message );

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct  9 12:54:55 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?rev=583278&r1=583277&r2=583278&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Tue Oct  9 12:54:55 2007
@@ -43,7 +43,7 @@
 
 
 /**
- * Performs schema checks on behalf of the SchemaService.
+ * Performs schema checks on behalf of the SchemaInterceptor.
  *
  * TODO: we really need to refactor this code since there's much duplication
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>



Mime
View raw message