directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r487529 [1/2] - in /directory/branches/trunks/schema/apacheds: bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ core/src/test/java...
Date Fri, 15 Dec 2006 12:29:54 GMT
Author: akarasulu
Date: Fri Dec 15 04:29:49 2006
New Revision: 487529

URL: http://svn.apache.org/viewvc?view=rev&rev=487529
Log:
changes ...

 o created new Schema base interface extended by BootstrapSchema
 o renamed BootstrapRegistries and assorted registries to DefaultXXXX since 
   these registries can be reused for both bootstrapping, global use and for
   use in specific SAA registries
 
 next peice of work should move these registries into the registries package


Added:
    directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/Schema.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultAttributeTypeRegistry.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultComparatorRegistry.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitContentRuleRegistry.java
      - copied, changed from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitStructureRuleRegistry.java
      - copied, changed from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleRegistry.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleUseRegistry.java
      - copied, changed from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNameFormRegistry.java
      - copied, changed from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNormalizerRegistry.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultObjectClassRegistry.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultOidRegistry.java
      - copied, changed from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultRegistries.java
      - copied, changed from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxCheckerRegistry.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxRegistry.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java
Removed:
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java
Modified:
    directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
    directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchema.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/bootstrap/ExtraSchemaLoadTest.java
    directory/branches/trunks/schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/dumpcmd/DumpCommandExecutor.java

Modified: directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Fri Dec 15 04:29:49 2006
@@ -44,7 +44,7 @@
 import org.apache.directory.server.core.schema.SyntaxRegistry;
 import org.apache.directory.server.core.schema.bootstrap.ApacheSchema;
 import org.apache.directory.server.core.schema.bootstrap.ApachemetaSchema;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries;
+import org.apache.directory.server.core.schema.bootstrap.DefaultRegistries;
 import org.apache.directory.server.core.schema.bootstrap.BootstrapSchema;
 import org.apache.directory.server.core.schema.bootstrap.BootstrapSchemaLoader;
 import org.apache.directory.server.core.schema.bootstrap.CoreSchema;
@@ -110,7 +110,7 @@
     private AttributesFactory attributesFactory = new AttributesFactory();
     
     /** Registries of objects used to load the schema partition. */
-    private Registries registries = new BootstrapRegistries();
+    private Registries registries = new DefaultRegistries();
 
     /** The store to load schema entities into. */
     private JdbmStore store = new JdbmStore();
@@ -487,7 +487,7 @@
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
         try
         {
-            loader.load( schemas, ( BootstrapRegistries ) registries );
+            loader.load( schemas, ( DefaultRegistries ) registries );
         }
         catch ( NamingException e )
         {

Modified: directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchema.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchema.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchema.java (original)
+++ directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchema.java Fri Dec 15 04:29:49 2006
@@ -27,42 +27,14 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface BootstrapSchema
+public interface BootstrapSchema extends Schema
 {
     /**
-     * Gets the name of the owner of the schema objects within this
-     * BootstrapSchema.
-     *
-     * @return the identifier for the owner of this set's objects
-     */
-    String getOwner();
-
-
-    /**
-     * Gets the name of the logical schema the objects of this BootstrapSchema
-     * belong to: e.g. krb5-kdc may be the logical LDAP schema name.
-     *
-     * @return the name of the logical schema
-     */
-    String getSchemaName();
-
-
-    /**
      * Gets the package name of the schema's object factories.
      *
      * @return the name of the schema's package name
      */
     String getPackageName();
-
-
-    /**
-     * Gets the names of other schemas that this objects within this
-     * BootstrapSchema depends upon.  These dependent schemas are those
-     * whose ConfigurationSets will be processed first.
-     *
-     * @return the String names of schema dependencies
-     */
-    String[] getDependencies();
 
 
     /**

Added: directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/Schema.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/Schema.java?view=auto&rev=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/Schema.java (added)
+++ directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/Schema.java Fri Dec 15 04:29:49 2006
@@ -0,0 +1,56 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.server.core.schema.bootstrap;
+
+
+/**
+ * Base schema interface.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface Schema
+{
+    /**
+     * Gets the name of the owner of the schema objects within this
+     * Schema.
+     *
+     * @return the identifier for the owner of this set's objects
+     */
+    String getOwner();
+
+
+    /**
+     * Gets the name of the logical schema the objects of this Schema
+     * belong to: e.g. krb5-kdc may be the logical LDAP schema name.
+     *
+     * @return the name of the logical schema
+     */
+    String getSchemaName();
+
+
+    /**
+     * Gets the names of other schemas that the objects within this
+     * Schema depends upon.
+     *
+     * @return the String names of schema dependencies
+     */
+    String[] getDependencies();
+}

Modified: directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Fri Dec 15 04:29:49 2006
@@ -62,14 +62,14 @@
     {
         super( name );
 
-        registries = new BootstrapRegistries();
+        registries = new DefaultRegistries();
 
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
         Set<BootstrapSchema> schemas = new HashSet<BootstrapSchema>();
         schemas.add( new SystemSchema() );
         schemas.add( new ApacheSchema() );
         schemas.add( new CoreSchema() );
-        loader.load( schemas, ( BootstrapRegistries ) registries );
+        loader.load( schemas, ( DefaultRegistries ) registries );
 
         java.util.List errors = registries.checkRefInteg();
         if ( !errors.isEmpty() )

Modified: directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Fri Dec 15 04:29:49 2006
@@ -30,7 +30,7 @@
 
 import org.apache.directory.server.core.schema.SchemaService;
 import org.apache.directory.server.core.schema.bootstrap.ApacheSchema;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries;
+import org.apache.directory.server.core.schema.bootstrap.DefaultRegistries;
 import org.apache.directory.server.core.schema.bootstrap.BootstrapSchemaLoader;
 import org.apache.directory.server.core.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.core.schema.bootstrap.SystemSchema;
@@ -47,12 +47,12 @@
  */
 public class SchemaServiceTest extends TestCase
 {
-    BootstrapRegistries registries = new BootstrapRegistries();
+    DefaultRegistries registries = new DefaultRegistries();
 
 
     public void setUp() throws Exception
     {
-        registries = new BootstrapRegistries();
+        registries = new DefaultRegistries();
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
         loader.load( new SystemSchema(), registries );
         loader.load( new ApacheSchema(), registries );

Modified: directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java Fri Dec 15 04:29:49 2006
@@ -31,7 +31,7 @@
 import junit.framework.TestCase;
 
 import org.apache.directory.server.core.schema.bootstrap.ApacheSchema;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries;
+import org.apache.directory.server.core.schema.bootstrap.DefaultRegistries;
 import org.apache.directory.server.core.schema.bootstrap.BootstrapSchemaLoader;
 import org.apache.directory.server.core.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.core.schema.bootstrap.SystemSchema;
@@ -46,13 +46,13 @@
  */
 public class BootstrapSchemaLoaderTest extends TestCase
 {
-    BootstrapRegistries registries;
+    DefaultRegistries registries;
 
 
     protected void setUp() throws Exception
     {
         super.setUp();
-        registries = new BootstrapRegistries();
+        registries = new DefaultRegistries();
     }
 
 

Modified: directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Fri Dec 15 04:29:49 2006
@@ -61,7 +61,7 @@
      */
     private void init() throws NamingException
     {
-        BootstrapRegistries bsRegistries = new BootstrapRegistries();
+        DefaultRegistries bsRegistries = new DefaultRegistries();
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
         Set<BootstrapSchema> schemas = new HashSet<BootstrapSchema>();
         schemas.add( new SystemSchema() );

Modified: directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Fri Dec 15 04:29:49 2006
@@ -56,7 +56,7 @@
      */
     private void init() throws NamingException
     {
-        BootstrapRegistries bsRegistries = new BootstrapRegistries();
+        DefaultRegistries bsRegistries = new DefaultRegistries();
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
         Set<BootstrapSchema> schemas = new HashSet<BootstrapSchema>();
         schemas.add( new SystemSchema() );

Modified: directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Fri Dec 15 04:29:49 2006
@@ -55,7 +55,7 @@
 
     private void init() throws NamingException
     {
-        BootstrapRegistries bsRegistries = new BootstrapRegistries();
+        DefaultRegistries bsRegistries = new DefaultRegistries();
         registries = bsRegistries;
         BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
         Set<BootstrapSchema> schemas = new HashSet<BootstrapSchema>();

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java Fri Dec 15 04:29:49 2006
@@ -80,19 +80,19 @@
     }
 
 
-    protected static BootstrapSyntax newSyntax( String oid, BootstrapRegistries registries )
+    protected static BootstrapSyntax newSyntax( String oid, DefaultRegistries registries )
     {
         return new BootstrapSyntax( oid, registries.getSyntaxCheckerRegistry() );
     }
 
 
-    protected static BootstrapAttributeType newAttributeType( String oid, BootstrapRegistries registries )
+    protected static BootstrapAttributeType newAttributeType( String oid, DefaultRegistries registries )
     {
         return new BootstrapAttributeType( oid, registries );
     }
 
 
-    protected static BootstrapObjectClass newObjectClass( String oid, BootstrapRegistries registries )
+    protected static BootstrapObjectClass newObjectClass( String oid, DefaultRegistries registries )
     {
         return new BootstrapObjectClass( oid, registries );
     }
@@ -154,7 +154,7 @@
         String syntaxOid;
 
 
-        protected BootstrapMatchingRule(String oid, BootstrapRegistries registries)
+        protected BootstrapMatchingRule(String oid, DefaultRegistries registries)
         {
             super( oid );
             this.syntaxRegistry = registries.getSyntaxRegistry();
@@ -225,7 +225,7 @@
         private String syntaxId;
 
 
-        protected BootstrapAttributeType(String oid, BootstrapRegistries registries)
+        protected BootstrapAttributeType(String oid, DefaultRegistries registries)
         {
             super( oid );
 
@@ -415,7 +415,7 @@
          * @param oid the OID of the new objectClass
          * @param registries the bootstrap registries to use for resolving dependent objects
          */
-        protected BootstrapObjectClass(String oid, BootstrapRegistries registries)
+        protected BootstrapObjectClass(String oid, DefaultRegistries registries)
         {
             super( oid );
 

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java Fri Dec 15 04:29:49 2006
@@ -50,9 +50,9 @@
     // ------------------------------------------------------------------------
 
     /**
-     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, ProducerCallback)
+     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.DefaultRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Comparator comparator;
 

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java Fri Dec 15 04:29:49 2006
@@ -44,9 +44,9 @@
     // ------------------------------------------------------------------------
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
+     * @see BootstrapProducer#produce(DefaultRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapMatchingRule mrule = null;
         

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java Fri Dec 15 04:29:49 2006
@@ -46,9 +46,9 @@
     // ------------------------------------------------------------------------
 
     /**
-     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
+     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.DefaultRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Normalizer normalizer;
 

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java Fri Dec 15 04:29:49 2006
@@ -52,9 +52,9 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see BootstrapProducer#produce(DefaultRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
+    public void produce( DefaultRegistries registries, ProducerCallback cb )
         throws NamingException
     {
         Comparator comparator = null;

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java Fri Dec 15 04:29:49 2006
@@ -60,9 +60,9 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see BootstrapProducer#produce(DefaultRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
+    public void produce( DefaultRegistries registries, ProducerCallback cb )
         throws NamingException
     {
         MatchingRule matchingRule = null;

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java Fri Dec 15 04:29:49 2006
@@ -50,9 +50,9 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see BootstrapProducer#produce(DefaultRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
+    public void produce( DefaultRegistries registries, ProducerCallback cb )
         throws NamingException
     {
         Normalizer normalizer = null;

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java Fri Dec 15 04:29:49 2006
@@ -51,9 +51,9 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see BootstrapProducer#produce(DefaultRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
+    public void produce( DefaultRegistries registries, ProducerCallback cb )
         throws NamingException
     {
         SyntaxChecker checker = null;

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java Fri Dec 15 04:29:49 2006
@@ -53,9 +53,9 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see BootstrapProducer#produce(DefaultRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
+    public void produce( DefaultRegistries registries, ProducerCallback cb )
         throws NamingException
     {
         Syntax syntax = null;

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java Fri Dec 15 04:29:49 2006
@@ -53,5 +53,5 @@
      * throw these exceptions so we must throw this as well since
      * implementations will have to call the callback methods
      */
-    void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException;
+    void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException;
 }

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java Fri Dec 15 04:29:49 2006
@@ -37,6 +37,7 @@
 import org.apache.directory.server.core.schema.NameFormRegistry;
 import org.apache.directory.server.core.schema.NormalizerRegistry;
 import org.apache.directory.server.core.schema.ObjectClassRegistry;
+import org.apache.directory.server.core.schema.Registries;
 import org.apache.directory.server.core.schema.SyntaxCheckerRegistry;
 import org.apache.directory.server.core.schema.SyntaxRegistry;
 import org.apache.directory.server.core.schema.bootstrap.BootstrapSchema;
@@ -68,7 +69,7 @@
     /** stores schemas of producers for callback access */
     private ThreadLocal<BootstrapSchema> schemas;
     /** stores registries associated with producers for callback access */
-    private ThreadLocal<BootstrapRegistries> registries;
+    private ThreadLocal<Registries> registries;
     /** the callback that just calls register() */
     private final ProducerCallback cb = new ProducerCallback()
     {
@@ -86,7 +87,7 @@
     public BootstrapSchemaLoader()
     {
         schemas = new ThreadLocal<BootstrapSchema>();
-        registries = new ThreadLocal<BootstrapRegistries>();
+        registries = new ThreadLocal<Registries>();
     }
 
 
@@ -98,7 +99,7 @@
      * @param registries the registries to fill with producer created objects
      * @throws NamingException if there are any failures during this process
      */
-    public final void load( Collection<BootstrapSchema> bootstrapSchemas, BootstrapRegistries registries ) throws NamingException
+    public final void load( Collection<BootstrapSchema> bootstrapSchemas, DefaultRegistries registries ) throws NamingException
     {
         BootstrapSchema[] schemas = new BootstrapSchema[bootstrapSchemas.size()];
         schemas = ( BootstrapSchema[] ) bootstrapSchemas.toArray( schemas );
@@ -142,7 +143,7 @@
      * failure results while loading, producing and or registering schema objects
      */
     public final void loadDepsFirst( Stack<String> beenthere, HashMap notLoaded, BootstrapSchema schema,
-        BootstrapRegistries registries ) throws NamingException
+        DefaultRegistries registries ) throws NamingException
     {
         beenthere.push( schema.getSchemaName() );
         String[] deps = schema.getDependencies();
@@ -194,7 +195,7 @@
      * @param registries the registries to fill with producer created objects
      * @throws NamingException if there are any failures during this process
      */
-    public final void load( BootstrapSchema schema, BootstrapRegistries registries ) throws NamingException
+    public final void load( BootstrapSchema schema, DefaultRegistries registries ) throws NamingException
     {
         this.registries.set( registries );
         this.schemas.set( schema );
@@ -223,7 +224,7 @@
     private void register( ProducerTypeEnum type, String id, Object schemaObject ) throws NamingException
     {
         BootstrapSchema schema = ( BootstrapSchema ) this.schemas.get();
-        BootstrapRegistries registries = ( BootstrapRegistries ) this.registries.get();
+        DefaultRegistries registries = ( DefaultRegistries ) this.registries.get();
 
         switch ( type )
         {

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultAttributeTypeRegistry.java (from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultAttributeTypeRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java&r1=487357&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultAttributeTypeRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultAttributeTypeRegistry.java Fri Dec 15 04:29:49 2006
@@ -46,10 +46,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapAttributeTypeRegistry implements AttributeTypeRegistry
+public class DefaultAttributeTypeRegistry implements AttributeTypeRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapAttributeTypeRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultAttributeTypeRegistry.class );
 
     /** maps an OID to an AttributeType */
     private final Map<String,AttributeType> byOid;
@@ -70,7 +70,7 @@
     /**
      * Creates an empty BootstrapAttributeTypeRegistry.
      */
-    public BootstrapAttributeTypeRegistry( OidRegistry oidRegistry )
+    public DefaultAttributeTypeRegistry( OidRegistry oidRegistry )
     {
         this.byOid = new HashMap<String,AttributeType>();
         this.oidToSchema = new HashMap<String,String>();

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultComparatorRegistry.java (from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultComparatorRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java&r1=487357&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultComparatorRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultComparatorRegistry.java Fri Dec 15 04:29:49 2006
@@ -40,10 +40,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapComparatorRegistry implements ComparatorRegistry
+public class DefaultComparatorRegistry implements ComparatorRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapComparatorRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultComparatorRegistry.class );
     /** the comparators in this registry */
     private final Map<String,Comparator> comparators;
     /** maps an OID to a schema name*/
@@ -58,7 +58,7 @@
      * Creates a default ComparatorRegistry by initializing the map and the
      * montior.
      */
-    public BootstrapComparatorRegistry()
+    public DefaultComparatorRegistry()
     {
         this.oidToSchema = new HashMap<String,String>();
         this.comparators = new HashMap<String, Comparator>();

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitContentRuleRegistry.java (from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitContentRuleRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java&r1=487527&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitContentRuleRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitContentRuleRegistry.java Fri Dec 15 04:29:49 2006
@@ -39,10 +39,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapDitContentRuleRegistry implements DITContentRuleRegistry
+public class DefaultDitContentRuleRegistry implements DITContentRuleRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapDitContentRuleRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultDitContentRuleRegistry.class );
     /** maps an OID to an DITContentRule */
     private final Map<String,DITContentRule> byOid;
     /** maps an OID to a schema name*/
@@ -58,7 +58,7 @@
     /**
      * Creates an empty BootstrapDitContentRuleRegistry.
      */
-    public BootstrapDitContentRuleRegistry(OidRegistry oidRegistry)
+    public DefaultDitContentRuleRegistry(OidRegistry oidRegistry)
     {
         this.byOid = new HashMap<String,DITContentRule>();
         this.oidToSchema = new HashMap<String,String>();

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitStructureRuleRegistry.java (from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitStructureRuleRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java&r1=487527&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitStructureRuleRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultDitStructureRuleRegistry.java Fri Dec 15 04:29:49 2006
@@ -39,10 +39,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapDitStructureRuleRegistry implements DITStructureRuleRegistry
+public class DefaultDitStructureRuleRegistry implements DITStructureRuleRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapDitStructureRuleRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultDitStructureRuleRegistry.class );
     /** maps an OID to an DITStructureRule */
     private final Map<String,DITStructureRule> byOid;
     /** maps an OID to a schema name*/
@@ -59,7 +59,7 @@
     /**
      * Creates an empty BootstrapDitStructureRuleRegistry.
      */
-    public BootstrapDitStructureRuleRegistry(OidRegistry oidRegistry)
+    public DefaultDitStructureRuleRegistry(OidRegistry oidRegistry)
     {
         this.byOid = new HashMap<String,DITStructureRule>();
         this.oidToSchema = new HashMap<String,String>();

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleRegistry.java (from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java&r1=487357&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleRegistry.java Fri Dec 15 04:29:49 2006
@@ -40,10 +40,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapMatchingRuleRegistry implements MatchingRuleRegistry
+public class DefaultMatchingRuleRegistry implements MatchingRuleRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapMatchingRuleRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultMatchingRuleRegistry.class );
     /** a map using an OID for the key and a MatchingRule for the value */
     private final Map<String,MatchingRule> byOid;
     /** maps an OID to a schema name*/
@@ -62,7 +62,7 @@
      * for lookups.
      * 
      */
-    public BootstrapMatchingRuleRegistry(OidRegistry oidRegistry)
+    public DefaultMatchingRuleRegistry(OidRegistry oidRegistry)
     {
         this.oidToSchema = new HashMap<String,String>();
         this.oidRegistry = oidRegistry;

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleUseRegistry.java (from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleUseRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java&r1=487527&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleUseRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultMatchingRuleUseRegistry.java Fri Dec 15 04:29:49 2006
@@ -39,10 +39,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapMatchingRuleUseRegistry implements MatchingRuleUseRegistry
+public class DefaultMatchingRuleUseRegistry implements MatchingRuleUseRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapMatchingRuleUseRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultMatchingRuleUseRegistry.class );
     /** maps a name to an MatchingRuleUse */
     private final Map<String,MatchingRuleUse> byName;
     /** maps a MatchingRuleUse name to a schema name*/
@@ -57,7 +57,7 @@
     /**
      * Creates an empty BootstrapMatchingRuleUseRegistry.
      */
-    public BootstrapMatchingRuleUseRegistry()
+    public DefaultMatchingRuleUseRegistry()
     {
         this.byName = new HashMap<String,MatchingRuleUse>();
         this.nameToSchema = new HashMap<String,String>();

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNameFormRegistry.java (from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNameFormRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java&r1=487527&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNameFormRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNameFormRegistry.java Fri Dec 15 04:29:49 2006
@@ -39,10 +39,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapNameFormRegistry implements NameFormRegistry
+public class DefaultNameFormRegistry implements NameFormRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapNameFormRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultNameFormRegistry.class );
     /** maps an OID to an NameForm */
     private final Map<String,NameForm> byOid;
     /** maps an OID to a schema name*/
@@ -58,7 +58,7 @@
     /**
      * Creates an empty BootstrapNameFormRegistry.
      */
-    public BootstrapNameFormRegistry(OidRegistry oidRegistry)
+    public DefaultNameFormRegistry(OidRegistry oidRegistry)
     {
         this.byOid = new HashMap<String,NameForm>();
         this.oidToSchema = new HashMap<String,String>();

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNormalizerRegistry.java (from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNormalizerRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java&r1=487357&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNormalizerRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultNormalizerRegistry.java Fri Dec 15 04:29:49 2006
@@ -38,10 +38,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapNormalizerRegistry implements NormalizerRegistry
+public class DefaultNormalizerRegistry implements NormalizerRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapNormalizerRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultNormalizerRegistry.class );
     /** a map of Normalizers looked up by OID */
     private final Map<String, Normalizer> byOid;
     /** maps an OID to a schema name*/
@@ -55,7 +55,7 @@
     /**
      * Creates a default normalizer registry.
      */
-    public BootstrapNormalizerRegistry()
+    public DefaultNormalizerRegistry()
     {
         this.byOid = new HashMap<String, Normalizer>();
         this.oidToSchema = new HashMap<String, String>();

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultObjectClassRegistry.java (from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultObjectClassRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java&r1=487357&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultObjectClassRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultObjectClassRegistry.java Fri Dec 15 04:29:49 2006
@@ -39,10 +39,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapObjectClassRegistry implements ObjectClassRegistry
+public class DefaultObjectClassRegistry implements ObjectClassRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapObjectClassRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultObjectClassRegistry.class );
     /** maps an OID to an ObjectClass */
     private final Map<String,ObjectClass> byOid;
     /** maps an OID to a schema name*/
@@ -58,7 +58,7 @@
     /**
      * Creates an empty BootstrapObjectClassRegistry.
      */
-    public BootstrapObjectClassRegistry(OidRegistry oidRegistry)
+    public DefaultObjectClassRegistry(OidRegistry oidRegistry)
     {
         this.byOid = new HashMap<String,ObjectClass>();
         this.oidToSchema = new HashMap<String,String>();

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultOidRegistry.java (from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultOidRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java&r1=487527&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultOidRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultOidRegistry.java Fri Dec 15 04:29:49 2006
@@ -42,10 +42,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapOidRegistry implements OidRegistry
+public class DefaultOidRegistry implements OidRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapOidRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultOidRegistry.class );
     /** Maps OID to a name or a list of names if more than one name exists */
     private Map byOid = new HashMap();
     /** Maps several names to an OID */

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultRegistries.java (from r487527, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultRegistries.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java&r1=487527&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultRegistries.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultRegistries.java Fri Dec 15 04:29:49 2006
@@ -51,36 +51,36 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapRegistries implements Registries
+public class DefaultRegistries implements Registries
 {
-    private BootstrapAttributeTypeRegistry attributeTypeRegistry;
-    private BootstrapComparatorRegistry comparatorRegistry;
-    private BootstrapDitContentRuleRegistry ditContentRuleRegistry;
-    private BootstrapDitStructureRuleRegistry ditStructureRuleRegistry;
-    private BootstrapMatchingRuleRegistry matchingRuleRegistry;
-    private BootstrapMatchingRuleUseRegistry matchingRuleUseRegistry;
-    private BootstrapNameFormRegistry nameFormRegistry;
-    private BootstrapNormalizerRegistry normalizerRegistry;
-    private BootstrapObjectClassRegistry objectClassRegistry;
-    private BootstrapOidRegistry oidRegistry;
-    private BootstrapSyntaxCheckerRegistry syntaxCheckerRegistry;
-    private BootstrapSyntaxRegistry syntaxRegistry;
+    private DefaultAttributeTypeRegistry attributeTypeRegistry;
+    private DefaultComparatorRegistry comparatorRegistry;
+    private DefaultDitContentRuleRegistry ditContentRuleRegistry;
+    private DefaultDitStructureRuleRegistry ditStructureRuleRegistry;
+    private DefaultMatchingRuleRegistry matchingRuleRegistry;
+    private DefaultMatchingRuleUseRegistry matchingRuleUseRegistry;
+    private DefaultNameFormRegistry nameFormRegistry;
+    private DefaultNormalizerRegistry normalizerRegistry;
+    private DefaultObjectClassRegistry objectClassRegistry;
+    private DefaultOidRegistry oidRegistry;
+    private DefaultSyntaxCheckerRegistry syntaxCheckerRegistry;
+    private DefaultSyntaxRegistry syntaxRegistry;
 
 
-    public BootstrapRegistries()
+    public DefaultRegistries()
     {
-        oidRegistry = new BootstrapOidRegistry();
-        normalizerRegistry = new BootstrapNormalizerRegistry();
-        comparatorRegistry = new BootstrapComparatorRegistry();
-        syntaxCheckerRegistry = new BootstrapSyntaxCheckerRegistry();
-        syntaxRegistry = new BootstrapSyntaxRegistry( getOidRegistry() );
-        matchingRuleRegistry = new BootstrapMatchingRuleRegistry( getOidRegistry() );
-        attributeTypeRegistry = new BootstrapAttributeTypeRegistry( getOidRegistry() );
-        objectClassRegistry = new BootstrapObjectClassRegistry( getOidRegistry() );
-        ditContentRuleRegistry = new BootstrapDitContentRuleRegistry( getOidRegistry() );
-        ditStructureRuleRegistry = new BootstrapDitStructureRuleRegistry( getOidRegistry() );
-        matchingRuleUseRegistry = new BootstrapMatchingRuleUseRegistry();
-        nameFormRegistry = new BootstrapNameFormRegistry( getOidRegistry() );
+        oidRegistry = new DefaultOidRegistry();
+        normalizerRegistry = new DefaultNormalizerRegistry();
+        comparatorRegistry = new DefaultComparatorRegistry();
+        syntaxCheckerRegistry = new DefaultSyntaxCheckerRegistry();
+        syntaxRegistry = new DefaultSyntaxRegistry( getOidRegistry() );
+        matchingRuleRegistry = new DefaultMatchingRuleRegistry( getOidRegistry() );
+        attributeTypeRegistry = new DefaultAttributeTypeRegistry( getOidRegistry() );
+        objectClassRegistry = new DefaultObjectClassRegistry( getOidRegistry() );
+        ditContentRuleRegistry = new DefaultDitContentRuleRegistry( getOidRegistry() );
+        ditStructureRuleRegistry = new DefaultDitStructureRuleRegistry( getOidRegistry() );
+        matchingRuleUseRegistry = new DefaultMatchingRuleUseRegistry();
+        nameFormRegistry = new DefaultNameFormRegistry( getOidRegistry() );
     }
 
 

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxCheckerRegistry.java (from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxCheckerRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java&r1=487357&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxCheckerRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxCheckerRegistry.java Fri Dec 15 04:29:49 2006
@@ -38,10 +38,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapSyntaxCheckerRegistry implements SyntaxCheckerRegistry
+public class DefaultSyntaxCheckerRegistry implements SyntaxCheckerRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapSyntaxCheckerRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultSyntaxCheckerRegistry.class );
     /** a map by OID of SyntaxCheckers */
     private final Map<String, SyntaxChecker> byOid;
     /** maps an OID to a schema name*/
@@ -55,7 +55,7 @@
     /**
      * Creates an instance of a BootstrapSyntaxRegistry.
      */
-    public BootstrapSyntaxCheckerRegistry()
+    public DefaultSyntaxCheckerRegistry()
     {
         this.byOid = new HashMap<String, SyntaxChecker>();
         this.oidToSchema = new HashMap<String, String>();

Copied: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxRegistry.java (from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxRegistry.java?view=diff&rev=487529&p1=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java&r1=487357&p2=directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxRegistry.java&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/DefaultSyntaxRegistry.java Fri Dec 15 04:29:49 2006
@@ -40,10 +40,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BootstrapSyntaxRegistry implements SyntaxRegistry
+public class DefaultSyntaxRegistry implements SyntaxRegistry
 {
     /** static class logger */
-    private final static Logger log = LoggerFactory.getLogger( BootstrapSyntaxRegistry.class );
+    private final static Logger log = LoggerFactory.getLogger( DefaultSyntaxRegistry.class );
     /** a map of entries using an OID for the key and a Syntax for the value */
     private final Map<String,Syntax> byOid;
     /** maps an OID to a schema name*/
@@ -59,7 +59,7 @@
     /**
      * Creates a BootstrapSyntaxRegistry.
      */
-    public BootstrapSyntaxRegistry(OidRegistry registry)
+    public DefaultSyntaxRegistry(OidRegistry registry)
     {
         this.oidRegistry = registry;
         this.byOid = new HashMap<String,Syntax>();

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java Fri Dec 15 04:29:49 2006
@@ -48,7 +48,7 @@
     }
 
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Comparator comparator;
 

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java Fri Dec 15 04:29:49 2006
@@ -40,7 +40,7 @@
     }
 
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapMatchingRule mrule = null;
 

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java Fri Dec 15 04:29:49 2006
@@ -47,7 +47,7 @@
     }
 
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Normalizer normalizer;
 

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java Fri Dec 15 04:29:49 2006
@@ -47,7 +47,7 @@
     }
 
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         SyntaxChecker syntaxChecker;
 

Modified: directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java Fri Dec 15 04:29:49 2006
@@ -115,7 +115,7 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapSyntax syntax;
         SyntaxCheckerRegistry syntaxCheckerRegistry = registries.getSyntaxCheckerRegistry();

Modified: directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java Fri Dec 15 04:29:49 2006
@@ -53,9 +53,9 @@
     // ------------------------------------------------------------------------
 
     /**
-     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(DefaultRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Comparator comparator;
 

Modified: directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java Fri Dec 15 04:29:49 2006
@@ -47,9 +47,9 @@
     // ------------------------------------------------------------------------
 
     /**
-     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
+     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.DefaultRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapMatchingRule mrule;
 

Modified: directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java Fri Dec 15 04:29:49 2006
@@ -50,9 +50,9 @@
     // ------------------------------------------------------------------------
 
     /**
-     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(DefaultRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Normalizer normalizer;
 

Modified: directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java?view=diff&rev=487529&r1=487528&r2=487529
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java Fri Dec 15 04:29:49 2006
@@ -49,9 +49,9 @@
     // ------------------------------------------------------------------------
 
     /**
-     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
+     * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(DefaultRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
+    public void produce( DefaultRegistries registries, ProducerCallback cb ) throws NamingException
     {
         SyntaxChecker syntaxChecker;
 



Mime
View raw message