directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1183550 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/api/interceptor/ core-api/src/main/java/org/apache/directory/server/core/api/partition/ protocol-ldap/src/main/java/org/apache/directory/server...
Date Fri, 14 Oct 2011 23:16:20 GMT
Author: elecharny
Date: Fri Oct 14 23:16:20 2011
New Revision: 1183550

URL: http://svn.apache.org/viewvc?rev=1183550&view=rev
Log:
some more interceptors decoupling

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java?rev=1183550&r1=1183549&r2=1183550&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java
Fri Oct 14 23:16:20 2011
@@ -122,7 +122,7 @@ public abstract class BaseInterceptor im
      */
     public String getName()
     {
-        return getClass().getName();
+        return getClass().getSimpleName();
     }
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java?rev=1183550&r1=1183549&r2=1183550&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/InterceptorChain.java
Fri Oct 14 23:16:20 2011
@@ -221,7 +221,8 @@ public class InterceptorChain
                     LOG.debug( "Adding interceptor " + interceptor.getName() );
                 }
 
-                register( interceptor );
+                Interceptor interceptorInstance = directoryService.getInterceptor( interceptor.getName()
);
+                register( interceptorInstance );
             }
         }
         catch ( Throwable t )

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java?rev=1183550&r1=1183549&r2=1183550&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/ByPassConstants.java
Fri Oct 14 23:16:20 2011
@@ -80,93 +80,93 @@ public class ByPassConstants
     static
     {
         Collection<String> c = new HashSet<String>();
-        c.add( "org.apache.directory.server.core.normalization.NormalizationInterceptor"
);
-        c.add( "org.apache.directory.server.core.authn.AuthenticationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.AciAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.referral.ReferralInterceptor" );
-        c.add( "org.apache.directory.server.core.changelog.ChangeLogInterceptor" );
-        c.add( "org.apache.directory.server.core.operational.OperationalAttributeInterceptor"
);
-        c.add( "org.apache.directory.server.core.schema.SchemaInterceptor" );
-        c.add( "org.apache.directory.server.core.subtree.SubentryInterceptor" );
-        c.add( "org.apache.directory.server.core.event.EventInterceptor" );
-        c.add( "org.apache.directory.server.core.trigger.TriggerInterceptor" );
-        c.add( "org.apache.directory.server.core.journal.JournalInterceptor" );
+        c.add( "NormalizationInterceptor" );
+        c.add( "AuthenticationInterceptor" );
+        c.add( "AciAuthorizationInterceptor" );
+        c.add( "DefaultAuthorizationInterceptor" );
+        c.add( "ReferralInterceptor" );
+        c.add( "ChangeLogInterceptor" );
+        c.add( "OperationalAttributeInterceptor" );
+        c.add( "SchemaInterceptor" );
+        c.add( "SubentryInterceptor" );
+        c.add( "EventInterceptor" );
+        c.add( "TriggerInterceptor" );
+        c.add( "JournalInterceptor" );
         LOOKUP_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
-        c.add( "org.apache.directory.server.core.normalization.NormalizationInterceptor"
);
-        c.add( "org.apache.directory.server.core.authn.AuthenticationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.AciAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.exception.ExceptionInterceptor" );
-        c.add( "org.apache.directory.server.core.operational.OperationalAttributeInterceptor"
);
-        c.add( "org.apache.directory.server.core.schema.SchemaInterceptor" );
-        c.add( "org.apache.directory.server.core.subtree.SubentryInterceptor" );
-        c.add( "org.apache.directory.server.core.event.EventInterceptor" );
-        c.add( "org.apache.directory.server.core.journal.JournalInterceptor" );
+        c.add( "NormalizationInterceptor" );
+        c.add( "AuthenticationInterceptor" );
+        c.add( "AciAuthorizationInterceptor" );
+        c.add( "DefaultAuthorizationInterceptor" );
+        c.add( "ExceptionInterceptor" );
+        c.add( "OperationalAttributeInterceptor" );
+        c.add( "SchemaInterceptor" );
+        c.add( "SubentryInterceptor" );
+        c.add( "EventInterceptor" );
+        c.add( "JournalInterceptor" );
         HAS_ENTRY_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
-        c.add( "org.apache.directory.server.core.normalization.NormalizationInterceptor"
);
-        c.add( "org.apache.directory.server.core.authn.AuthenticationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.AciAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.collective.CollectiveAttributeInterceptor"
);
-        c.add( "org.apache.directory.server.core.operational.OperationalAttributeInterceptor"
);
-        c.add( "org.apache.directory.server.core.schema.SchemaInterceptor" );
-        c.add( "org.apache.directory.server.core.subtree.SubentryInterceptor" );
-        c.add( "org.apache.directory.server.core.event.EventInterceptor" );
-        c.add( "org.apache.directory.server.core.journal.JournalInterceptor" );
+        c.add( "NormalizationInterceptor" );
+        c.add( "AuthenticationInterceptor" );
+        c.add( "AciAuthorizationInterceptor" );
+        c.add( "DefaultAuthorizationInterceptor" );
+        c.add( "CollectiveAttributeInterceptor" );
+        c.add( "OperationalAttributeInterceptor" );
+        c.add( "SchemaInterceptor" );
+        c.add( "SubentryInterceptor" );
+        c.add( "EventInterceptor" );
+        c.add( "JournalInterceptor" );
         LOOKUP_COLLECTIVE_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
-        c.add( "org.apache.directory.server.core.authn.AuthenticationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.AciAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.schema.SchemaInterceptor" );
-        c.add( "org.apache.directory.server.core.operational.OperationalAttributeInterceptor"
);
-        c.add( "org.apache.directory.server.core.subtree.SubentryInterceptor" );
-        c.add( "org.apache.directory.server.core.event.EventInterceptor" );
-        c.add( "org.apache.directory.server.core.journal.JournalInterceptor" );
+        c.add( "AuthenticationInterceptor" );
+        c.add( "AciAuthorizationInterceptor" );
+        c.add( "DefaultAuthorizationInterceptor" );
+        c.add( "SchemaInterceptor" );
+        c.add( "OperationalAttributeInterceptor" );
+        c.add( "SubentryInterceptor" );
+        c.add( "EventInterceptor" );
+        c.add( "JournalInterceptor" );
         GETMATCHEDDN_BYPASS = Collections.unmodifiableCollection( c );
 
         c = new HashSet<String>();
-        c.add( "org.apache.directory.server.core.normalization.NormalizationInterceptor"
);
-        c.add( "org.apache.directory.server.core.authn.AuthenticationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.AciAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.schema.SchemaInterceptor" );
-        c.add( "org.apache.directory.server.core.subtree.SubentryInterceptor" );
-        c.add( "org.apache.directory.server.core.event.EventInterceptor" );
-        c.add( "org.apache.directory.server.core.trigger.TriggerInterceptor" );
-        c.add( "org.apache.directory.server.core.journal.JournalInterceptor" );
+        c.add( "NormalizationInterceptor" );
+        c.add( "AuthenticationInterceptor" );
+        c.add( "AciAuthorizationInterceptor" );
+        c.add( "DefaultAuthorizationInterceptor" );
+        c.add( "SchemaInterceptor" );
+        c.add( "SubentryInterceptor" );
+        c.add( "EventInterceptor" );
+        c.add( "TriggerInterceptor" );
+        c.add( "JournalInterceptor" );
         LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS = Collections.unmodifiableCollection( c );
                 
         c = new HashSet<String>();
-        c.add( "org.apache.directory.server.core.normalization.NormalizationInterceptor"
);
-        c.add( "org.apache.directory.server.core.changelog.ChangeLogInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.AciAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.exception.ExceptionInterceptor" );
-        c.add( "org.apache.directory.server.core.operational.OperationalAttributeInterceptor"
);
-        c.add( "org.apache.directory.server.core.schema.SchemaInterceptor" );
-        c.add( "org.apache.directory.server.core.subtree.SubentryInterceptor" );
-        c.add( "org.apache.directory.server.core.collective.CollectiveAttributeInterceptor"
);
-        c.add( "org.apache.directory.server.core.event.EventInterceptor" );
-        c.add( "org.apache.directory.server.core.trigger.TriggerInterceptor" );
-        c.add( "org.apache.directory.server.core.journal.JournalInterceptor" );
+        c.add( "NormalizationInterceptor" );
+        c.add( "ChangeLogInterceptor" );
+        c.add( "AciAuthorizationInterceptor" );
+        c.add( "DefaultAuthorizationInterceptor" );
+        c.add( "ExceptionInterceptor" );
+        c.add( "OperationalAttributeInterceptor" );
+        c.add( "SchemaInterceptor" );
+        c.add( "SubentryInterceptor" );
+        c.add( "CollectiveAttributeInterceptor" );
+        c.add( "EventInterceptor" );
+        c.add( "TriggerInterceptor" );
+        c.add( "JournalInterceptor" );
         GET_ROOT_DSE_BYPASS = Collections.unmodifiableCollection( c );
         
         
         c = new HashSet<String>();
-        c.add( "org.apache.directory.server.core.normalization.NormalizationInterceptor"
);
-        c.add( "org.apache.directory.server.core.authz.AciAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor" );
-        c.add( "org.apache.directory.server.core.exception.ExceptionInterceptor" );
-        c.add( "org.apache.directory.server.core.schema.SchemaInterceptor" );
-        c.add( "org.apache.directory.server.core.collective.CollectiveAttributeInterceptor"
);
-        c.add( "org.apache.directory.server.core.journal.JournalInterceptor" );
+        c.add( "NormalizationInterceptor" );
+        c.add( "AciAuthorizationInterceptor" );
+        c.add( "DefaultAuthorizationInterceptor" );
+        c.add( "ExceptionInterceptor" );
+        c.add( "SchemaInterceptor" );
+        c.add( "CollectiveAttributeInterceptor" );
+        c.add( "JournalInterceptor" );
         SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS = Collections.unmodifiableCollection(
c );
     }
 }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=1183550&r1=1183549&r2=1183550&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
Fri Oct 14 23:16:20 2011
@@ -28,10 +28,10 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.lang.SerializationUtils;
-import org.apache.directory.server.core.sp.StoredProcEngine;
-import org.apache.directory.server.core.sp.StoredProcEngineConfig;
-import org.apache.directory.server.core.sp.StoredProcExecutionManager;
-import org.apache.directory.server.core.sp.java.JavaStoredProcEngineConfig;
+import org.apache.directory.server.core.shared.sp.StoredProcEngine;
+import org.apache.directory.server.core.shared.sp.StoredProcEngineConfig;
+import org.apache.directory.server.core.shared.sp.StoredProcExecutionManager;
+import org.apache.directory.server.core.shared.sp.java.JavaStoredProcEngineConfig;
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.ldap.LdapSession;



Mime
View raw message