svn commit: r1062635 [1/2] - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/ apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ apacheds/trunk/core/src/main/java/org/apache/dir...

[ak...@apache.org]

Author: akarasulu
Date: Mon Jan 24 03:46:27 2011
New Revision: 1062635

URL: http://svn.apache.org/viewvc?rev=1062635&view=rev
Log:
moving schema parsers, their tests, under model area

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AbstractSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AttributeTypeDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ConsoleParserMonitor.java
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/ConsoleParserMonitor.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITContentRuleDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITContentRuleDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITStructureRuleDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescription.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapSyntaxDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NameFormDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ObjectClassDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitor.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitor.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitorAdapter.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitorAdapter.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaLexer.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaLexer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/parsers/
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParserTest.java
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java   (contents, props changed)
      - copied, changed from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/model/
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/model/schema/
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/model/schema/parsers/
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/model/schema/parsers/collective.schema
      - copied unchanged from r1062631, directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/collective.schema
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/model/schema/parsers/core.schema
      - copied unchanged from r1062631, directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/core.schema
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/model/schema/parsers/dyngroup.schema
      - copied unchanged from r1062631, directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/dyngroup.schema
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/model/schema/parsers/inetorgperson.schema
      - copied unchanged from r1062631, directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/inetorgperson.schema
Removed:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AbstractSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AttributeTypeDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITContentRuleDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITStructureRuleDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescription.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapSyntaxDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NameFormDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ObjectClassDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitor.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitorAdapter.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaLexer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaParser.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/ConsoleParserMonitor.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/collective.schema
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/core.schema
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/dyngroup.schema
    directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/inetorgperson.schema
Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
    directory/shared/trunk/ldap/src/main/antlr/ACIItem.g
    directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g
    directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
    directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g
    directory/shared/trunk/ldap/src/main/antlr/schema-extension.g
    directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g
    directory/shared/trunk/ldap/src/main/antlr/schema-value.g
    directory/shared/trunk/ldap/src/main/antlr/schema.g
    directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/AttributeTypeDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ComparatorDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITContentRuleDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleUseDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java Mon Jan 24 03:46:27 2011
@@ -41,20 +41,17 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.NameForm;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.DITContentRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.DITStructureRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.NameFormDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.*;
+import org.apache.directory.shared.ldap.model.schema.parsers.DITContentRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.DITStructureRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.NameFormDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescriptionSchemaParser;
 
 
 /**

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Mon Jan 24 03:46:27 2011
@@ -48,7 +48,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Mon Jan 24 03:46:27 2011
@@ -77,17 +77,17 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.comparators.BooleanComparator;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimNormalizer;
+import org.apache.directory.shared.ldap.model.schema.parsers.*;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.schemaloader.SchemaEntityFactory;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 import org.apache.directory.shared.util.Base64;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Mon Jan 24 03:46:27 2011
@@ -43,9 +43,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.NameForm;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.model.schema.registries.SchemaLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Mon Jan 24 03:46:27 2011
@@ -48,9 +48,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.model.schema.registries.Schema;
 import org.apache.directory.shared.util.Base64;
 

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java Mon Jan 24 03:46:27 2011
@@ -24,8 +24,8 @@ import java.util.Iterator;
 
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
 import org.apache.directory.shared.ldap.model.schema.registries.DefaultComparatorRegistry;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
 
 
 /**

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Mon Jan 24 03:46:27 2011
@@ -53,7 +53,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Mon Jan 24 03:46:27 2011
@@ -53,7 +53,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Mon Jan 24 03:46:27 2011
@@ -128,7 +128,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.registries.*;
-import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
 import org.apache.directory.shared.ldap.model.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.model.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Mon Jan 24 03:46:27 2011
@@ -51,11 +51,11 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.model.schema.registries.Registries;
 import org.apache.directory.shared.ldap.model.schema.registries.Schema;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.model.schema.registries.DefaultSchema;
 import org.apache.directory.shared.util.Base64;
 import org.apache.directory.shared.util.StringConstants;

Modified: directory/shared/trunk/ldap/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/ACIItem.g?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/ACIItem.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/ACIItem.g Mon Jan 24 03:46:27 2011
@@ -50,8 +50,8 @@ import org.apache.directory.shared.util.
 import org.apache.directory.shared.util.OptionalComponentsMonitor;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.model.entry.StringValue;

Modified: directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g Mon Jan 24 03:46:27 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.FilterParser;
 import org.apache.directory.shared.util.ComponentsMonitor;
 import org.apache.directory.shared.util.OptionalComponentsMonitor;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g Mon Jan 24 03:46:27 2011
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
+import org.apache.directory.shared.ldap.model.schema.NormalizerMappingResolver;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureOption;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 import org.apache.directory.shared.ldap.trigger.TriggerSpecification.SPSpec;

Modified: directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g Mon Jan 24 03:46:27 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
 import javax.naming.NameParser;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
-import org.apache.directory.shared.ldap.schema.parsers.ParserMonitor;
+import org.apache.directory.shared.ldap.model.schema.parsers.ParserMonitor;
 import org.apache.directory.shared.util.Strings;
 
 }

Modified: directory/shared/trunk/ldap/src/main/antlr/schema-extension.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/schema-extension.g?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/schema-extension.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/schema-extension.g Mon Jan 24 03:46:27 2011
@@ -18,7 +18,7 @@ header {
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.syntax;
+package org.apache.directory.shared.ldap.model.schema.syntaxes;
 
 import java.io.StringReader;
 import java.util.List;

Modified: directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g Mon Jan 24 03:46:27 2011
@@ -18,12 +18,12 @@ header {
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.syntax;
+package org.apache.directory.shared.ldap.model.schema.syntaxes;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.schema.parsers.ParserMonitor;
+import org.apache.directory.shared.ldap.model.schema.parsers.ParserMonitor;
 
 }
 

Modified: directory/shared/trunk/ldap/src/main/antlr/schema-value.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/schema-value.g?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/schema-value.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/schema-value.g Mon Jan 24 03:46:27 2011
@@ -18,12 +18,12 @@ header {
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.syntax;
+package org.apache.directory.shared.ldap.model.schema.syntaxes;
 
 import java.util.List;
 import java.util.ArrayList;
 
-import org.apache.directory.shared.ldap.schema.parsers.ParserMonitor;
+import org.apache.directory.shared.ldap.model.schema.parsers.ParserMonitor;
 
 }
 

Modified: directory/shared/trunk/ldap/src/main/antlr/schema.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/schema.g?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/schema.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/schema.g Mon Jan 24 03:46:27 2011
@@ -18,7 +18,7 @@ header {
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.syntax;
+package org.apache.directory.shared.ldap.model.schema.syntaxes;
 
 import java.io.StringReader;
 import java.util.ArrayList;
@@ -26,21 +26,21 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
-import org.apache.directory.shared.ldap.schema.DITContentRule;
-import org.apache.directory.shared.ldap.schema.DITStructureRule;
-import org.apache.directory.shared.ldap.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.schema.MatchingRule;
-import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
-import org.apache.directory.shared.ldap.schema.NameForm;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.ParserMonitor;
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.ObjectClass;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
+import org.apache.directory.shared.ldap.model.schema.DITContentRule;
+import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
+import org.apache.directory.shared.ldap.model.schema.NameForm;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.ParserMonitor;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OpenLdapObjectIdentifierMacro;
-import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
-import org.apache.directory.shared.ldap.schema.UsageEnum;
+import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
+import org.apache.directory.shared.ldap.model.schema.UsageEnum;
 
 }
 

Modified: directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g Mon Jan 24 03:46:27 2011
@@ -38,18 +38,18 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.NotNode;
 import org.apache.directory.shared.ldap.model.filter.EqualityNode;
 import org.apache.directory.shared.ldap.model.filter.FilterParser;
-import org.apache.directory.shared.ldap.schema.ObjectClass;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationModifier;
-import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
+import org.apache.directory.shared.ldap.model.schema.NormalizerMappingResolver;
 import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
 import org.apache.directory.shared.util.ComponentsMonitor;
 import org.apache.directory.shared.util.OptionalComponentsMonitor;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java Mon Jan 24 03:46:27 2011
@@ -21,10 +21,10 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.model.schema.registries.Schema;
-import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
-import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.model.schema.registries.Registries;
 
 public interface EntityFactory
@@ -63,7 +63,7 @@ public interface EntityFactory
      * @throws Exception If the creation has failed
      */
     LdapComparator<?> getLdapComparator( SchemaManager schemaManager, 
-        LdapComparatorDescription comparatorDescription, 
+        LdapComparatorDescription comparatorDescription,
         Registries targetRegistries, String schemaName ) throws Exception;
     
     
@@ -104,7 +104,7 @@ public interface EntityFactory
      * @return A new instance of a normalizer
      * @throws Exception If the creation has failed
      */
-    Normalizer getNormalizer( SchemaManager schemaManager, NormalizerDescription normalizerDescription, 
+    Normalizer getNormalizer( SchemaManager schemaManager, NormalizerDescription normalizerDescription,
         Registries targetRegistries, String schemaName ) throws Exception;
     
     

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AbstractSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AbstractSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AbstractSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.io.StringReader;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AttributeTypeDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AttributeTypeDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/AttributeTypeDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ConsoleParserMonitor.java (from r1062631, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/ConsoleParserMonitor.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ConsoleParserMonitor.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ConsoleParserMonitor.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/ConsoleParserMonitor.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/parsers/ConsoleParserMonitor.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ConsoleParserMonitor.java Mon Jan 24 03:46:27 2011
@@ -17,9 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
-
-import org.apache.directory.shared.ldap.schema.parsers.ParserMonitor;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 /**

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITContentRuleDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITContentRuleDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITContentRuleDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITContentRuleDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITContentRuleDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITContentRuleDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITContentRuleDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITContentRuleDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITStructureRuleDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITStructureRuleDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/DITStructureRuleDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescription.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescription.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescription.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java Mon Jan 24 03:46:27 2011
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapComparatorDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapComparatorDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapSyntaxDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapSyntaxDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/LdapSyntaxDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/LdapSyntaxDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleUseDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NameFormDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NameFormDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NameFormDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NameFormDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java Mon Jan 24 03:46:27 2011
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/NormalizerDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ObjectClassDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ObjectClassDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ObjectClassDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ObjectClassDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.io.File;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserDescriptionUtils.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.util.List;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitor.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitor.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitor.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitor.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitor.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitor.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitor.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 /**

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitorAdapter.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitorAdapter.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitorAdapter.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitorAdapter.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitorAdapter.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ParserMonitorAdapter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitorAdapter.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 /**

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserMonitorAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaLexer.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaLexer.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaLexer.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaLexer.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaLexer.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaLexer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaLexer.java Mon Jan 24 03:46:27 2011
@@ -17,15 +17,17 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
+
 
 import java.io.Reader;
 
-import org.apache.directory.shared.ldap.schema.syntax.AntlrSchemaLexer;
+import org.apache.directory.shared.ldap.model.schema.syntaxes.AntlrSchemaLexer;
 
 import antlr.CharBuffer;
 import antlr.LexerSharedInputState;
 
+
 /**
  * A reusable lexer class extended from antlr generated lexer for an LDAP
  * schema as defined in RFC 4512. This class

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaLexer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/ReusableAntlrSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
-import org.apache.directory.shared.ldap.schema.syntax.AntlrSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.syntaxes.AntlrSchemaParser;
 
 import antlr.TokenStream;
 

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ReusableAntlrSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java Mon Jan 24 03:46:27 2011
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java (from r1062631, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java&r1=1062631&r2=1062635&rev=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java Mon Jan 24 03:46:27 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.schema.parsers;
+package org.apache.directory.shared.ldap.model.schema.parsers;
 
 
 import java.text.ParseException;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/SyntaxCheckerDescriptionSchemaParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java Mon Jan 24 03:46:27 2011
@@ -24,7 +24,7 @@ import java.text.ParseException;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java Mon Jan 24 03:46:27 2011
@@ -24,7 +24,7 @@ import java.text.ParseException;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.schema.parsers.DITContentRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.DITContentRuleDescriptionSchemaParser;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java?rev=1062635&r1=1062634&r2=1062635&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java Mon Jan 24 03:46:27 2011
@@ -24,7 +24,7 @@ import java.text.ParseException;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.schema.parsers.DITStructureRuleDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.DITStructureRuleDescriptionSchemaParser;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;