Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 06B8E7842 for ; Fri, 14 Oct 2011 23:16:47 +0000 (UTC) Received: (qmail 52762 invoked by uid 500); 14 Oct 2011 23:16:46 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 52720 invoked by uid 500); 14 Oct 2011 23:16:46 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 52713 invoked by uid 99); 14 Oct 2011 23:16:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 23:16:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 23:16:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4752C23889EA for ; Fri, 14 Oct 2011 23:16:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111014231621.4752C23889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 c = new HashSet(); - 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(); - 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(); - 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(); - 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(); - 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(); - 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(); - 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;