From commits-return-32868-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Mon Nov 14 10:04:08 2011 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 84BFC9C90 for ; Mon, 14 Nov 2011 10:04:08 +0000 (UTC) Received: (qmail 35977 invoked by uid 500); 14 Nov 2011 10:04:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 35910 invoked by uid 500); 14 Nov 2011 10:04:07 -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 35903 invoked by uid 99); 14 Nov 2011 10:04:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Nov 2011 10:04:07 +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; Mon, 14 Nov 2011 10:04:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 37C0023888FE for ; Mon, 14 Nov 2011 10:03:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1201653 - in /directory/apacheds/trunk: core-annotations/src/main/java/org/apache/directory/server/core/factory/ core/src/main/java/org/apache/directory/server/core/ Date: Mon, 14 Nov 2011 10:03:46 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111114100346.37C0023888FE@eris.apache.org> Author: elecharny Date: Mon Nov 14 10:03:45 2011 New Revision: 1201653 URL: http://svn.apache.org/viewvc?rev=1201653&view=rev Log: Moved the interceptors initialization so that it's not called in the DefaultDirectoryService constructor. Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1201653&r1=1201652&r2=1201653&view=diff ============================================================================== --- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original) +++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Mon Nov 14 10:03:45 2011 @@ -81,13 +81,15 @@ public class DSAnnotationProcessor service.setAllowAnonymousAccess( dsBuilder.allowAnonAccess() ); service.getChangeLog().setEnabled( dsBuilder.enableChangeLog() ); - List interceptorList = service.getInterceptors(); - + dsf.init( dsBuilder.name() ); + for ( Class interceptorClass : dsBuilder.additionalInterceptors() ) { - interceptorList.add( ( Interceptor ) interceptorClass.newInstance() ); + service.addLast( ( Interceptor ) interceptorClass.newInstance() ); } + List interceptorList = service.getInterceptors(); + if ( dsBuilder.authenticators().length != 0 ) { AuthenticationInterceptor authenticationInterceptor = null; @@ -127,8 +129,6 @@ public class DSAnnotationProcessor service.setInterceptors( interceptorList ); - dsf.init( dsBuilder.name() ); - // Process the Partition, if any. for ( CreatePartition createPartition : dsBuilder.partitions() ) { Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=1201653&r1=1201652&r2=1201653&view=diff ============================================================================== --- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java (original) +++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java Mon Nov 14 10:03:45 2011 @@ -69,6 +69,7 @@ public class DefaultDirectoryServiceFact // we we can set some properties like accesscontrol, anon access // before starting up the service directoryService = new DefaultDirectoryService(); + // no need to register a shutdown hook during tests because this // starts a lot of threads and slows down test execution directoryService.setShutdownHookEnabled( false ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1201653&r1=1201652&r2=1201653&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Mon Nov 14 10:03:45 2011 @@ -353,7 +353,6 @@ public class DefaultDirectoryService imp */ public DefaultDirectoryService() throws Exception { - setDefaultInterceptorConfigurations(); changeLog = new DefaultChangeLog(); journal = new DefaultJournal(); syncPeriodMillis = DEFAULT_SYNC_PERIOD; @@ -957,8 +956,10 @@ public class DefaultDirectoryService imp // ------------------------------------------------------------------------ // BackendSubsystem Interface Method Implementations // ------------------------------------------------------------------------ - - + /** + * Define a default list of interceptors that has to be used if no other + * configuration is defined. + */ private void setDefaultInterceptorConfigurations() { // Set default interceptor chains @@ -1792,6 +1793,12 @@ public class DefaultDirectoryService imp { LOG.debug( "---> Initializing the DefaultDirectoryService " ); } + + // If no interceptor list is defined, setup a default list + if ( interceptors == null ) + { + setDefaultInterceptorConfigurations(); + } cacheService = new CacheService(); cacheService.initialize( this ); @@ -2061,6 +2068,35 @@ public class DefaultDirectoryService imp */ public void addAfter( String interceptorName, Interceptor interceptor ) { + try + { + int position = 0; + writeLock.lock(); + + // Find the position + for ( Interceptor inter : interceptors ) + { + if ( interceptorName.equals( inter.getName() ) ) + { + break; + } + + position++; + } + + if ( position == interceptors.size() ) + { + interceptors.add( interceptor ); + } + else + { + interceptors.add( position, interceptor ); + } + } + finally + { + writeLock.unlock(); + } }