Author: akarasulu
Date: Wed Dec 13 15:59:03 2006
New Revision: 486898

URL: http://svn.apache.org/viewvc?view=rev&rev=486898
Log:
moved abstract syntax checker to its right place and removed all this nonsense with object and state factory registries in the bootstrap registries area

Added:
    directory/branches/trunks/schema2/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java
      - copied, changed from r486882, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java
Removed:
    directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java
    directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectFactoryRegistry.java
    directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/StateFactoryRegistry.java
    directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java
    directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapStateFactoryRegistry.java
Modified:
    directory/branches/trunks/schema2/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java
    directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java
    directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java

Modified: directory/branches/trunks/schema2/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java?view=diff&rev=486898&r1=486897&r2=486898
==============================================================================
--- directory/branches/trunks/schema2/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java (original)
+++ directory/branches/trunks/schema2/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java Wed Dec 13 15:59:03 2006
@@ -76,13 +76,7 @@
     NAME_FORM_PRODUCER( 9 ),
     
     /** value for DitStructureRule BootstrapProducers */
-    DIT_STRUCTURE_RULE_PRODUCER( 10 ),
-    
-    /** value for StateFactory BootstrapProducers */
-    STATE_FACTORY_PRODUCER( 11 ),
-    
-    /** value for ObjectFactory BootstrapProducers */
-    OBJECT_FACTORY_PRODUCER( 12 );
+    DIT_STRUCTURE_RULE_PRODUCER( 10 );
     
     private int value;
 
@@ -136,8 +130,6 @@
         list.add(DIT_CONTENT_RULE_PRODUCER );
         list.add(NAME_FORM_PRODUCER );
         list.add(DIT_STRUCTURE_RULE_PRODUCER );
-        list.add(STATE_FACTORY_PRODUCER );
-        list.add(OBJECT_FACTORY_PRODUCER );
         
         return list;
     }
@@ -178,12 +170,6 @@
             
             case DIT_STRUCTURE_RULE_PRODUCER :
                 return "DitStructureRuleProducer";
-            
-            case STATE_FACTORY_PRODUCER :
-                return "StateFactoryProducer";
-            
-            case OBJECT_FACTORY_PRODUCER :
-                return "ObjectFactoryProducer";
                 
             default :
                 return "";

Modified: directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java?view=diff&rev=486898&r1=486897&r2=486898
==============================================================================
--- directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java (original)
+++ directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java Wed Dec 13 15:59:03 2006
@@ -35,10 +35,8 @@
 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.ObjectFactoryRegistry;
 import org.apache.directory.server.core.schema.OidRegistry;
 import org.apache.directory.server.core.schema.Registries;
-import org.apache.directory.server.core.schema.StateFactoryRegistry;
 import org.apache.directory.server.core.schema.SyntaxCheckerRegistry;
 import org.apache.directory.server.core.schema.SyntaxRegistry;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -67,8 +65,6 @@
     private BootstrapOidRegistry oidRegistry;
     private BootstrapSyntaxCheckerRegistry syntaxCheckerRegistry;
     private BootstrapSyntaxRegistry syntaxRegistry;
-    private BootstrapObjectFactoryRegistry objectFactoryRegistry;
-    private BootstrapStateFactoryRegistry stateFactoryRegistry;
 
 
     public BootstrapRegistries()
@@ -85,8 +81,6 @@
         ditStructureRuleRegistry = new BootstrapDitStructureRuleRegistry( getOidRegistry() );
         matchingRuleUseRegistry = new BootstrapMatchingRuleUseRegistry();
         nameFormRegistry = new BootstrapNameFormRegistry( getOidRegistry() );
-        objectFactoryRegistry = new BootstrapObjectFactoryRegistry( getOidRegistry() );
-        stateFactoryRegistry = new BootstrapStateFactoryRegistry();
     }
 
 
@@ -159,18 +153,6 @@
     public SyntaxRegistry getSyntaxRegistry()
     {
         return syntaxRegistry;
-    }
-
-
-    public ObjectFactoryRegistry getObjectFactoryRegistry()
-    {
-        return objectFactoryRegistry;
-    }
-
-
-    public StateFactoryRegistry getStateFactoryRegistry()
-    {
-        return stateFactoryRegistry;
     }
 
 

Modified: directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java?view=diff&rev=486898&r1=486897&r2=486898
==============================================================================
--- directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java (original)
+++ directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java Wed Dec 13 15:59:03 2006
@@ -28,7 +28,6 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.core.jndi.ServerDirObjectFactory;
 import org.apache.directory.server.core.jndi.ServerDirStateFactory;
 import org.apache.directory.server.core.schema.AttributeTypeRegistry;
 import org.apache.directory.server.core.schema.ComparatorRegistry;
@@ -39,8 +38,6 @@
 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.ObjectFactoryRegistry;
-import org.apache.directory.server.core.schema.StateFactoryRegistry;
 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;
@@ -305,20 +302,6 @@
                 DITStructureRuleRegistry ditStructureRuleRegistry;
                 ditStructureRuleRegistry = registries.getDitStructureRuleRegistry();
                 ditStructureRuleRegistry.register( schema.getSchemaName(), ditStructureRule );
-                break;
-                
-            case STATE_FACTORY_PRODUCER :
-                ServerDirStateFactory stateFactory = ( ServerDirStateFactory ) schemaObject;
-                StateFactoryRegistry stateFactoryRegistry;
-                stateFactoryRegistry = registries.getStateFactoryRegistry();
-                stateFactoryRegistry.register( stateFactory );
-                break;
-                
-            case OBJECT_FACTORY_PRODUCER :
-                ServerDirObjectFactory objectFactory = ( ServerDirObjectFactory ) schemaObject;
-                ObjectFactoryRegistry objectFactoryRegistry;
-                objectFactoryRegistry = registries.getObjectFactoryRegistry();
-                objectFactoryRegistry.register( objectFactory );
                 break;
                 
             default:

Copied: directory/branches/trunks/schema2/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java (from r486882, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java?view=diff&rev=486898&p1=directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java&r1=486882&p2=directory/branches/trunks/schema2/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java&r2=486898
==============================================================================
--- directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/AbstractSyntaxChecker.java (original)
+++ directory/branches/trunks/schema2/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java Wed Dec 13 15:59:03 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.schema;
+package org.apache.directory.shared.ldap.schema.syntax;
 
 
 import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;