svn commit: r487553 [1/3] - in /directory/branches/trunks/schema/apacheds: bootstrap-partition/ bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ btree-base/src/main/java/org/apache/directory/server/core/partition/impl/b...

[ak...@apache.org]

Author: akarasulu
Date: Fri Dec 15 05:59:08 2006
New Revision: 487553

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

 o package renames across projects
 o using org.apache.directory.server.schema base pkg
 o fixed issues with code generation plugin
 o fixed poms that used old package names
 o moved default registries into registries module


Added:
    directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/
    directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/
      - copied from r487357, directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/
    directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java
    directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchema.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchema.java
    directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/ProducerTypeEnum.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java
    directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/Schema.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/Schema.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheComparatorProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheMatchingRuleProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheNormalizerProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaComparatorProducer.java
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaNormalizerProducer.java
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdComparator.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdComparator.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdMatch.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdMatch.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdNormalizer.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdNormalizer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ProducerCallback.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemMatchingRuleProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemNormalizerProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java   (contents, props changed)
      - copied, changed from r487541, directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/schema/
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/
      - copied from r487357, directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisComparatorProducer.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisMatchingRuleProducer.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisNormalizerProducer.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxCheckerProducer.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxProducer.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/package.html
      - copied unchanged from r487552, directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/package.html
    directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/schema/
    directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/schema/bootstrap/
      - copied from r487357, directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/bootstrap/
    directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/schema/bootstrap/ExtraSchemaLoadTest.java
      - copied, changed from r487552, directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/bootstrap/ExtraSchemaLoadTest.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ConcreteNameComponentNormalizer.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/DnComparator.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DnComparator.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/DnNormalizer.java
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DnNormalizer.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/SerializableComparator.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/SerializableComparator.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/AttributeTypeRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/AttributeTypeRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ComparatorRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITContentRuleRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DITContentRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DITStructureRuleRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/DITStructureRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/MatchingRuleUseRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NameFormRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/NameFormRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ObjectClassRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/ObjectClassRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/OidRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/OidRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/Registries.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/Registries.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java   (contents, props changed)
      - copied, changed from r487357, directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistry.java
Removed:
    directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdComparator.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdMatch.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdNormalizer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/schema-extras/src/main/java/org/apache/directory/server/core/schema/bootstrap/
    directory/branches/trunks/schema/apacheds/schema-extras/src/test/java/org/apache/directory/server/core/schema/bootstrap/
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/core/
Modified:
    directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml
    directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
    directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java
    directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
    directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java
    directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java
    directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template
    directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template
    directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/Schema.template
    directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/typeless.template
    directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoaderTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
    directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
    directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
    directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreConfiguration.java
    directory/branches/trunks/schema/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
    directory/branches/trunks/schema/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java
    directory/branches/trunks/schema/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/AttributeOperation.java
    directory/branches/trunks/schema/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/CompositeOperation.java
    directory/branches/trunks/schema/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/operation/Operation.java
    directory/branches/trunks/schema/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationService.java
    directory/branches/trunks/schema/apacheds/mitosis/src/test/java/org/apache/directory/mitosis/store/derby/DerbyReplicationStoreTest.java
    directory/branches/trunks/schema/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitContentRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultDitStructureRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleUseRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNameFormRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultOidRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java
    directory/branches/trunks/schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/dumpcmd/DumpCommandExecutor.java

Modified: directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml (original)
+++ directory/branches/trunks/schema/apacheds/bootstrap-partition/pom.xml Fri Dec 15 05:59:08 2006
@@ -71,18 +71,18 @@
                 <indexedAttribute>m-oid</indexedAttribute>
               </indexedAttributes>
               <bootstrapSchemaClasses>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.ApachednsSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.AutofsSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.CollectiveSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.CorbaSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.CosineSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.DhcpSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.InetorgpersonSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.JavaSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.Krb5kdcSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.MozillaSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.NisSchema</bootstrapSchemaClass>
-          	<bootstrapSchemaClass>org.apache.directory.server.core.schema.bootstrap.SambaSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.ApachednsSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.AutofsSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.CollectiveSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.CorbaSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.CosineSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.DhcpSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.InetorgpersonSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.JavaSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.Krb5kdcSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.MozillaSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.NisSchema</bootstrapSchemaClass>
+          	<bootstrapSchemaClass>org.apache.directory.server.schema.bootstrap.SambaSchema</bootstrapSchemaClass>
           </bootstrapSchemaClasses>
         </configuration>
         <executions>

Modified: directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Fri Dec 15 05:59:08 2006
@@ -34,21 +34,21 @@
 
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStoreConfiguration;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.ComparatorRegistry;
-import org.apache.directory.server.core.schema.MatchingRuleRegistry;
-import org.apache.directory.server.core.schema.NormalizerRegistry;
-import org.apache.directory.server.core.schema.ObjectClassRegistry;
-import org.apache.directory.server.core.schema.Registries;
-import org.apache.directory.server.core.schema.SyntaxCheckerRegistry;
-import org.apache.directory.server.core.schema.SyntaxRegistry;
-import org.apache.directory.server.core.schema.bootstrap.ApacheSchema;
-import org.apache.directory.server.core.schema.bootstrap.ApachemetaSchema;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapSchema;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.directory.server.core.schema.bootstrap.CoreSchema;
-import org.apache.directory.server.core.schema.bootstrap.SystemSchema;
+import org.apache.directory.server.schema.bootstrap.ApacheSchema;
+import org.apache.directory.server.schema.bootstrap.ApachemetaSchema;
+import org.apache.directory.server.schema.bootstrap.BootstrapSchema;
+import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader;
+import org.apache.directory.server.schema.bootstrap.CoreSchema;
+import org.apache.directory.server.schema.bootstrap.SystemSchema;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.ComparatorRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
+import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
+import org.apache.directory.server.schema.registries.NormalizerRegistry;
+import org.apache.directory.server.schema.registries.ObjectClassRegistry;
+import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
+import org.apache.directory.server.schema.registries.SyntaxRegistry;
 import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;

Modified: directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java (original)
+++ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java Fri Dec 15 05:59:08 2006
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
-import org.apache.directory.server.core.schema.SerializableComparator;
+import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.shared.ldap.util.BigIntegerComparator;
 
 

Modified: directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java (original)
+++ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java Fri Dec 15 05:59:08 2006
@@ -22,7 +22,7 @@
 
 import java.io.Serializable;
 
-import org.apache.directory.server.core.schema.SerializableComparator;
+import org.apache.directory.server.schema.SerializableComparator;
 
 
 /**

Modified: directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java (original)
+++ directory/branches/trunks/schema/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java Fri Dec 15 05:59:08 2006
@@ -22,7 +22,7 @@
 
 import java.io.Serializable;
 
-import org.apache.directory.server.core.schema.SerializableComparator;
+import org.apache.directory.server.schema.SerializableComparator;
 
 
 /**

Modified: directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java (original)
+++ directory/branches/trunks/schema/apacheds/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java Fri Dec 15 05:59:08 2006
@@ -31,9 +31,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.server.core.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapSchema;
-import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.server.schema.bootstrap.AbstractBootstrapSchema;
+import org.apache.directory.server.schema.bootstrap.BootstrapSchema;
+import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
@@ -66,7 +66,7 @@
 
     /**
      * The default package to use for generated schema classes.
-     * @parameter expression="org.apache.directory.server.core.schema.bootstrap"
+     * @parameter expression="org.apache.directory.server.schema.bootstrap"
      */
     private String defaultPackage;
 

Modified: directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template (original)
+++ directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template Fri Dec 15 05:59:08 2006
@@ -24,9 +24,11 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.shared.ldap.schema.*;
+import org.apache.directory.server.schema.*;
+import org.apache.directory.server.schema.registries.*;
 
-#if ( $package != "org.apache.directory.server.core.schema.bootstrap" )
-import org.apache.directory.server.core.schema.bootstrap.*;
+#if ( $package != "org.apache.directory.server.schema.bootstrap" )
+import org.apache.directory.server.schema.bootstrap.*;
 #end
 
 /**
@@ -53,9 +55,9 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see BootstrapProducer#produce( Registries, ProducerCallback )
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
+    public void produce( Registries registries, ProducerCallback cb )
         throws NamingException
     {
         ArrayList<String> names = new ArrayList<String>();

Modified: directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template (original)
+++ directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template Fri Dec 15 05:59:08 2006
@@ -23,9 +23,11 @@
 import java.util.ArrayList;
 import javax.naming.NamingException;
 import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
+import org.apache.directory.server.schema.*;
+import org.apache.directory.server.schema.registries.*;
 
-#if ( $package != "org.apache.directory.server.core.schema.bootstrap" )
-import org.apache.directory.server.core.schema.bootstrap.*;
+#if ( $package != "org.apache.directory.server.schema.bootstrap" )
+import org.apache.directory.server.schema.bootstrap.*;
 #end
 
 /**
@@ -52,9 +54,9 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see BootstrapProducer#produce(Registries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
+    public void produce( Registries registries, ProducerCallback cb )
         throws NamingException
     {
         ArrayList<String> array = new ArrayList<String>();

Modified: directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/Schema.template
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/Schema.template?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/Schema.template (original)
+++ directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/Schema.template Fri Dec 15 05:59:08 2006
@@ -22,9 +22,11 @@
 
 import java.util.ArrayList;
 
+import org.apache.directory.server.schema.*;
+import org.apache.directory.server.schema.registries.*;
 
-#if ( $package != "org.apache.directory.server.core.schema.bootstrap" )
-import org.apache.directory.server.core.schema.bootstrap.*;
+#if ( $package != "org.apache.directory.server.schema.bootstrap" )
+import org.apache.directory.server.schema.bootstrap.*;
 #end
 
 

Modified: directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/typeless.template
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/typeless.template?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/typeless.template (original)
+++ directory/branches/trunks/schema/apacheds/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/typeless.template Fri Dec 15 05:59:08 2006
@@ -21,9 +21,11 @@
 
 
 import javax.naming.NamingException;
+import org.apache.directory.server.schema.*;
+import org.apache.directory.server.schema.registries.*;
 
-#if ( $package != "org.apache.directory.server.core.schema.bootstrap" )
-import org.apache.directory.server.core.schema.bootstrap.*;
+#if ( $package != "org.apache.directory.server.schema.bootstrap" )
+import org.apache.directory.server.schema.bootstrap.*;
 #end
 
 
@@ -50,9 +52,9 @@
 
 
     /**
-     * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
+     * @see BootstrapProducer#produce(Registries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
+    public void produce( Registries registries, ProducerCallback cb )
         throws NamingException
     {
     }

Copied: directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java (from r487552, directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java?view=diff&rev=487553&p1=directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java&r1=487552&p2=directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapSchema.java (original)
+++ directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapSchema.java Fri Dec 15 05:59:08 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.schema.bootstrap;
+package org.apache.directory.server.schema.bootstrap;
 
 
 import org.apache.directory.shared.ldap.util.ArrayUtils;

Copied: directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchema.java (from r487552, directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchema.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchema.java?view=diff&rev=487553&p1=directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchema.java&r1=487552&p2=directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchema.java&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchema.java (original)
+++ directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchema.java Fri Dec 15 05:59:08 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.schema.bootstrap;
+package org.apache.directory.server.schema.bootstrap;
 
 
 /**

Copied: directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/ProducerTypeEnum.java (from r487552, directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/ProducerTypeEnum.java?view=diff&rev=487553&p1=directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java&r1=487552&p2=directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/ProducerTypeEnum.java&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerTypeEnum.java (original)
+++ directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/ProducerTypeEnum.java Fri Dec 15 05:59:08 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.schema.bootstrap;
+package org.apache.directory.server.schema.bootstrap;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/Schema.java (from r487552, directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/Schema.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/Schema.java?view=diff&rev=487553&p1=directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/Schema.java&r1=487552&p2=directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/Schema.java&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/core/schema/bootstrap/Schema.java (original)
+++ directory/branches/trunks/schema/apacheds/core-shared/src/main/java/org/apache/directory/server/schema/bootstrap/Schema.java Fri Dec 15 05:59:08 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.schema.bootstrap;
+package org.apache.directory.server.schema.bootstrap;
 
 
 /**

Modified: directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java (original)
+++ directory/branches/trunks/schema/apacheds/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java Fri Dec 15 05:59:08 2006
@@ -33,9 +33,9 @@
 
 import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
 import org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapSchema;
-import org.apache.directory.server.core.schema.bootstrap.NisSchema;
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.server.schema.bootstrap.BootstrapSchema;
+import org.apache.directory.server.schema.bootstrap.NisSchema;
 
 
 /**

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Fri Dec 15 05:59:08 2006
@@ -42,8 +42,8 @@
 import org.apache.directory.server.core.jndi.ServerLdapContext;
 import org.apache.directory.server.core.partition.DefaultPartitionNexus;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.Registries;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java Fri Dec 15 05:59:08 2006
@@ -28,7 +28,7 @@
 import org.apache.directory.server.core.configuration.StartupConfiguration;
 import org.apache.directory.server.core.interceptor.InterceptorChain;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.Registries;
+import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java Fri Dec 15 05:59:08 2006
@@ -27,7 +27,7 @@
 import org.apache.directory.server.core.configuration.StartupConfiguration;
 import org.apache.directory.server.core.interceptor.InterceptorChain;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.Registries;
+import org.apache.directory.server.schema.registries.Registries;
 
 
 /**

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java Fri Dec 15 05:59:08 2006
@@ -35,10 +35,10 @@
 import org.apache.directory.server.core.jndi.ServerContext;
 import org.apache.directory.server.core.jndi.ServerLdapContext;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
-import org.apache.directory.server.core.schema.OidRegistry;
 import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.aci.ACIItem;
 import org.apache.directory.shared.ldap.aci.ACIItemParser;
 import org.apache.directory.shared.ldap.aci.MicroOperation;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Fri Dec 15 05:59:08 2006
@@ -34,9 +34,9 @@
 
 import org.apache.directory.server.core.DirectoryServiceConfiguration;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
-import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.aci.ACIItem;
 import org.apache.directory.shared.ldap.aci.ACIItemParser;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Fri Dec 15 05:59:08 2006
@@ -28,11 +28,11 @@
 import org.apache.directory.server.core.event.Evaluator;
 import org.apache.directory.server.core.event.ExpressionEvaluator;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.OidRegistry;
 import org.apache.directory.server.core.subtree.RefinementEvaluator;
 import org.apache.directory.server.core.subtree.RefinementLeafEvaluator;
 import org.apache.directory.server.core.subtree.SubtreeEvaluator;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Fri Dec 15 05:59:08 2006
@@ -30,9 +30,9 @@
 import org.apache.directory.server.core.ServerUtils;
 import org.apache.directory.server.core.event.Evaluator;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.OidRegistry;
 import org.apache.directory.server.core.subtree.RefinementEvaluator;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Fri Dec 15 05:59:08 2006
@@ -29,8 +29,8 @@
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
 import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java Fri Dec 15 05:59:08 2006
@@ -30,7 +30,7 @@
 
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.apache.directory.server.core.schema.MatchingRuleRegistry;
+import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.Normalizer;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java Fri Dec 15 05:59:08 2006
@@ -33,7 +33,7 @@
 
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.referral.ReferralLut;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.codec.util.LdapURL;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java Fri Dec 15 05:59:08 2006
@@ -29,9 +29,9 @@
 import org.apache.directory.server.core.normalization.NormalizingVisitor;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
-import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.LeafNode;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java Fri Dec 15 05:59:08 2006
@@ -25,8 +25,8 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Fri Dec 15 05:59:08 2006
@@ -28,8 +28,8 @@
 import javax.naming.directory.Attributes;
 
 import org.apache.directory.server.core.ServerUtils;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.LeafNode;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Fri Dec 15 05:59:08 2006
@@ -28,8 +28,8 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
 import org.apache.directory.shared.ldap.schema.AttributeType;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java Fri Dec 15 05:59:08 2006
@@ -26,7 +26,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.ExtensibleNode;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java Fri Dec 15 05:59:08 2006
@@ -36,9 +36,9 @@
 import org.apache.directory.server.core.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.interceptor.NextInterceptor;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.ConcreteNameComponentNormalizer;
-import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.schema.ConcreteNameComponentNormalizer;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java Fri Dec 15 05:59:08 2006
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.normalization;
 
 
-import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterVisitor;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Fri Dec 15 05:59:08 2006
@@ -46,7 +46,7 @@
 import org.apache.directory.server.core.invocation.Invocation;
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.UsageEnum;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Fri Dec 15 05:59:08 2006
@@ -47,8 +47,8 @@
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
 import org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.MultiException;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Fri Dec 15 05:59:08 2006
@@ -39,9 +39,9 @@
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.Oid;
 import org.apache.directory.server.core.partition.impl.btree.gui.PartitionViewer;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.OidRegistry;
-import org.apache.directory.server.core.schema.Registries;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
+import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
 import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 import org.apache.directory.shared.ldap.filter.ExprNode;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Fri Dec 15 05:59:08 2006
@@ -26,7 +26,7 @@
 import javax.naming.directory.Attributes;
 
 import org.apache.directory.server.core.enumeration.SearchResultEnumeration;
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.UsageEnum;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java Fri Dec 15 05:59:08 2006
@@ -26,7 +26,7 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.filter.AssertionNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java?view=diff&rev=487553&r1=487552&r2=487553
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java Fri Dec 15 05:59:08 2006
@@ -24,8 +24,8 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;