directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r580555 [1/4] - in /directory/apacheds/branches/bigbang: ./ apacheds-xbean-spring/ apacheds-xbean-spring/src/ apacheds-xbean-spring/src/main/ apacheds-xbean-spring/src/main/java/ bootstrap-extract/src/main/java/org/apache/directory/server/s...
Date Sat, 29 Sep 2007 08:25:04 GMT
Author: djencks
Date: Sat Sep 29 01:24:59 2007
New Revision: 580555

URL: http://svn.apache.org/viewvc?rev=580555&view=rev
Log:
DIRSERVER-984 DIRSERVER-1023 Introduce xbean-spring for easier configuration and remove InterceptorConfiguration in favor of direct construction of interceptors

Added:
    directory/apacheds/branches/bigbang/apacheds-xbean-spring/
    directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml   (with props)
    directory/apacheds/branches/bigbang/apacheds-xbean-spring/src/
    directory/apacheds/branches/bigbang/apacheds-xbean-spring/src/main/
    directory/apacheds/branches/bigbang/apacheds-xbean-spring/src/main/java/
Removed:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/InterceptorConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutableInterceptorConfiguration.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/MutableReplicationInterceptorConfiguration.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationInterceptorConfiguration.java
Modified:
    directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
    directory/apacheds/branches/bigbang/bootstrap-plugin/pom.xml
    directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.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/AuthenticationService.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/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/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/changelog/ChangeLogInterceptor.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/configuration/AddPartitionConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.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/interceptor/BaseInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.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/kerberos/KeyDerivationService.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyService.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/partition/DefaultPartitionNexus.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/partition/impl/btree/BTreePartition.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartitionConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableBTreePartitionConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/MutableIndexConfiguration.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.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/SchemaManager.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/schema/SchemaSubentryModifier.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/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/ReplicaId.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/ReplicationService.java
    directory/apacheds/branches/bigbang/mitosis/src/test/java/org/apache/directory/mitosis/service/AbstractReplicationServiceTestCase.java
    directory/apacheds/branches/bigbang/pom.xml
    directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java
    directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java
    directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapConfiguration.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java
    directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java
    directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
    directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java
    directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
    directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/dumpcmd/DumpCommandExecutor.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/DIRSERVER951ITest.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/MiscTest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/NtpITest.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/SaslBindITest.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/jndi/ServerContextFactoryTest.java
    directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml

Added: 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=580555&view=auto
==============================================================================
--- directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml (added)
+++ directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml Sat Sep 29 01:24:59 2007
@@ -0,0 +1,117 @@
+<?xml version="1.0"?><project>
+  <parent>
+    <artifactId>apacheds-parent</artifactId>
+    <groupId>org.apache.directory.server</groupId>
+    <version>1.5.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.directory.server</groupId>
+  <artifactId>apacheds-xbean-spring</artifactId>
+  <name>apacheds-xbean-spring</name>
+
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-changepw</artifactId>
+      <version>${pom.version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ntp</artifactId>
+      <version>${pom.version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-kerberos</artifactId>
+      <version>${pom.version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <version>${pom.version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-dns</artifactId>
+      <version>${pom.version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>${pom.version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
+      <version>${pom.version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+      <!-- replication service xbean config metadata -->
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>mitosis</artifactId>
+      <version>${pom.version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
+        <executions>
+          <execution>
+            <configuration>
+              <namespace>http://apacheds.org/config/1.0</namespace>
+              <schema>target/xbean/${pom.artifactId}.xsd</schema>
+            </configuration>
+            <goals>
+              <goal>mapping</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--  lets ensure that the XSD gets deployed  -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${basedir}/target/xbean/${pom.artifactId}.xsd</file>
+                  <type>xsd</type>
+                </artifact>
+                <artifact>
+                  <file>${basedir}/target/xbean/${pom.artifactId}.xsd.html</file>
+                  <type>xsd.html</type>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file

Propchange: directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: directory/apacheds/branches/bigbang/apacheds-xbean-spring/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java (original)
+++ directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java Sat Sep 29 01:24:59 2007
@@ -122,7 +122,7 @@
      * @param resourceDescription
      * @return the InputStream to read the contents of the resource
      * @throws IOException if there are problems reading or finding a unique copy of the resource
-     */
+     */                                                                                                
     public static InputStream getUniqueResourceAsStream( String resourceName, String resourceDescription ) throws IOException
     {
         resourceName = BASE_PATH + resourceName;

Modified: directory/apacheds/branches/bigbang/bootstrap-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/bootstrap-plugin/pom.xml?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/bootstrap-plugin/pom.xml (original)
+++ directory/apacheds/branches/bigbang/bootstrap-plugin/pom.xml Sat Sep 29 01:24:59 2007
@@ -28,9 +28,9 @@
   <packaging>maven-plugin</packaging>
 
   <description>
-    This plugin pre-loads a set of schema objects into a special fixed schema 
+    This plugin pre-loads a set of schema objects into a special fixed schema
     partition within the server.  It uses the bootstrap schema objects to do
-    this at build time.  The schema partition files created are then packaged 
+    this at build time.  The schema partition files created are then packaged
     using the jar plugin to become what is known as the bootstrap partition jar.
   </description>
 

Modified: directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java Sat Sep 29 01:24:59 2007
@@ -151,7 +151,7 @@
             // Add apache.org paritition since all work will be done here
             MutablePartitionConfiguration partConfig = new MutablePartitionConfiguration();
             partConfig.setIndexedAttributes( indexedAttributes );
-            partConfig.setId( "test" );
+            partConfig.setName( "test" );
             partConfig.setSuffix( "ou=test" );
             partConfig.setContextEntry( attributes );
             

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java Sat Sep 29 01:24:59 2007
@@ -67,7 +67,7 @@
         if ( getName().indexOf( "WithIndices" ) != -1 )
         {
             MutablePartitionConfiguration sysConf = new MutablePartitionConfiguration();
-            sysConf.setId( "system" );
+            sysConf.setName( "system" );
             Attributes attrs = new AttributesImpl( "objectClass", "top", true );
             attrs.get( "objectClass" ).add( "organizationalUnit" );
             attrs.put( "ou", "system" );

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java Sat Sep 29 01:24:59 2007
@@ -54,7 +54,7 @@
     public void testAddAndRemove() throws Exception
     {
         MutablePartitionConfiguration partitionCfg = new MutablePartitionConfiguration();
-        partitionCfg.setId( "removable" );
+        partitionCfg.setName( "removable" );
         partitionCfg.setSuffix( "ou=removable" );
         Attributes ctxEntry = new AttributesImpl( true );
         ctxEntry.put( "objectClass", "top" );

Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Sat Sep 29 01:24:59 2007
@@ -55,7 +55,7 @@
     {
 
         MutablePartitionConfiguration partition = new MutablePartitionConfiguration();
-        partition.setId( "apache" );
+        partition.setName( "apache" );
         partition.setSuffix( suffix );
 
         Set<Object> indexedAttributes = new HashSet<Object>();

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=580555&r1=580554&r2=580555&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 Sat Sep 29 01:24:59 2007
@@ -566,7 +566,7 @@
 
             partitionNexus.add( new AddOperationContext( name, attributes ) );
             
-            Interceptor authzInterceptor = interceptorChain.get( StartupConfiguration.AUTHORIZATION_SERVICE_NAME );
+            Interceptor authzInterceptor = interceptorChain.get( AuthorizationService.class.getName() );
             
             if ( authzInterceptor == null )
             {
@@ -847,7 +847,7 @@
         // --------------------------------------------------------------------
         
         MutablePartitionConfiguration schemaPartitionConfig = new MutablePartitionConfiguration();
-        schemaPartitionConfig.setId( "schema" );
+        schemaPartitionConfig.setName( "schema" );
         schemaPartitionConfig.setCacheSize( 1000 );
         
         DbFileListing listing = null;

Modified: 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/AuthenticationService.java?rev=580555&r1=580554&r2=580555&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/AuthenticationService.java Sat Sep 29 01:24:59 2007
@@ -37,7 +37,6 @@
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.configuration.AuthenticatorConfiguration;
-import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.Interceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
@@ -72,6 +71,8 @@
 /**
  * An {@link Interceptor} that authenticates users.
  *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
@@ -97,7 +98,7 @@
     /**
      * Registers and initializes all {@link Authenticator}s to this service.
      */
-    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init(DirectoryServiceConfiguration factoryCfg) throws NamingException
     {
         this.factoryCfg = factoryCfg;
 

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=580555&r1=580554&r2=580555&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 Sat Sep 29 01:24:59 2007
@@ -42,6 +42,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.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.LdapSecurityConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -102,18 +113,18 @@
     static
     {
         Set<String> c = new HashSet<String>();
-        c.add( StartupConfiguration.NORMALIZATION_SERVICE_NAME );
-        c.add( StartupConfiguration.AUTHENTICATION_SERVICE_NAME );
-        c.add( StartupConfiguration.REFERRAL_SERVICE_NAME );
-        c.add( StartupConfiguration.AUTHORIZATION_SERVICE_NAME );
-        c.add( StartupConfiguration.DEFAULT_AUTHORIZATION_SERVICE_NAME );
-        c.add( StartupConfiguration.EXCEPTION_SERVICE_NAME );
-        c.add( StartupConfiguration.OPERATIONAL_ATTRIBUTE_SERVICE_NAME );
-        c.add( StartupConfiguration.SCHEMA_SERVICE_NAME );
-        c.add( StartupConfiguration.SUBENTRY_SERVICE_NAME );
-        c.add( StartupConfiguration.COLLECTIVE_ATTRIBUTE_SERVICE_NAME );
-        c.add( StartupConfiguration.EVENT_SERVICE_NAME );
-        c.add( StartupConfiguration.TRIGGER_SERVICE_NAME );
+        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() );
         USERLOOKUP_BYPASS = Collections.unmodifiableCollection( c );
     }
 

Modified: 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/AuthorizationService.java?rev=580555&r1=580554&r2=580555&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/AuthorizationService.java Sat Sep 29 01:24:59 2007
@@ -38,7 +38,6 @@
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.authz.support.ACDFEngine;
-import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.configuration.StartupConfiguration;
 import org.apache.directory.server.core.enumeration.SearchResultFilter;
 import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
@@ -84,6 +83,8 @@
 /**
  * An ACI based authorization service.
  *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
@@ -191,12 +192,11 @@
      * the tupe and group membership caches and the ACIItem parser and the ACDF engine.
      *
      * @param factoryCfg the ContextFactory configuration for the server
-     * @param cfg the interceptor configuration
      * @throws NamingException if there are problems during initialization
      */
-    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init(DirectoryServiceConfiguration factoryCfg) throws NamingException
     {
-        super.init( factoryCfg, cfg );
+        super.init( factoryCfg);
         tupleCache = new TupleCache( factoryCfg );
         groupCache = new GroupCache( factoryCfg );
         attrRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();
@@ -423,7 +423,7 @@
         }
 
         // perform checks below here for all non-admin users
-        SubentryService subentryService = ( SubentryService ) chain.get( StartupConfiguration.SUBENTRY_SERVICE_NAME );
+        SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.class.getName() );
         Attributes subentryAttrs = subentryService.getSubentryAttributes( name, entry );
         NamingEnumeration<? extends Attribute> attrList = entry.getAll();
         
@@ -822,7 +822,7 @@
         // 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( StartupConfiguration.SUBENTRY_SERVICE_NAME );
+        SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.class.getName() );
         Attributes subentryAttrs = subentryService.getSubentryAttributes( newName, importedEntry );
         NamingEnumeration<? extends Attribute> attrList = importedEntry.getAll();
         
@@ -897,7 +897,7 @@
         // 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( StartupConfiguration.SUBENTRY_SERVICE_NAME );
+        SubentryService subentryService = ( SubentryService ) chain.get( SubentryService.class.getName() );
         Attributes subentryAttrs = subentryService.getSubentryAttributes( newName, importedEntry );
         NamingEnumeration<? extends Attribute> attrList = importedEntry.getAll();
         

Modified: 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/DefaultAuthorizationService.java?rev=580555&r1=580554&r2=580555&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/DefaultAuthorizationService.java Sat Sep 29 01:24:59 2007
@@ -35,7 +35,6 @@
 import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.enumeration.SearchResultFilter;
 import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
@@ -72,6 +71,8 @@
  * permission he or she doesn't have, {@link NoPermissionException} will be
  * thrown and therefore the current invocation chain will terminate.
  *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
@@ -122,7 +123,7 @@
     }
 
 
-    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init(DirectoryServiceConfiguration factoryCfg) throws NamingException
     {
         nexus = factoryCfg.getPartitionNexus();
         normalizerMapping = factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();

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=580555&r1=580554&r2=580555&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 Sat Sep 29 01:24:59 2007
@@ -29,14 +29,22 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.directory.server.core.configuration.StartupConfiguration;
+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.event.Evaluator;
+import org.apache.directory.server.core.event.EventService;
 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.partition.PartitionNexusProxy;
+import org.apache.directory.server.core.schema.SchemaService;
 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.SubtreeEvaluator;
+import org.apache.directory.server.core.trigger.TriggerService;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -133,15 +141,18 @@
     static
     {
         Collection<String> c = new HashSet<String>();
-        c.add( StartupConfiguration.NORMALIZATION_SERVICE_NAME );
-        c.add( StartupConfiguration.AUTHENTICATION_SERVICE_NAME );
-        c.add( StartupConfiguration.AUTHORIZATION_SERVICE_NAME );
-        c.add( StartupConfiguration.DEFAULT_AUTHORIZATION_SERVICE_NAME );
-        c.add( StartupConfiguration.SCHEMA_SERVICE_NAME );
-        c.add( StartupConfiguration.SUBENTRY_SERVICE_NAME );
-        c.add( StartupConfiguration.OPERATIONAL_ATTRIBUTE_SERVICE_NAME );
-        c.add( StartupConfiguration.EVENT_SERVICE_NAME );
-        c.add( StartupConfiguration.TRIGGER_SERVICE_NAME );
+        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() );
         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=580555&r1=580554&r2=580555&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 Sat Sep 29 01:24:59 2007
@@ -36,6 +36,18 @@
 import org.apache.directory.server.core.configuration.StartupConfiguration;
 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.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.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
@@ -134,14 +146,18 @@
     static
     {
         Collection<String> c = new HashSet<String>();
-        c.add( StartupConfiguration.NORMALIZATION_SERVICE_NAME );
-        c.add( StartupConfiguration.AUTHENTICATION_SERVICE_NAME );
-        c.add( StartupConfiguration.AUTHORIZATION_SERVICE_NAME );
-        c.add( StartupConfiguration.DEFAULT_AUTHORIZATION_SERVICE_NAME );
-        c.add( StartupConfiguration.SCHEMA_SERVICE_NAME );
-        c.add( StartupConfiguration.SUBENTRY_SERVICE_NAME );
-        c.add( StartupConfiguration.OPERATIONAL_ATTRIBUTE_SERVICE_NAME );
-        c.add( StartupConfiguration.EVENT_SERVICE_NAME );
+        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() );
         SEARCH_BYPASS = Collections.unmodifiableCollection( c );
     }
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Sat Sep 29 01:24:59 2007
@@ -14,7 +14,6 @@
 import javax.naming.directory.ModificationItem;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -73,9 +72,9 @@
     // -----------------------------------------------------------------------
 
     
-    public void init( DirectoryServiceConfiguration dsConfig, InterceptorConfiguration iConfig ) throws NamingException
+    public void init( DirectoryServiceConfiguration dsConfig ) throws NamingException
     {
-        super.init( dsConfig, iConfig );
+        super.init( dsConfig );
 
         // Get a handle on the attribute registry to check if attributes are binary
         registry = dsConfig.getRegistries().getAttributeTypeRegistry();

Modified: 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/CollectiveAttributeService.java?rev=580555&r1=580554&r2=580555&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/CollectiveAttributeService.java Sat Sep 29 01:24:59 2007
@@ -32,7 +32,6 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.enumeration.SearchResultFilter;
 import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
@@ -61,6 +60,8 @@
  * the entires inclusion within collectiveAttributeSpecificAreas and
  * collectiveAttributeInnerAreas.
  *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
@@ -97,9 +98,9 @@
     private CollectiveAttributesSchemaChecker collectiveAttributesSchemaChecker = null;
 
 
-    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init(DirectoryServiceConfiguration factoryCfg) throws NamingException
     {
-        super.init( factoryCfg, cfg );
+        super.init( factoryCfg);
         nexus = factoryCfg.getPartitionNexus();
         attrTypeRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();
         collectiveAttributesSchemaChecker = new CollectiveAttributesSchemaChecker(nexus, attrTypeRegistry);

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/AddPartitionConfiguration.java Sat Sep 29 01:24:59 2007
@@ -24,6 +24,8 @@
  * A {@link Configuration} that adds a new {@link Partition} to
  * the current {@link PartitionNexus}.
  *
+ * @org.apache.xbean.XBean element="AddPartition"
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java Sat Sep 29 01:24:59 2007
@@ -42,9 +42,9 @@
     }
 
 
-    public void setId( String id )
+    public void setName( String id )
     {
-        super.setId( id );
+        super.setName( id );
     }
 
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java Sat Sep 29 01:24:59 2007
@@ -29,7 +29,9 @@
 
 /**
  * A mutable version of {@link StartupConfiguration}.
- * 
+ *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
@@ -47,7 +49,7 @@
 
 
     /**
-     * Creates a new instance that operates on the {@link DirectoryService} with
+     * Creates a new instance that operates on the {@link org.apache.directory.server.core.DirectoryService} with
      * the specified ID.
      */
     public MutableStartupConfiguration( String instanceId )
@@ -73,13 +75,21 @@
         super.setInstanceId( instanceId );
     }
 
-
+    /**
+     * @org.apache.xbean.Property nestedType="org.apache.directory.server.core.configuration.AuthenticatorConfiguration"
+     *
+     * @param authenticators
+     */
     public void setAuthenticatorConfigurations( Set<AuthenticatorConfiguration> authenticators )
     {
         super.setAuthenticatorConfigurations( authenticators );
     }
 
-
+    /**
+     * @org.apache.xbean.Property nestedType="org.apache.directory.server.core.configuration.PartitionConfiguration"
+     *
+     * @param paritionConfigurations partitions to start
+     */
     public void setPartitionConfigurations( Set<? extends PartitionConfiguration> paritionConfigurations )
     {
         super.setPartitionConfigurations( paritionConfigurations );
@@ -97,14 +107,22 @@
         super.setAllowAnonymousAccess( enableAnonymousAccess );
     }
 
-
-    public void setInterceptorConfigurations( List<InterceptorConfiguration> interceptorConfigurations )
+    /**
+     * @org.apache.xbean.Property nestedType="org.apache.directory.server.core.configuration.InterceptorConfiguration"
+     *
+     * @param interceptorConfigurations
+     */
+    public void setInterceptors( List interceptorConfigurations )
     {
-        super.setInterceptorConfigurations( interceptorConfigurations );
+        super.setInterceptors( interceptorConfigurations );
     }
 
-
-    public void setTestEntries( List<Entry> testEntries )
+    /**
+     * @org.apache.xbean.Property nestedType="org.apache.directory.shared.ldap.ldif.Entry"
+     *
+     * @param testEntries
+     */
+    public void setTestEntries( List testEntries )
     {
         super.setTestEntries( testEntries );
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java Sat Sep 29 01:24:59 2007
@@ -47,7 +47,7 @@
         "org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition";
     public static final int DEFAULT_CACHE_SIZE = 10000;
 
-    private String id;
+    private String name;
     private int cacheSize = -1;
     private String suffix;
     private Set<Object> indexedAttributes; // Set<String> or <IndexConfiguration>
@@ -68,9 +68,9 @@
      * Returns user-defined name of the {@link Partition} that
      * this configuration configures.
      */
-    public String getId()
+    public String getName()
     {
-        return id;
+        return name;
     }
 
 
@@ -78,10 +78,10 @@
      * Sets user-defined name of the {@link Partition} that
      * this configuration configures.
      */
-    protected void setId( String id )
+    protected void setName( String name)
     {
-        id = id.trim();
-        this.id = id;
+        name = name.trim();
+        this.name = name;
     }
 
 
@@ -191,7 +191,7 @@
      */
     public void validate()
     {
-        if ( getId() == null || getId().length() == 0 )
+        if ( getName() == null || getName().length() == 0 )
         {
             throw new ConfigurationException( "Name is not specified." );
         }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/RemovePartitionConfiguration.java Sat Sep 29 01:24:59 2007
@@ -29,6 +29,8 @@
  * A {@link Configuration} that removed the attached {@link Partition} in
  * the current {@link PartitionNexus}.
  *
+ * @org.apache.xbean.XBean element="RemovePartition"
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/ShutdownConfiguration.java Sat Sep 29 01:24:59 2007
@@ -23,6 +23,8 @@
 /**
  * A {@link Configuration} that shuts down ApacheDS.
  *
+ * @org.apache.xbean.XBean element="Shutdown"
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java Sat Sep 29 01:24:59 2007
@@ -20,6 +20,19 @@
 package org.apache.directory.server.core.configuration;
 
 
+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.collective.CollectiveAttributeService;
+import org.apache.directory.server.core.event.EventService;
+import org.apache.directory.server.core.exception.ExceptionService;
+import org.apache.directory.server.core.interceptor.Interceptor;
+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.shared.ldap.ldif.Entry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +45,8 @@
 /**
  * A {@link Configuration} that starts up ApacheDS.
  *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
@@ -43,55 +58,7 @@
     private static final String SIMPLE_AUTHENTICATOR = "org.apache.directory.server.core.authn.SimpleAuthenticator";
     /** fully qualified class name of the anonymous authenticator implementation */
     private static final String ANONYMOUS_AUTHENTICATOR = "org.apache.directory.server.core.authn.AnonymousAuthenticator";
-    
-    /** The normalizationService name */
-    public static final String NORMALIZATION_SERVICE_NAME = "normalizationService";
-    /** The fully qualified class name for the normalization service */
-    private static final String NORMALIZATION_SERVICE_CLASS = "org.apache.directory.server.core.normalization.NormalizationService";
-    /** The authenticationService name */
-    public static final String AUTHENTICATION_SERVICE_NAME = "authenticationService";
-    /** The fully qualified class name for the normalization service */
-    private static final String AUTHENTICATION_SERVICE_CLASS = "org.apache.directory.server.core.authn.AuthenticationService";
-    /** The referralService name */
-    public static final String REFERRAL_SERVICE_NAME = "referralService";
-    /** The fully qualified class name for the referral service */
-    private static final String REFERRAL_SERVICE_CLASS = "org.apache.directory.server.core.referral.ReferralService";
-    /** The authorizationService name */
-    public static final String AUTHORIZATION_SERVICE_NAME = "authorizationService";
-    /** The fully qualified class name for the authorization service */
-    private static final String AUTHORIZATION_SERVICE_CLASS = "org.apache.directory.server.core.authz.AuthorizationService";
-    /** The default authorization service name */
-    public static final String DEFAULT_AUTHORIZATION_SERVICE_NAME = "defaultAuthorizationService";
-    /** The fully qualified class name for the default authorization service */
-    private static final String DEFAULT_AUTHORIZATION_SERVICE_CLASS = "org.apache.directory.server.core.authz.DefaultAuthorizationService";
-    /** The exceptionService name */
-    public static final String EXCEPTION_SERVICE_NAME = "exceptionService";
-    /** The fully qualified class name for the default authorization service */
-    private static final String EXCEPTION_SERVICE_CLASS = "org.apache.directory.server.core.exception.ExceptionService";
-    /** The operationalAttributeService name */
-    public static final String OPERATIONAL_ATTRIBUTE_SERVICE_NAME = "operationalAttributeService";
-    /** The fully qualified class name for the default operational attribute service */
-    private static final String OPERATIONAL_ATTRIBUTE_SERVICE_CLASS = "org.apache.directory.server.core.operational.OperationalAttributeService";
-    /** The schemaService name */
-    public static final String SCHEMA_SERVICE_NAME = "schemaService";
-    /** The fully qualified class name for the schema service */
-    private static final String SCHEMA_SERVICE_CLASS = "org.apache.directory.server.core.schema.SchemaService";
-    /** The subentryService name */
-    public static final String SUBENTRY_SERVICE_NAME = "subentryService";
-    /** The fully qualified class name for the subentry service */
-    private static final String SUBENTRY_SERVICE_CLASS = "org.apache.directory.server.core.subtree.SubentryService";
-    /** The collectiveAttributeService name */
-    public static final String COLLECTIVE_ATTRIBUTE_SERVICE_NAME = "collectiveAttributeService";
-    /** The fully qualified class name for the collective attribute service */
-    private static final String COLLECTIVE_ATTRIBUTE_SERVICE_CLASS = "org.apache.directory.server.core.collective.CollectiveAttributeService";
-    /** The eventService name */
-    public static final String EVENT_SERVICE_NAME = "eventService";
-    /** The fully qualified class name for the event service */
-    private static final String EVENT_SERVICE_CLASS = "org.apache.directory.server.core.event.EventService";
-    /** The triggerService name */
-    public static final String TRIGGER_SERVICE_NAME = "triggerService";
-    /** The fully qualified class name for the trigger service */
-    private static final String TRIGGER_SERVICE_CLASS = "org.apache.directory.server.core.trigger.TriggerService";
+
     /** The logger for this class */
     private static final Logger log = LoggerFactory.getLogger( StartupConfiguration.class );
 
@@ -110,12 +77,12 @@
     private int maxThreads = MAX_THREADS_DEFAULT; // set to default value
     private int maxSizeLimit = MAX_SIZE_LIMIT_DEFAULT; // set to default value
     private int maxTimeLimit = MAX_TIME_LIMIT_DEFAULT; // set to default value (milliseconds)
-    private Set<AuthenticatorConfiguration> authenticatorConfigurations; 
-    private List<InterceptorConfiguration> interceptorConfigurations; 
-    private PartitionConfiguration systemPartitionConfiguration; 
-    private Set<? extends PartitionConfiguration> partitionConfigurations = 
+    private Set authenticatorConfigurations; // Set<AuthenticatorConfiguration>
+    private List<Interceptor> interceptors;
+    private PartitionConfiguration systemPartitionConfiguration;
+    private Set<? extends PartitionConfiguration> partitionConfigurations =
         new HashSet<PartitionConfiguration>();
-    private List<Entry> testEntries = new ArrayList<Entry>(); 
+    private List<? extends Entry> testEntries = new ArrayList<Entry>(); // List<Attributes>
 
 
     /**
@@ -143,7 +110,7 @@
     private void setDefaultAuthenticatorConfigurations()
     {
         Set<AuthenticatorConfiguration> set = new HashSet<AuthenticatorConfiguration>();
-        
+
         // Anonymous
         set.add( new MutableAuthenticatorConfiguration( "Anonymous", ANONYMOUS_AUTHENTICATOR ) );
 
@@ -156,74 +123,38 @@
         setAuthenticatorConfigurations( set );
     }
 
-    
+
     private void setDefaultInterceptorConfigurations()
     {
         // Set default interceptor chains
-        InterceptorConfiguration interceptorCfg;
-        List<InterceptorConfiguration> list = new ArrayList<InterceptorConfiguration>();
+        Interceptor interceptorCfg;
+        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() );
 
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( NORMALIZATION_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( NORMALIZATION_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( AUTHENTICATION_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( AUTHENTICATION_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( REFERRAL_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( REFERRAL_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( AUTHORIZATION_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( AUTHORIZATION_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( DEFAULT_AUTHORIZATION_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( DEFAULT_AUTHORIZATION_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( EXCEPTION_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( EXCEPTION_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( OPERATIONAL_ATTRIBUTE_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( OPERATIONAL_ATTRIBUTE_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( SCHEMA_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( SCHEMA_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( SUBENTRY_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( SUBENTRY_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( COLLECTIVE_ATTRIBUTE_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( COLLECTIVE_ATTRIBUTE_SERVICE_CLASS );
-        list.add( interceptorCfg );
-
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( EVENT_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( EVENT_SERVICE_CLASS );
-        list.add( interceptorCfg );
-        
-        interceptorCfg = new MutableInterceptorConfiguration();
-        interceptorCfg.setName( TRIGGER_SERVICE_NAME );
-        interceptorCfg.setInterceptorClassName( TRIGGER_SERVICE_CLASS );
-        list.add( interceptorCfg );
+        list.add( new SubentryService() );
 
-        setInterceptorConfigurations( list );
+        list.add( new CollectiveAttributeService() );
+
+        list.add( new EventService() );
+
+        list.add( new TriggerService() );
+
+        setInterceptors( list );
     }
 
 
@@ -233,7 +164,7 @@
     @SuppressWarnings("unchecked")
     public Set<AuthenticatorConfiguration> getAuthenticatorConfigurations()
     {
-        Set<AuthenticatorConfiguration> cloned = 
+        Set<AuthenticatorConfiguration> cloned =
             new HashSet<AuthenticatorConfiguration>( authenticatorConfigurations.size() );
         cloned.addAll( authenticatorConfigurations );
         return cloned;
@@ -257,11 +188,11 @@
             if ( names.contains( name ) )
             {
                 // TODO Not sure that it worth to throw an excpetion here. We could simply ditch the
-                // duplicated authenticator, trace a warning and that's it. 
+                // duplicated authenticator, trace a warning and that's it.
                 log.error( "The authenticator nammed '{}' has already been registred.", name );
                 throw new ConfigurationException( "Duplicate authenticator name: " + name );
             }
-            
+
             names.add( name );
         }
 
@@ -295,7 +226,7 @@
             PartitionConfiguration cfg = i.next();
             cfg.validate();
 
-            String id = cfg.getId();
+            String id = cfg.getName();
             if ( names.contains( id ) )
             {
                 throw new ConfigurationException( "Duplicate partition id: " + id );
@@ -347,10 +278,10 @@
      * Returns interceptor chain.
      */
     @SuppressWarnings("unchecked")
-    public List<InterceptorConfiguration> getInterceptorConfigurations()
+    public List<Interceptor> getInterceptors()
     {
-        List<InterceptorConfiguration> cloned = new ArrayList<InterceptorConfiguration>();
-        cloned.addAll( interceptorConfigurations );
+        List<Interceptor> cloned = new ArrayList<Interceptor>();
+        cloned.addAll( interceptors );
         return cloned;
     }
 
@@ -358,27 +289,21 @@
     /**
      * Sets interceptor chain.
      */
-    protected void setInterceptorConfigurations( List<InterceptorConfiguration> interceptorConfigurations )
+    protected void setInterceptors( List<Interceptor> interceptors)
     {
-        List<InterceptorConfiguration> cloned = new ArrayList<InterceptorConfiguration>();
-        cloned.addAll( interceptorConfigurations );
 
         Set<String> names = new HashSet<String>();
-        Iterator<InterceptorConfiguration> i = cloned.iterator();
-        while ( i.hasNext() )
-        {
-            InterceptorConfiguration cfg = i.next();
-            cfg.validate();
+        Iterator i = interceptors.iterator();
+        for (Interceptor interceptor : interceptors) {
 
-            String name = cfg.getName();
-            if ( names.contains( name ) )
-            {
-                throw new ConfigurationException( "Duplicate interceptor name: " + name );
+            String name = interceptor.getName();
+            if (names.contains(name)) {
+                throw new ConfigurationException("Duplicate interceptor name: " + name);
             }
-            names.add( name );
+            names.add(name);
         }
 
-        this.interceptorConfigurations = interceptorConfigurations;
+        this.interceptors = interceptors;
     }
 
 
@@ -398,7 +323,7 @@
      * Sets test directory entries({@link Attributes}) to be loaded while
      * bootstrapping.
      */
-    protected void setTestEntries( List<Entry> testEntries )
+    protected void setTestEntries( List<? extends Entry> testEntries )
     {
         List<Entry> cloned = new ArrayList<Entry>();
         cloned.addAll( testEntries );

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/configuration/SyncConfiguration.java Sat Sep 29 01:24:59 2007
@@ -23,6 +23,8 @@
 /**
  * A {@link Configuration} that makes a call to {@link DirectoryService#sync()}.
  *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */

Modified: 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/EventService.java?rev=580555&r1=580554&r2=580555&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/EventService.java Sat Sep 29 01:24:59 2007
@@ -41,7 +41,6 @@
 import javax.naming.event.ObjectChangeListener;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -78,6 +77,8 @@
  * An interceptor based serivice for notifying NamingListeners of EventContext
  * and EventDirContext changes.
  *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
@@ -92,9 +93,9 @@
     private NormalizingVisitor visitor;
 
     
-    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init(DirectoryServiceConfiguration factoryCfg) throws NamingException
     {
-        super.init( factoryCfg, cfg );
+        super.init( factoryCfg);
 
         OidRegistry oidRegistry = factoryCfg.getRegistries().getOidRegistry();
         attributeRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();

Modified: 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/ExceptionService.java?rev=580555&r1=580554&r2=580555&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/ExceptionService.java Sat Sep 29 01:24:59 2007
@@ -31,7 +31,6 @@
 
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
@@ -71,6 +70,8 @@
  * throwing a {@link NamingException}. Those operations include when an entry
  * already exists at a DN and is added once again to the same DN.
  *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
@@ -116,7 +117,7 @@
     }
 
 
-    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init(DirectoryServiceConfiguration factoryCfg) throws NamingException
     {
         nexus = factoryCfg.getPartitionNexus();
         normalizerMap = factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Sat Sep 29 01:24:59 2007
@@ -31,7 +31,6 @@
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -61,12 +60,24 @@
  * implemented to pass the flow of control to next interceptor by defaults.
  * Please override the methods you have concern in.
  *
+ * @org.apache.xbean.XBean
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
 public abstract class BaseInterceptor implements Interceptor
 {
     /**
+     * default interceptor name is its class, preventing accidental duplication of interceptors by naming
+     * instances differently
+     * @return (default, class name) interceptor name
+     */
+    public String getName()
+    {
+        return getClass().getName();
+    }
+    
+    /**
      * Returns {@link LdapPrincipal} of current context.
      */
     public static LdapPrincipal getPrincipal()
@@ -96,7 +107,7 @@
     /**
      * This method does nothing by default.
      */
-    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init(DirectoryServiceConfiguration factoryCfg) throws NamingException
     {
     }
 

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=580555&r1=580554&r2=580555&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Sat Sep 29 01:24:59 2007
@@ -28,7 +28,6 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
-import org.apache.directory.server.core.configuration.InterceptorConfiguration;
 import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
@@ -119,10 +118,16 @@
 public interface Interceptor
 {
     /**
+     * Name that must be unique in an interceptor chain
+     * @return name of this interceptor, must be unique in an interceptor chain.
+     */
+    String getName();
+
+    /**
      * Intializes this interceptor.  This is invoked by {@link InterceptorChain}
      * when this intercepter is loaded into interceptor chain.
      */
-    void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException;
+    void init(DirectoryServiceConfiguration factoryCfg) throws NamingException;
 
 
     /**



Mime
View raw message