svn commit: rev 54836 - in incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve: jndi schema schema/bootstrap

[ak...@apache.org]

Author: akarasulu
Date: Fri Oct 15 01:23:46 2004
New Revision: 54836

Added:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/bootstrap/BootstrapNameFormRegistry.java
      - copied, changed from rev 54832, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/DefaultNameFormRegistry.java
Removed:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/DefaultNameFormRegistry.java
Modified:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContextFactory.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/bootstrap/BootstrapRegistries.java
Log:
moving classes into bootstrap package and changing names

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContextFactory.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContextFactory.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContextFactory.java	Fri Oct 15 01:23:46 2004
@@ -9,8 +9,10 @@
 
 import org.apache.ldap.common.NotImplementedException;
 import org.apache.ldap.common.schema.Syntax;
-import org.apache.eve.schema.DefaultSyntaxRegistry;
-import org.apache.eve.schema.DefaultOidRegistry;
+import org.apache.eve.schema.bootstrap.BootstrapSyntaxRegistry;
+import org.apache.eve.schema.bootstrap.BootstrapOidRegistry;
+import org.apache.eve.schema.bootstrap.BootstrapOidRegistry;
+import org.apache.eve.schema.bootstrap.BootstrapSyntaxRegistry;
 
 import org.apache.eve.schema.config.CoreSyntaxFactory;
 
@@ -76,9 +78,9 @@
     {
         EveJndiProvider provider = null;
         Syntax[] syntaxes;
-        DefaultOidRegistry oidRegistry;
+        BootstrapOidRegistry oidRegistry;
         CoreSyntaxFactory coreSyntaxes;
-        DefaultSyntaxRegistry syntaxRegistry;
+        BootstrapSyntaxRegistry syntaxRegistry;
 
         throw new NotImplementedException( "bootstrap code not yet written" );
 

Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/bootstrap/BootstrapNameFormRegistry.java (from rev 54832, incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/DefaultNameFormRegistry.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/DefaultNameFormRegistry.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/bootstrap/BootstrapNameFormRegistry.java	Fri Oct 15 01:23:46 2004
@@ -14,10 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.schema;
+package org.apache.eve.schema.bootstrap;
 
 
 import org.apache.ldap.common.schema.NameForm;
+import org.apache.eve.schema.NameFormRegistry;
+import org.apache.eve.schema.OidRegistry;
+import org.apache.eve.schema.NameFormRegistryMonitor;
+import org.apache.eve.schema.NameFormRegistryMonitorAdapter;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -30,7 +34,7 @@
  * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DefaultNameFormRegistry implements NameFormRegistry
+public class BootstrapNameFormRegistry implements NameFormRegistry
 {
     /** maps an OID to an NameForm */
     private final Map byOid;
@@ -48,9 +52,9 @@
 
 
     /**
-     * Creates an empty DefaultNameFormRegistry.
+     * Creates an empty BootstrapNameFormRegistry.
      */
-    public DefaultNameFormRegistry( OidRegistry oidRegistry )
+    public BootstrapNameFormRegistry( OidRegistry oidRegistry )
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/bootstrap/BootstrapRegistries.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/bootstrap/BootstrapRegistries.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/bootstrap/BootstrapRegistries.java	Fri Oct 15 01:23:46 2004
@@ -44,18 +44,18 @@
 
     public BootstrapRegistries()
     {
-        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() );
+        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() );
     }