You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/11/07 08:57:42 UTC
svn commit: r833647 [1/17] - in /directory:
apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/
apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/par...
Author: elecharny
Date: Sat Nov 7 07:57:34 2009
New Revision: 833647
URL: http://svn.apache.org/viewvc?rev=833647&view=rev
Log:
Replacement of all the Regisries references by a reference to ShcemaManager
Added:
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultAttributeTypeRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultComparatorRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultDITContentRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultDITStructureRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultLdapSyntaxRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultMatchingRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultMatchingRuleUseRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultNameFormRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultNormalizerRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultObjectClassRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java
- copied, changed from r831344, directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSyntaxCheckerRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableAttributeTypeRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableComparatorRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITContentRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITStructureRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableLdapSyntaxRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleUseRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNameFormRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNormalizerRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableObjectClassRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableSyntaxCheckerRegistry.java
Modified:
directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java
directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java
directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java
directory/apacheds/branches/apacheds-schema/core-entry/src/test/resources/log4j.properties
directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java
directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/state/AbstractState.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesITest.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/branches/apacheds-schema/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
directory/apacheds/branches/apacheds-schema/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
directory/apacheds/branches/apacheds-schema/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java
directory/apacheds/branches/apacheds-schema/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java
directory/apacheds/branches/apacheds-schema/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java
directory/apacheds/branches/apacheds-schema/core-unit/src/main/java/org/apache/directory/server/core/unit/IntegrationUtils.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/branches/apacheds-schema/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
directory/apacheds/branches/apacheds-schema/jdbm/src/main/java/jdbm/btree/BTree.java
directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
directory/apacheds/branches/apacheds-schema/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/unit/AbstractServerTest.java
directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/apacheds/branches/apacheds-schema/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
directory/apacheds/branches/apacheds-schema/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
directory/apacheds/branches/apacheds-schema/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
directory/apacheds/branches/apacheds-schema/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
directory/apacheds/branches/apacheds-schema/protocol-shared/src/test/log4j.properties
directory/apacheds/branches/apacheds-schema/server-integ/src/main/java/org/apache/directory/server/integ/state/AbstractState.java
directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
directory/apacheds/branches/apacheds-schema/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
directory/apacheds/branches/apacheds-schema/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
directory/apacheds/branches/apacheds-schema/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
directory/apacheds/branches/apacheds-schema/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/EntityFactory.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LoadableSchemaObject.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaObject.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DnComparator.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/IntegerOrderingComparator.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/NameAndOptionalUIDComparator.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/SerializableComparator.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ConcreteNameComponentNormalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AttributeTypeRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ComparatorRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITContentRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DITStructureRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/LdapSyntaxRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/MatchingRuleUseRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NameFormRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/NormalizerRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ObjectClassRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SyntaxCheckerRegistry.java
directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/registries/AttributeTypeRegistryTest.java
Modified: directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original)
+++ directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java Sat Nov 7 07:57:34 2009
@@ -79,9 +79,9 @@
public void initialize( ) throws Exception
{
- setRegistries( registries );
+ setSchemaManager( schemaManager );
- EvaluatorBuilder evaluatorBuilder = new EvaluatorBuilder( store, registries );
+ EvaluatorBuilder evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
CursorBuilder cursorBuilder = new CursorBuilder( store, evaluatorBuilder );
// setup optimizer and registries for parent
@@ -116,9 +116,9 @@
index.setAttributeId( obj.getAttributeId() );
}
- String oid = registries.getAttributeTypeRegistry().getOidByName( index.getAttributeId() );
+ String oid = schemaManager.getAttributeTypeRegistry().getOidByName( index.getAttributeId() );
- if ( SYS_INDEX_OIDS.contains( registries.getAttributeTypeRegistry().getOidByName( index.getAttributeId() ) ) )
+ if ( SYS_INDEX_OIDS.contains( schemaManager.getAttributeTypeRegistry().getOidByName( index.getAttributeId() ) ) )
{
if ( oid.equals( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) )
{
@@ -165,7 +165,7 @@
store.setUserIndices( userIndices );
}
- store.init( registries );
+ store.init( schemaManager );
}
Modified: directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Sat Nov 7 07:57:34 2009
@@ -58,8 +58,7 @@
import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.MatchingRule;
-import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.schema.registries.Registries;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.util.NamespaceTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,8 +79,6 @@
/** static logger */
private static final Logger LOG = LoggerFactory.getLogger( AvlStore.class );
- private AttributeTypeRegistry attributeTypeRegistry;
-
/** Two static declaration to avoid lookup all over the code */
private static AttributeType OBJECT_CLASS_AT;
private static AttributeType ALIASED_OBJECT_NAME_AT;
@@ -91,18 +88,25 @@
/** the normalized distinguished name index */
private AvlIndex<String, E> ndnIdx;
+
/** the user provided distinguished name index */
private AvlIndex<String, E> updnIdx;
+
/** the attribute existence index */
private AvlIndex<String, E> existenceIdx;
+
/** a system index on aliasedObjectName attribute */
private AvlIndex<String, E> aliasIdx;
+
/** a system index on the entries of descendants of root DN*/
private AvlIndex<Long, E> subLevelIdx;
+
/** the parent child relationship index */
private AvlIndex<Long, E> oneLevelIdx;
+
/** the one level scope alias index */
private AvlIndex<Long, E> oneAliasIdx;
+
/** the subtree scope alias index */
private AvlIndex<Long, E> subAliasIdx;
@@ -123,6 +127,9 @@
/** true if initialized */
private boolean initialized;
+
+ /** A pointer on the schemaManager */
+ private SchemaManager schemaManager;
/**
* TODO we need to check out why we have so many suffix
@@ -575,7 +582,7 @@
{
try
{
- id = attributeTypeRegistry.getOidByName( id );
+ id = schemaManager.getAttributeTypeRegistry().getOidByName( id );
}
catch ( NamingException e )
{
@@ -610,7 +617,7 @@
{
try
{
- id = attributeTypeRegistry.getOidByName( id );
+ id = schemaManager.getAttributeTypeRegistry().getOidByName( id );
}
catch ( NamingException e )
{
@@ -659,17 +666,17 @@
* {@inheritDoc}
* TODO why this and initRegistries on Store interface ???
*/
- public void init( Registries registries ) throws Exception
+ public void init( SchemaManager schemaManager ) throws Exception
{
- initRegistries( registries );
+ initSchemaManager( schemaManager );
- OBJECT_CLASS_AT = attributeTypeRegistry.lookup( SchemaConstants.OBJECT_CLASS_AT );
- ALIASED_OBJECT_NAME_AT = attributeTypeRegistry.lookup( SchemaConstants.ALIASED_OBJECT_NAME_AT );
+ OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
+ ALIASED_OBJECT_NAME_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ALIASED_OBJECT_NAME_AT );
// Create the master table (the table containing all the entries)
master = new AvlMasterTable<ServerEntry>( name, new LongComparator(), null, false );
- suffixDn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
+ suffixDn.normalize( schemaManager.getNormalizerMapping() );
// -------------------------------------------------------------------
// Initializes the user and system indices
// -------------------------------------------------------------------
@@ -688,7 +695,7 @@
if ( ndnIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_N_DN_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.APACHE_N_DN_AT_OID );
ndnIdx = new AvlIndex<String, E>();
ndnIdx.setAttributeId( ApacheSchemaConstants.APACHE_N_DN_AT_OID );
ndnIdx.initialize( attributeType );
@@ -697,7 +704,7 @@
if ( updnIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_UP_DN_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.APACHE_UP_DN_AT_OID );
updnIdx = new AvlIndex<String, E>();
updnIdx.setAttributeId( ApacheSchemaConstants.APACHE_UP_DN_AT_OID );
updnIdx.initialize( attributeType );
@@ -706,7 +713,7 @@
if ( existenceIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID );
existenceIdx = new AvlIndex<String, E>();
existenceIdx.setAttributeId( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID );
existenceIdx.initialize( attributeType );
@@ -715,7 +722,7 @@
if ( oneLevelIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID );
oneLevelIdx = new AvlIndex<Long, E>();
oneLevelIdx.setAttributeId( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID );
oneLevelIdx.initialize( attributeType );
@@ -724,7 +731,7 @@
if ( oneAliasIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID );
oneAliasIdx = new AvlIndex<Long, E>();
oneAliasIdx.setAttributeId( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID );
oneAliasIdx.initialize( attributeType );
@@ -733,7 +740,7 @@
if ( subAliasIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID );
subAliasIdx = new AvlIndex<Long, E>();
subAliasIdx.setAttributeId( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID );
subAliasIdx.initialize( attributeType );
@@ -742,7 +749,7 @@
if ( aliasIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
aliasIdx = new AvlIndex<String, E>();
aliasIdx.setAttributeId( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
aliasIdx.initialize( attributeType );
@@ -751,7 +758,7 @@
if ( subLevelIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID );
subLevelIdx = new AvlIndex<Long, E>();
subLevelIdx.setAttributeId( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID );
subLevelIdx.initialize( attributeType );
@@ -760,7 +767,7 @@
if ( entryCsnIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( SchemaConstants.ENTRY_CSN_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT_OID );
entryCsnIdx = new AvlIndex<String, E>();
entryCsnIdx.setAttributeId( SchemaConstants.ENTRY_CSN_AT_OID );
entryCsnIdx.initialize( attributeType );
@@ -769,7 +776,7 @@
if ( entryUuidIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( SchemaConstants.ENTRY_UUID_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_UUID_AT_OID );
entryUuidIdx = new AvlIndex<byte[], E>();
entryUuidIdx.setAttributeId( SchemaConstants.ENTRY_UUID_AT_OID );
entryUuidIdx.initialize( attributeType );
@@ -778,7 +785,7 @@
if ( objectClassIdx == null )
{
- AttributeType attributeType = attributeTypeRegistry.lookup( SchemaConstants.OBJECT_CLASS_AT_OID );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT_OID );
objectClassIdx = new AvlIndex<String, E>();
objectClassIdx.setAttributeId( SchemaConstants.OBJECT_CLASS_AT_OID );
objectClassIdx.initialize( attributeType );
@@ -796,15 +803,15 @@
for ( AvlIndex<?, E> index : userIndices.values() )
{
- String oid = attributeTypeRegistry.getOidByName( index.getAttributeId() );
- AttributeType attributeType = attributeTypeRegistry.lookup( oid );
+ String oid = schemaManager.getAttributeTypeRegistry().getOidByName( index.getAttributeId() );
+ AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( oid );
// Check that the attributeType has an EQUALITY matchingRule
MatchingRule mr = attributeType.getEquality();
if ( mr != null )
{
- index.initialize( attributeTypeRegistry.lookup( oid ) );
+ index.initialize( schemaManager.lookupAttributeTypeRegistry( oid ) );
tmp.put( oid, index );
}
else
@@ -826,9 +833,9 @@
/**
* {@inheritDoc}
*/
- public void initRegistries( Registries registries )
+ public void initSchemaManager( SchemaManager schemaManager )
{
- this.attributeTypeRegistry = registries.getAttributeTypeRegistry();
+ this.schemaManager = schemaManager;
}
@@ -879,7 +886,7 @@
ndnIdx.drop( id );
if ( !updn.isNormalized() )
{
- updn.normalize( attributeTypeRegistry.getNormalizerMapping() );
+ updn.normalize( schemaManager.getNormalizerMapping() );
}
ndnIdx.add( updn.toNormName(), id );
@@ -923,7 +930,7 @@
String rdn = oldUpdn.get( oldUpdn.size() - 1 );
LdapDN rdnDN = new LdapDN( rdn );
- rdnDN.normalize( attributeTypeRegistry.getNormalizerMapping() );
+ rdnDN.normalize( schemaManager.getNormalizerMapping() );
childUpdn.add( rdnDN.getRdn() );
// Modify the child
@@ -957,7 +964,7 @@
throw new Exception( "Cannot store a ClonedServerEntry" );
}
- String modsOid = attributeTypeRegistry.getOidByName( mods.getId() );
+ String modsOid = schemaManager.getAttributeTypeRegistry().getOidByName( mods.getId() );
// Special case for the ObjectClass index
if ( modsOid.equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
@@ -984,7 +991,7 @@
}
// add all the values in mods to the same attribute in the entry
- AttributeType type = attributeTypeRegistry.lookup( modsOid );
+ AttributeType type = schemaManager.lookupAttributeTypeRegistry( modsOid );
for ( Value<?> value : mods )
{
@@ -1020,7 +1027,7 @@
throw new Exception( "Cannot store a ClonedServerEntry" );
}
- String modsOid = attributeTypeRegistry.getOidByName( mods.getId() );
+ String modsOid = schemaManager.getAttributeTypeRegistry().getOidByName( mods.getId() );
// Special case for the ObjectClass index
if ( modsOid.equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
@@ -1049,7 +1056,7 @@
}
}
- AttributeType attrType = attributeTypeRegistry.lookup( modsOid );
+ AttributeType attrType = schemaManager.lookupAttributeTypeRegistry( modsOid );
/*
* If there are no attribute values in the modifications then this
* implies the compelete removal of the attribute from the entry. Else
@@ -1111,7 +1118,7 @@
throw new Exception( "Cannot store a ClonedServerEntry" );
}
- String modsOid = attributeTypeRegistry.getOidByName( mods.getId() );
+ String modsOid = schemaManager.getAttributeTypeRegistry().getOidByName( mods.getId() );
// Special case for the ObjectClass index
if ( modsOid.equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
@@ -1372,7 +1379,7 @@
{
String newNormType = newAtav.getNormType();
String newNormValue = newAtav.getNormValue().getString();
- AttributeType newRdnAttrType = attributeTypeRegistry.lookup( newNormType );
+ AttributeType newRdnAttrType = schemaManager.lookupAttributeTypeRegistry( newNormType );
Object unEscapedRdn = Rdn.unescapeValue( newAtav.getUpValue().getString() );
@@ -1442,7 +1449,7 @@
{
String oldNormType = oldAtav.getNormType();
String oldNormValue = oldAtav.getNormValue().getString();
- AttributeType oldRdnAttrType = attributeTypeRegistry.lookup( oldNormType );
+ AttributeType oldRdnAttrType = schemaManager.lookupAttributeTypeRegistry( oldNormType );
entry.remove( oldRdnAttrType, oldNormValue );
if ( hasUserIndexOn( oldNormType ) )
@@ -1479,7 +1486,7 @@
newUpdn.add( newRdn.getUpName() ); // add da new upRdn
// gotta normalize cuz this thang is cloned and not normalized by default
- newUpdn.normalize( attributeTypeRegistry.getNormalizerMapping() );
+ newUpdn.normalize( schemaManager.getNormalizerMapping() );
modifyDn( id, newUpdn, false ); // propagate dn changes
@@ -1758,7 +1765,7 @@
// Access aliasedObjectName, normalize it and generate the Name
normalizedAliasTargetDn = new LdapDN( aliasTarget );
- normalizedAliasTargetDn.normalize( attributeTypeRegistry.getNormalizerMapping() );
+ normalizedAliasTargetDn.normalize( schemaManager.getNormalizerMapping() );
/*
* Check For Cycles
Modified: directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java Sat Nov 7 07:57:34 2009
@@ -62,8 +62,6 @@
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SchemaUtils;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
-import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.schema.registries.Registries;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
import org.apache.directory.shared.schema.DefaultSchemaManager;
import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
@@ -88,8 +86,7 @@
private static File wkdir;
private static AvlStore<ServerEntry> store;
- private static Registries registries = null;
- private static AttributeTypeRegistry attributeRegistry;
+ private static SchemaManager schemaManager = null;
@BeforeClass
@@ -109,18 +106,14 @@
extractor.extractOrCopy();
LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
- SchemaManager sm = new DefaultSchemaManager( loader );
+ schemaManager = new DefaultSchemaManager( loader );
- boolean loaded = sm.loadAllEnabled();
+ boolean loaded = schemaManager.loadAllEnabled();
if ( !loaded )
{
- fail( "Schema load failed : " + ExceptionUtils.printErrors( sm.getErrors() ) );
+ fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) );
}
-
- registries = sm.getRegistries();
-
- attributeRegistry = registries.getAttributeTypeRegistry();
}
@@ -142,7 +135,7 @@
store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
store.addIndex( new AvlIndex( SchemaConstants.UID_AT_OID ) );
- StoreUtils.loadExampleData( store, registries );
+ StoreUtils.loadExampleData( store, schemaManager );
LOG.debug( "Created new store" );
}
@@ -324,7 +317,7 @@
public void testFreshStore() throws Exception
{
LdapDN dn = new LdapDN( "o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
assertEquals( 1L, ( long ) store.getEntryId( dn.toNormName() ) );
assertEquals( 11, store.count() );
assertEquals( "o=Good Times Co.", store.getEntryUpdn( dn.toNormName() ) );
@@ -359,8 +352,8 @@
// add an alias and delete to test dropAliasIndices method
LdapDN dn = new LdapDN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( registries, dn );
+ dn.normalize( schemaManager.getNormalizerMapping() );
+ DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
entry.add( "objectClass", "top", "alias", "extensibleObject" );
entry.add( "ou", "Apache" );
entry.add( "commonName", "Jack Daniels");
@@ -408,8 +401,8 @@
// dn id 12
LdapDN martinDn = new LdapDN( "cn=Marting King,ou=Sales,o=Good Times Co." );
- martinDn.normalize( attributeRegistry.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( registries, martinDn );
+ martinDn.normalize( schemaManager.getNormalizerMapping() );
+ DefaultServerEntry entry = new DefaultServerEntry( schemaManager, martinDn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Sales" );
entry.add( "cn", "Martin King");
@@ -423,7 +416,7 @@
assertEquals( 12, ( long ) cursor.get().getId() );
LdapDN newParentDn = new LdapDN( "ou=Board of Directors,o=Good Times Co." );
- newParentDn.normalize( attributeRegistry.getNormalizerMapping() );
+ newParentDn.normalize( schemaManager.getNormalizerMapping() );
store.move( martinDn, newParentDn );
cursor = idx.forwardCursor( 3L);
@@ -433,8 +426,8 @@
// dn id 13
LdapDN marketingDn = new LdapDN( "ou=Marketing,ou=Sales,o=Good Times Co." );
- marketingDn.normalize( attributeRegistry.getNormalizerMapping() );
- entry = new DefaultServerEntry( registries, marketingDn );
+ marketingDn.normalize( schemaManager.getNormalizerMapping() );
+ entry = new DefaultServerEntry( schemaManager, marketingDn );
entry.add( "objectClass", "top", "organizationalUnit" );
entry.add( "ou", "Marketing" );
entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
@@ -443,8 +436,8 @@
// dn id 14
LdapDN jimmyDn = new LdapDN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
- jimmyDn.normalize( attributeRegistry.getNormalizerMapping() );
- entry = new DefaultServerEntry( registries, jimmyDn );
+ jimmyDn.normalize( schemaManager.getNormalizerMapping() );
+ entry = new DefaultServerEntry( schemaManager, jimmyDn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Marketing" );
entry.add( "cn", "Jimmy Wales");
@@ -682,8 +675,8 @@
public void testAddWithoutParentId() throws Exception
{
LdapDN dn = new LdapDN( "cn=Marting King,ou=Not Present,o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( registries, dn );
+ dn.normalize( schemaManager.getNormalizerMapping() );
+ DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Not Present" );
entry.add( "cn", "Martin King");
@@ -695,8 +688,8 @@
public void testAddWithoutObjectClass() throws Exception
{
LdapDN dn = new LdapDN( "cn=Martin King,ou=Sales,o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( registries, dn );
+ dn.normalize( schemaManager.getNormalizerMapping() );
+ DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
entry.add( "ou", "Sales" );
entry.add( "cn", "Martin King");
store.add( entry );
@@ -707,11 +700,11 @@
public void testModifyAddOUAttrib() throws Exception
{
LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
List<Modification> mods = new ArrayList<Modification>();
ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.OU_AT,
- attributeRegistry.lookup( SchemaConstants.OU_AT_OID ) );
+ schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT_OID ) );
attrib.add( "Engineering" );
Modification add = new ServerModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
@@ -726,8 +719,8 @@
public void testRename() throws Exception
{
LdapDN dn = new LdapDN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( registries, dn );
+ dn.normalize( schemaManager.getNormalizerMapping() );
+ DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Engineering" );
entry.add( "cn", "Private Ryan");
@@ -746,8 +739,8 @@
public void testMove() throws Exception
{
LdapDN childDn = new LdapDN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
- childDn.normalize( attributeRegistry.getNormalizerMapping() );
- DefaultServerEntry childEntry = new DefaultServerEntry( registries, childDn );
+ childDn.normalize( schemaManager.getNormalizerMapping() );
+ DefaultServerEntry childEntry = new DefaultServerEntry( schemaManager, childDn );
childEntry.add( "objectClass", "top", "person", "organizationalPerson" );
childEntry.add( "ou", "Engineering" );
childEntry.add( "cn", "Private Ryan");
@@ -757,7 +750,7 @@
store.add( childEntry );
LdapDN parentDn = new LdapDN( "ou=Sales,o=Good Times Co." );
- parentDn.normalize( attributeRegistry.getNormalizerMapping() );
+ parentDn.normalize( schemaManager.getNormalizerMapping() );
Rdn rdn = new Rdn("cn=Ryan");
@@ -765,10 +758,10 @@
// to drop the alias indices
childDn = new LdapDN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co." );
- childDn.normalize( attributeRegistry.getNormalizerMapping() );
+ childDn.normalize( schemaManager.getNormalizerMapping() );
parentDn = new LdapDN( "ou=Engineering,o=Good Times Co." );
- parentDn.normalize( attributeRegistry.getNormalizerMapping() );
+ parentDn.normalize( schemaManager.getNormalizerMapping() );
assertEquals( 3, store.getSubAliasIndex().count() );
@@ -782,11 +775,11 @@
public void testModifyAdd() throws Exception
{
LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
List<Modification> mods = new ArrayList<Modification>();
ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.SURNAME_AT,
- attributeRegistry.lookup( SchemaConstants.SURNAME_AT ) );
+ schemaManager.lookupAttributeTypeRegistry( SchemaConstants.SURNAME_AT ) );
String attribVal = "Walker";
attrib.add( attribVal );
@@ -800,7 +793,7 @@
assertTrue( lookedup.get( "sn" ).contains( attribVal ) );
// testing the store.modify( dn, mod, entry ) API
- ServerEntry entry = new DefaultServerEntry( registries, dn );
+ ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
attribVal = "+1974045779";
entry.add( "telephoneNumber", attribVal );
@@ -814,11 +807,11 @@
public void testModifyReplace() throws Exception
{
LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
List<Modification> mods = new ArrayList<Modification>();
ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.SN_AT,
- attributeRegistry.lookup( SchemaConstants.SN_AT_OID ) );
+ schemaManager.lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
String attribVal = "Johnny";
attrib.add( attribVal );
@@ -834,7 +827,7 @@
assertEquals( attribVal, lookedup.get( "sn" ).get().getString() );
// testing the store.modify( dn, mod, entry ) API
- ServerEntry entry = new DefaultServerEntry( registries, dn );
+ ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
attribVal = "JWalker";
entry.add( "sn", attribVal );
@@ -847,11 +840,11 @@
public void testModifyRemove() throws Exception
{
LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
List<Modification> mods = new ArrayList<Modification>();
ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.SN_AT,
- attributeRegistry.lookup( SchemaConstants.SN_AT_OID ) );
+ schemaManager.lookupAttributeTypeRegistry( SchemaConstants.SN_AT_OID ) );
Modification add = new ServerModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
mods.add( add );
@@ -864,7 +857,7 @@
assertNull( lookedup.get( "sn" ) );
// testing the store.modify( dn, mod, entry ) API
- ServerEntry entry = new DefaultServerEntry( registries, dn );
+ ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
// add an entry for the sake of testing the remove operation
entry.add( "sn", "JWalker" );
@@ -880,8 +873,8 @@
public void testModifyReplaceNonExistingIndexAttribute() throws Exception
{
LdapDN dn = new LdapDN( "cn=Tim B,ou=Sales,o=Good Times Co." );
- dn.normalize( attributeRegistry.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( registries, dn );
+ dn.normalize( schemaManager.getNormalizerMapping() );
+ DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "cn", "Tim B");
entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
@@ -891,7 +884,7 @@
List<Modification> mods = new ArrayList<Modification>();
ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.OU_AT,
- attributeRegistry.lookup( SchemaConstants.OU_AT_OID ) );
+ schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OU_AT_OID ) );
String attribVal = "Marketing";
attrib.add( attribVal );
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Sat Nov 7 07:57:34 2009
@@ -38,7 +38,7 @@
import org.apache.directory.shared.ldap.csn.Csn;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.schema.registries.Registries;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
/**
@@ -98,9 +98,9 @@
void removePartition( Partition partition ) throws Exception;
/**
- * @return The Directory Service registries
+ * @return The Directory Service SchemaManager
*/
- Registries getRegistries();
+ SchemaManager getSchemaManager();
/**
@@ -486,4 +486,12 @@
* @return the replication configuration for this DirectoryService
*/
ReplicationConfiguration getReplicationConfiguration();
+
+
+ /**
+ * Associates a SchemaManager to the service
+ *
+ * @param schemaManager The SchemaManager to associate
+ */
+ void setSchemaManager( SchemaManager schemaManager );
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Sat Nov 7 07:57:34 2009
@@ -93,7 +93,7 @@
{
super( session );
entry = new ClonedServerEntry(
- new DefaultServerEntry( session.getDirectoryService().getRegistries(), addRequest.getEntry() ) );
+ new DefaultServerEntry( session.getDirectoryService().getSchemaManager(), addRequest.getEntry() ) );
dn = addRequest.getEntry().getDn();
requestControls = addRequest.getControls();
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Sat Nov 7 07:57:34 2009
@@ -85,8 +85,8 @@
super( session, modifyRequest.getName() );
modItems = ServerEntryUtils.toServerModification(
- modifyRequest.getModificationItems().toArray( new ClientModification[0]),
- session.getDirectoryService().getRegistries().getAttributeTypeRegistry() );
+ modifyRequest.getModificationItems().toArray( new ClientModification[0] ),
+ session.getDirectoryService().getSchemaManager() );
requestControls = modifyRequest.getControls();
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Sat Nov 7 07:57:34 2009
@@ -121,7 +121,7 @@
newDn = new LdapDN( getParent().getUpName() );
newDn.add( getNewRdn().getUpName() );
newDn.normalize( session.getDirectoryService()
- .getRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
+ .getSchemaManager().getNormalizerMapping() );
}
return newDn;
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java Sat Nov 7 07:57:34 2009
@@ -20,6 +20,8 @@
package org.apache.directory.server.core.interceptor.context;
+import static org.apache.directory.shared.ldap.filter.SearchScope.ONELEVEL;
+
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -40,8 +42,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.directory.shared.ldap.filter.SearchScope.ONELEVEL;
-
/**
* A context used for search related operations and used by all
@@ -157,7 +157,7 @@
Set<String> options = SchemaUtils.getOptions( returnAttribute );
AttributeType attributeType = session.getDirectoryService()
- .getRegistries().getAttributeTypeRegistry().lookup( id );
+ .getSchemaManager().lookupAttributeTypeRegistry( id );
AttributeTypeOptions attrOptions = new AttributeTypeOptions( attributeType, options );
returningAttributes.add( attrOptions );
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java Sat Nov 7 07:57:34 2009
@@ -43,7 +43,7 @@
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.schema.registries.Registries;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
/**
@@ -325,14 +325,14 @@
}
- public Registries getRegistries()
+ public SchemaManager getSchemaManager()
{
// TODO Auto-generated method stub
return null;
}
- public void setRegistries( Registries registries )
+ public void setSchemaManager( SchemaManager schemaManager )
{
// TODO Auto-generated method stub
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java Sat Nov 7 07:57:34 2009
@@ -20,6 +20,8 @@
package org.apache.directory.server.core.partition;
+import javax.naming.InvalidNameException;
+
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerSearchResult;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
@@ -36,9 +38,7 @@
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.schema.registries.Registries;
-
-import javax.naming.InvalidNameException;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
/**
@@ -88,19 +88,19 @@
/**
- * Gets the schema registries assigned to this Partition.
+ * Gets the schema manager assigned to this Partition.
*
- * @return the schema Registries
+ * @return the schema manager
*/
- Registries getRegistries();
+ SchemaManager getSchemaManager();
/**
- * Sets the schema registries assigned to this Partition.
+ * Sets the schema manager assigned to this Partition.
*
- * @param registries the registries to assign to this Partition.
+ * @param registries the manager to assign to this Partition.
*/
- void setRegistries( Registries registries );
+ void setSchemaManager( SchemaManager schemaManager );
// -----------------------------------------------------------------------
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java Sat Nov 7 07:57:34 2009
@@ -40,6 +40,7 @@
import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
import org.apache.directory.shared.ldap.schema.NameForm;
import org.apache.directory.shared.ldap.schema.ObjectClass;
+import org.apache.directory.shared.ldap.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;
@@ -54,7 +55,6 @@
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.schema.registries.Registries;
/**
@@ -79,7 +79,7 @@
private static final DITContentRule[] EMPTY_DIT_CONTENT_RULES = new DITContentRule[0];
private static final NameForm[] EMPTY_NAME_FORMS = new NameForm[0];
- private final Registries globalRegistries;
+ private final SchemaManager schemaManager;
private final LdapComparatorDescriptionSchemaParser comparatorParser =
new LdapComparatorDescriptionSchemaParser();
@@ -112,9 +112,9 @@
*
* @param globalRegistries the registries to use while creating new schema entities
*/
- public DescriptionParsers( Registries globalRegistries, SchemaPartitionDao dao )
+ public DescriptionParsers( SchemaManager schemaManager, SchemaPartitionDao dao )
{
- this.globalRegistries = globalRegistries;
+ this.schemaManager = schemaManager;
this.dao = dao;
}
@@ -308,7 +308,7 @@
}
else
{
- AttributeType superType = globalRegistries.getAttributeTypeRegistry().lookup( attributeType.getSuperiorOid() );
+ AttributeType superType = schemaManager.lookupAttributeTypeRegistry( attributeType.getSuperiorOid() );
if ( superType == null )
{
@@ -333,7 +333,7 @@
}
- attributeType.applyRegistries( globalRegistries );
+ attributeType.applyRegistries( schemaManager.getRegistries() );
// Inject the schema
if ( ( attributeType.getExtensions() == null ) ||
@@ -442,7 +442,7 @@
}
ObjectClass oc = new ObjectClass( objectClass.getOid() );
- oc.applyRegistries( globalRegistries );
+ oc.applyRegistries( schemaManager.getRegistries() );
objectClasses[pos++] = oc;
}
Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=833647&r1=833646&r2=833647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Sat Nov 7 07:57:34 2009
@@ -43,11 +43,11 @@
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.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.schema.registries.AbstractSchemaLoader;
-import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.schema.registries.Registries;
import org.apache.directory.shared.ldap.schema.registries.Schema;
import org.apache.directory.shared.ldap.util.Base64;
@@ -70,7 +70,7 @@
private Partition partition;
/** The attributeType registry */
- private AttributeTypeRegistry atRegistry;
+ private SchemaManager schemaManager;
private final AttributeType mOidAT;
private final AttributeType mNameAT;
@@ -88,18 +88,18 @@
private static Map<String, LdapDN> staticSyntaxesDNs = new HashMap<String, LdapDN>();
- public PartitionSchemaLoader( Partition partition, Registries registries ) throws Exception
+ public PartitionSchemaLoader( Partition partition, SchemaManager schemaManager ) throws Exception
{
this.partition = partition;
- atRegistry = registries.getAttributeTypeRegistry();
+ this.schemaManager = schemaManager;
- dao = new SchemaPartitionDaoImpl( this.partition, registries );
- mOidAT = atRegistry.lookup( MetaSchemaConstants.M_OID_AT );
- mNameAT = atRegistry.lookup( MetaSchemaConstants.M_NAME_AT );
- cnAT = atRegistry.lookup( SchemaConstants.CN_AT );
- byteCodeAT = atRegistry.lookup( MetaSchemaConstants.M_BYTECODE_AT );
- descAT = atRegistry.lookup( MetaSchemaConstants.M_DESCRIPTION_AT );
- fqcnAT = atRegistry.lookup( MetaSchemaConstants.M_FQCN_AT );
+ dao = new SchemaPartitionDaoImpl( this.partition, schemaManager );
+ mOidAT = schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_OID_AT );
+ mNameAT = schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_NAME_AT );
+ cnAT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.CN_AT );
+ byteCodeAT = schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_BYTECODE_AT );
+ descAT = schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_DESCRIPTION_AT );
+ fqcnAT = schemaManager.lookupAttributeTypeRegistry( MetaSchemaConstants.M_FQCN_AT );
initStaticDNs( "system" );
initStaticDNs( "core" );
@@ -122,7 +122,7 @@
"cn=" + schemaName,
SchemaConstants.OU_SCHEMA );
- dn.normalize( atRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
staticAttributeTypeDNs.put( schemaName, dn );
// Initialize ObjectClasses Dns
@@ -131,7 +131,7 @@
"cn=" + schemaName,
SchemaConstants.OU_SCHEMA );
- dn.normalize( atRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
staticObjectClassesDNs.put( schemaName, dn );
// Initialize MatchingRules Dns
@@ -140,7 +140,7 @@
"cn=" + schemaName,
SchemaConstants.OU_SCHEMA );
- dn.normalize( atRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
staticMatchingRulesDNs.put( schemaName, dn );
// Initialize Comparators Dns
@@ -149,7 +149,7 @@
"cn=" + schemaName,
SchemaConstants.OU_SCHEMA );
- dn.normalize( atRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
staticComparatorsDNs.put( schemaName, dn );
// Initialize Normalizers Dns
@@ -158,7 +158,7 @@
"cn=" + schemaName,
SchemaConstants.OU_SCHEMA );
- dn.normalize( atRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
staticNormalizersDNs.put( schemaName, dn );
// Initialize SyntaxCheckers Dns
@@ -167,7 +167,7 @@
"cn=" + schemaName,
SchemaConstants.OU_SCHEMA );
- dn.normalize( atRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
staticSyntaxCheckersDNs.put( schemaName, dn );
// Initialize Syntaxes Dns
@@ -176,7 +176,7 @@
"cn=" + schemaName,
SchemaConstants.OU_SCHEMA );
- dn.normalize( atRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
staticSyntaxesDNs.put( schemaName, dn );
}
@@ -196,7 +196,7 @@
"cn=" + schema.getSchemaName(),
SchemaConstants.OU_SCHEMA );
- dn.normalize( atRegistry.getNormalizerMapping() );
+ dn.normalize( schemaManager.getNormalizerMapping() );
staticDNs.put( schema.getSchemaName(), dn );
}