svn commit: r158555 - in directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi: CoreContextFactory.java invocation/interceptor/DefaultAttributeTagger.java invocation/interceptor/Interceptor.java invocation/interceptor/OperationalAttributeInterceptor.java

[tr...@apache.org]

Author: trustin
Date: Mon Mar 21 22:32:35 2005
New Revision: 158555

URL: http://svn.apache.org/viewcvs?view=rev&rev=158555
Log:
* Changed interceptor naming convention as Alex requested
* Applied new interceptor naming convention

Added:
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java
      - copied, changed from r158452, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/DefaultAttributeTagger.java
Removed:
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/DefaultAttributeTagger.java
Modified:
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
    directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java?view=diff&r1=158554&r2=158555
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java Mon Mar 21 22:32:35 2005
@@ -56,7 +56,7 @@
 import org.apache.ldap.server.db.SearchEngine;
 import org.apache.ldap.server.db.jdbm.JdbmDatabase;
 import org.apache.ldap.server.jndi.invocation.interceptor.Authorizer;
-import org.apache.ldap.server.jndi.invocation.interceptor.DefaultAttributeTagger;
+import org.apache.ldap.server.jndi.invocation.interceptor.OperationalAttributeInterceptor;
 import org.apache.ldap.server.jndi.invocation.interceptor.SchemaManager;
 import org.apache.ldap.server.jndi.invocation.interceptor.Validator;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
@@ -620,7 +620,7 @@
          * Create and add the Eve operational attribute managment service
          * interceptor to both the before and after interceptor chains.
          */
-        DefaultAttributeTagger tagger = new DefaultAttributeTagger( nexus, globalRegistries );
+        OperationalAttributeInterceptor tagger = new OperationalAttributeInterceptor( nexus, globalRegistries );
         provider.getInterceptorChain().addLast( "defaultAttributeTagger", tagger );
     }
 

Modified: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java?view=diff&r1=158554&r2=158555
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java Mon Mar 21 22:32:35 2005
@@ -76,8 +76,6 @@
  * the basic class naming convention to avoid others' confusion:
  * <ul>
  *   <li>Class name must be an agent noun or end with '<code>Interceptor</code>'.</li>
- *   <li>If the role of the interceptor is to add or modify attributes of
- *       entries, class name must end with '<code>Tagger</code>.' (e.g. EntryUUIDTagger)</li>
  * </ul>
  * Plus, placing your interceptor implementations to packages like
  * '<code>interceptor</code>' would be the best practice.

Copied: directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java (from r158452, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/DefaultAttributeTagger.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java?view=diff&rev=158555&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/DefaultAttributeTagger.java&r1=158452&p2=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java&r2=158555
==============================================================================
--- directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/DefaultAttributeTagger.java (original)
+++ directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java Mon Mar 21 22:32:35 2005
@@ -62,7 +62,7 @@
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public class DefaultAttributeTagger extends BaseInterceptor
+public class OperationalAttributeInterceptor extends BaseInterceptor
 {
     /** the database search result filter to register with filter service */
     private final SearchResultFilter SEARCH_FILTER = new SearchResultFilter()
@@ -90,8 +90,8 @@
      * @param nexus the root nexus of the system
      * @param globalRegistries the global schema object registries
      */
-    public DefaultAttributeTagger( RootNexus nexus,
-                                   GlobalRegistries globalRegistries )
+    public OperationalAttributeInterceptor( RootNexus nexus,
+                                            GlobalRegistries globalRegistries )
     {
         this.nexus = nexus;
         if ( this.nexus == null )
@@ -312,7 +312,7 @@
         // still need to protect against returning op attrs when ids is null
         if ( ids == null )
         {
-            DefaultAttributeTagger.this.filter( entry );
+            OperationalAttributeInterceptor.this.filter( entry );
             return;
         }