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 2010/04/28 10:44:47 UTC
svn commit: r938820 [1/10] - in /directory:
apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/
apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/
apacheds/trunk/core-annota...
Author: elecharny
Date: Wed Apr 28 08:44:42 2010
New Revision: 938820
URL: http://svn.apache.org/viewvc?rev=938820&view=rev
Log:
Finished the Client/ServerEntry merge :
o Removed the DefaultServerEntry class
o Removed the ServerEntry interface
o Fixed the code accordingly
Added:
directory/apacheds/trunk/jdbm-store/ou.db
directory/apacheds/trunk/jdbm-store/ou.lg (with props)
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ServerEntry.java
Modified:
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/Evaluator.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ClonedServerEntry.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryFactory.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java
directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCursor.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcEngine.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexUtils.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.search.impl.EvaluatorBuilder;
import org.apache.directory.server.xdbm.search.impl.NoOpOptimizer;
import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
/**
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
*/
public class AvlPartition extends AbstractXdbmPartition<Long>
{
- private Set<AvlIndex<?, ServerEntry>> indexedAttributes;
+ private Set<AvlIndex<?, Entry>> indexedAttributes;
/**
@@ -51,8 +51,8 @@ public class AvlPartition extends Abstra
*/
public AvlPartition()
{
- super( new AvlStore<ServerEntry>() );
- indexedAttributes = new HashSet<AvlIndex<?, ServerEntry>>();
+ super( new AvlStore<Entry>() );
+ indexedAttributes = new HashSet<AvlIndex<?, Entry>>();
}
@@ -73,7 +73,7 @@ public class AvlPartition extends Abstra
}
else
{
- optimizer = new DefaultOptimizer<ServerEntry, Long>( store );
+ optimizer = new DefaultOptimizer<Entry, Long>( store );
}
searchEngine = new DefaultSearchEngine<Long>( store, cursorBuilder, evaluatorBuilder, optimizer );
@@ -88,9 +88,9 @@ public class AvlPartition extends Abstra
suffixDn.normalize( schemaManager.getNormalizerMapping() );
store.setSuffixDn( suffixDn );
- Set<Index<?, ServerEntry, Long>> userIndices = new HashSet<Index<?, ServerEntry, Long>>();
+ Set<Index<?, Entry, Long>> userIndices = new HashSet<Index<?, Entry, Long>>();
- for ( AvlIndex<?, ServerEntry> index : indexedAttributes )
+ for ( AvlIndex<?, Entry> index : indexedAttributes )
{
String oid = schemaManager.getAttributeTypeRegistry().getOidByName( index.getAttributeId() );
if(!index.getAttributeId().equals( oid ))
@@ -109,7 +109,7 @@ public class AvlPartition extends Abstra
*/
public final void modify( long entryId, List<Modification> modifications ) throws Exception
{
- ( ( AvlStore<ServerEntry> ) store ).modify( entryId, modifications );
+ ( ( AvlStore<Entry> ) store ).modify( entryId, modifications );
}
@@ -121,9 +121,9 @@ public class AvlPartition extends Abstra
* case the presence of this method gives significant ease and advantage to perform
* add/delete etc. operations without creating a operation context.
*/
- public AvlStore<ServerEntry> getStore()
+ public AvlStore<Entry> getStore()
{
- return ( AvlStore<ServerEntry> ) store;
+ return ( AvlStore<Entry> ) store;
}
}
Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Wed Apr 28 08:44:42 2010
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
@@ -72,13 +72,13 @@ public class AvlStore<E> extends Abstrac
private static AttributeType ALIASED_OBJECT_NAME_AT;
/** the master table storing entries by primary key */
- private AvlMasterTable<ServerEntry> master;
+ private AvlMasterTable<Entry> master;
/**
* {@inheritDoc}
*/
- public void add( ServerEntry entry ) throws Exception
+ public void add( Entry entry ) throws Exception
{
if ( entry instanceof ClonedServerEntry )
{
@@ -220,7 +220,7 @@ public class AvlStore<E> extends Abstrac
@SuppressWarnings("unchecked")
public void delete( Long id ) throws Exception
{
- ServerEntry entry = lookup( id );
+ Entry entry = lookup( id );
Long parentId = getParentId( id );
EntryAttribute objectClass = entry.get( OBJECT_CLASS_AT );
@@ -370,7 +370,7 @@ public class AvlStore<E> extends Abstrac
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>( id, new LongComparator(), null, false );
+ master = new AvlMasterTable<Entry>( id, new LongComparator(), null, false );
// -------------------------------------------------------------------
// Initializes the user and system indices
@@ -397,7 +397,7 @@ public class AvlStore<E> extends Abstrac
/**
* {@inheritDoc}
*/
- public ServerEntry lookup( Long id ) throws Exception
+ public Entry lookup( Long id ) throws Exception
{
return master.get( id );
}
@@ -468,7 +468,7 @@ public class AvlStore<E> extends Abstrac
childUpdn.add( rdnDN.getRdn() );
// Modify the child
- ServerEntry entry = lookup( childId );
+ Entry entry = lookup( childId );
entry.setDn( childUpdn );
master.put( childId, entry );
@@ -491,7 +491,7 @@ public class AvlStore<E> extends Abstrac
* @throws Exception if index alteration or attribute addition fails
*/
@SuppressWarnings("unchecked")
- private void add( Long id, ServerEntry entry, EntryAttribute mods ) throws Exception
+ private void add( Long id, Entry entry, EntryAttribute mods ) throws Exception
{
if ( entry instanceof ClonedServerEntry )
{
@@ -554,7 +554,7 @@ public class AvlStore<E> extends Abstrac
* @throws Exception if index alteration or attribute modification fails.
*/
@SuppressWarnings("unchecked")
- private void remove( Long id, ServerEntry entry, EntryAttribute mods ) throws Exception
+ private void remove( Long id, Entry entry, EntryAttribute mods ) throws Exception
{
if ( entry instanceof ClonedServerEntry )
{
@@ -645,7 +645,7 @@ public class AvlStore<E> extends Abstrac
* fails.
*/
@SuppressWarnings("unchecked")
- private void replace( Long id, ServerEntry entry, EntryAttribute mods ) throws Exception
+ private void replace( Long id, Entry entry, EntryAttribute mods ) throws Exception
{
if ( entry instanceof ClonedServerEntry )
{
@@ -720,7 +720,7 @@ public class AvlStore<E> extends Abstrac
}
- public void modify( DN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception
+ public void modify( DN dn, ModificationOperation modOp, Entry mods ) throws Exception
{
if ( mods instanceof ClonedServerEntry )
{
@@ -728,7 +728,7 @@ public class AvlStore<E> extends Abstrac
}
Long id = getEntryId( dn );
- ServerEntry entry = ( ServerEntry ) master.get( id );
+ Entry entry = ( Entry ) master.get( id );
for ( AttributeType attributeType : mods.getAttributeTypes() )
{
@@ -767,7 +767,7 @@ public class AvlStore<E> extends Abstrac
public void modify( long entryId, List<Modification> mods ) throws Exception
{
- ServerEntry entry = ( ServerEntry ) master.get( entryId );
+ Entry entry = ( Entry ) master.get( entryId );
for ( Modification mod : mods )
{
@@ -803,7 +803,7 @@ public class AvlStore<E> extends Abstrac
DN newUpdn = move( oldChildDn, childId, newParentDn );
// Update the current entry
- ServerEntry entry = lookup( childId );
+ Entry entry = lookup( childId );
entry.setDn( newUpdn );
master.put( childId, entry );
}
@@ -815,7 +815,7 @@ public class AvlStore<E> extends Abstrac
DN newUpdn = move( oldChildDn, childId, newParentDn );
// Update the current entry
- ServerEntry entry = lookup( childId );
+ Entry entry = lookup( childId );
entry.setDn( newUpdn );
master.put( childId, entry );
}
@@ -897,7 +897,7 @@ public class AvlStore<E> extends Abstrac
public void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
{
Long id = getEntryId( dn );
- ServerEntry entry = lookup( id );
+ Entry entry = lookup( id );
DN updn = entry.getDn();
/*
Modified: directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java (original)
+++ directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java Wed Apr 28 08:44:42 2010
@@ -47,11 +47,11 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.DefaultModification;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.name.DN;
@@ -82,7 +82,7 @@ public class AvlStoreTest
private static final Logger LOG = LoggerFactory.getLogger( AvlStoreTest.class.getSimpleName() );
private static File wkdir;
- private static AvlStore<ServerEntry> store;
+ private static AvlStore<Entry> store;
private static SchemaManager schemaManager = null;
private static DN EXAMPLE_COM;
@@ -130,7 +130,7 @@ public class AvlStoreTest
wkdir.mkdirs();
// initialize the store
- store = new AvlStore<ServerEntry>();
+ store = new AvlStore<Entry>();
store.setId( "example" );
store.setSyncOnWrite( false );
@@ -217,7 +217,7 @@ public class AvlStoreTest
assertNotNull( store.getAliasIndex() );
try
{
- store.addIndex( new AvlIndex<String, ServerEntry>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) );
+ store.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) );
fail();
}
catch ( IllegalStateException e )
@@ -229,7 +229,7 @@ public class AvlStoreTest
assertNotNull( store.getPresenceIndex() );
try
{
- store.addIndex( new AvlIndex<String, ServerEntry>( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) );
+ store.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) );
fail();
}
catch ( IllegalStateException e )
@@ -239,7 +239,7 @@ public class AvlStoreTest
assertNotNull( store.getOneLevelIndex() );
try
{
- store.addIndex( new AvlIndex<Long, ServerEntry>( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ) );
+ store.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ) );
fail();
}
catch ( IllegalStateException e )
@@ -249,7 +249,7 @@ public class AvlStoreTest
assertNotNull( store.getSubLevelIndex() );
try
{
- store.addIndex( new AvlIndex<Long, ServerEntry>( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) );
+ store.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) );
fail();
}
catch ( IllegalStateException e )
@@ -269,7 +269,7 @@ public class AvlStoreTest
assertNotNull( store.getNdnIndex() );
try
{
- store.addIndex( new AvlIndex<String, ServerEntry>( ApacheSchemaConstants.APACHE_N_DN_AT_OID ) );
+ store.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_N_DN_AT_OID ) );
fail();
}
catch ( IllegalStateException e )
@@ -279,7 +279,7 @@ public class AvlStoreTest
assertNotNull( store.getOneAliasIndex() );
try
{
- store.addIndex( new AvlIndex<Long, ServerEntry>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID ) );
+ store.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID ) );
fail();
}
catch ( IllegalStateException e )
@@ -289,7 +289,7 @@ public class AvlStoreTest
assertNotNull( store.getSubAliasIndex() );
try
{
- store.addIndex( new AvlIndex<Long, ServerEntry>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID ) );
+ store.addIndex( new AvlIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID ) );
fail();
}
catch ( IllegalStateException e )
@@ -406,7 +406,7 @@ public class AvlStoreTest
{
assertEquals( 3, store.getChildCount( 1L ) );
- Cursor<IndexEntry<Long, ServerEntry, Long>> cursor = store.list( 1L );
+ Cursor<IndexEntry<Long, Entry, Long>> cursor = store.list( 1L );
assertNotNull( cursor );
cursor.beforeFirst();
assertTrue( cursor.next() );
@@ -421,7 +421,7 @@ public class AvlStoreTest
// add an alias and delete to test dropAliasIndices method
DN dn = new DN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+ DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
entry.add( "objectClass", "top", "alias", "extensibleObject" );
entry.add( "ou", "Apache" );
entry.add( "commonName", "Jack Daniels" );
@@ -470,7 +470,7 @@ public class AvlStoreTest
// dn id 12
DN martinDn = new DN( "cn=Marting King,ou=Sales,o=Good Times Co." );
martinDn.normalize( schemaManager.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( schemaManager, martinDn );
+ DefaultClientEntry entry = new DefaultClientEntry( schemaManager, martinDn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Sales" );
entry.add( "cn", "Martin King" );
@@ -495,7 +495,7 @@ public class AvlStoreTest
// dn id 13
DN marketingDn = new DN( "ou=Marketing,ou=Sales,o=Good Times Co." );
marketingDn.normalize( schemaManager.getNormalizerMapping() );
- entry = new DefaultServerEntry( schemaManager, marketingDn );
+ entry = new DefaultClientEntry( schemaManager, marketingDn );
entry.add( "objectClass", "top", "organizationalUnit" );
entry.add( "ou", "Marketing" );
entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
@@ -505,7 +505,7 @@ public class AvlStoreTest
// dn id 14
DN jimmyDn = new DN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
jimmyDn.normalize( schemaManager.getNormalizerMapping() );
- entry = new DefaultServerEntry( schemaManager, jimmyDn );
+ entry = new DefaultClientEntry( schemaManager, jimmyDn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Marketing" );
entry.add( "cn", "Jimmy Wales" );
@@ -562,7 +562,7 @@ public class AvlStoreTest
{
DN dn = new DN( "cn=Marting King,ou=Not Present,o=Good Times Co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+ DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Not Present" );
entry.add( "cn", "Martin King" );
@@ -575,7 +575,7 @@ public class AvlStoreTest
{
DN dn = new DN( "cn=Martin King,ou=Sales,o=Good Times Co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+ DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
entry.add( "ou", "Sales" );
entry.add( "cn", "Martin King" );
store.add( entry );
@@ -606,7 +606,7 @@ public class AvlStoreTest
{
DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+ DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Engineering" );
entry.add( "cn", "Private Ryan" );
@@ -626,7 +626,7 @@ public class AvlStoreTest
{
DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+ DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Engineering" );
entry.add( "cn", "Private Ryan" );
@@ -643,7 +643,7 @@ public class AvlStoreTest
dn2.normalize( schemaManager.getNormalizerMapping() );
Long id = store.getEntryId( dn2 );
assertNotNull( id );
- ServerEntry entry2 = store.lookup( id );
+ Entry entry2 = store.lookup( id );
assertEquals( "Ja+es", entry2.get( "sn" ).getString() );
}
@@ -653,7 +653,7 @@ public class AvlStoreTest
{
DN childDn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
childDn.normalize( schemaManager.getNormalizerMapping() );
- DefaultServerEntry childEntry = new DefaultServerEntry( schemaManager, childDn );
+ DefaultClientEntry childEntry = new DefaultClientEntry( schemaManager, childDn );
childEntry.add( "objectClass", "top", "person", "organizationalPerson" );
childEntry.add( "ou", "Engineering" );
childEntry.add( "cn", "Private Ryan" );
@@ -700,13 +700,13 @@ public class AvlStoreTest
Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
mods.add( add );
- ServerEntry lookedup = store.lookup( store.getEntryId( dn ) );
+ Entry lookedup = store.lookup( store.getEntryId( dn ) );
store.modify( dn, mods );
assertTrue( lookedup.get( "sn" ).contains( attribVal ) );
// testing the store.modify( dn, mod, entry ) API
- ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+ Entry entry = new DefaultClientEntry( schemaManager, dn );
attribVal = "+1974045779";
entry.add( "telephoneNumber", attribVal );
@@ -732,7 +732,7 @@ public class AvlStoreTest
Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
mods.add( add );
- ServerEntry lookedup = store.lookup( store.getEntryId( dn ) );
+ Entry lookedup = store.lookup( store.getEntryId( dn ) );
assertEquals( "WAlkeR", lookedup.get( "sn" ).get().getString() ); // before replacing
@@ -740,7 +740,7 @@ public class AvlStoreTest
assertEquals( attribVal, lookedup.get( "sn" ).get().getString() );
// testing the store.modify( dn, mod, entry ) API
- ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+ Entry entry = new DefaultClientEntry( schemaManager, dn );
attribVal = "JWalker";
entry.add( "sn", attribVal );
@@ -762,7 +762,7 @@ public class AvlStoreTest
Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
mods.add( add );
- ServerEntry lookedup = store.lookup( store.getEntryId( dn ) );
+ Entry lookedup = store.lookup( store.getEntryId( dn ) );
assertNotNull( lookedup.get( "sn" ).get() );
@@ -770,7 +770,7 @@ public class AvlStoreTest
assertNull( lookedup.get( "sn" ) );
// testing the store.modify( dn, mod, entry ) API
- ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+ Entry entry = new DefaultClientEntry( schemaManager, dn );
// add an entry for the sake of testing the remove operation
entry.add( "sn", "JWalker" );
@@ -787,7 +787,7 @@ public class AvlStoreTest
{
DN dn = new DN( "cn=Tim B,ou=Sales,o=Good Times Co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
+ DefaultClientEntry entry = new DefaultClientEntry( schemaManager, dn );
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "cn", "Tim B" );
entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
@@ -805,7 +805,7 @@ public class AvlStoreTest
Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
mods.add( add );
- ServerEntry lookedup = store.lookup( store.getEntryId( dn ) );
+ Entry lookedup = store.lookup( store.getEntryId( dn ) );
assertNull( lookedup.get( "ou" ) ); // before replacing
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java Wed Apr 28 08:44:42 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.avl.AvlIndex;
import org.apache.directory.server.core.partition.avl.AvlPartition;
import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
/**
@@ -64,9 +64,9 @@ public class AvlPartitionFactory impleme
}
AvlPartition avlPartition = ( AvlPartition ) partition;
- Set<Index<? extends Object, ServerEntry, Long>> indexedAttributes = avlPartition.getIndexedAttributes();
+ Set<Index<? extends Object, Entry, Long>> indexedAttributes = avlPartition.getIndexedAttributes();
- AvlIndex<Object, ServerEntry> index = new AvlIndex<Object, ServerEntry>( attributeId );
+ AvlIndex<Object, Entry> index = new AvlIndex<Object, Entry>( attributeId );
//index.setCacheSize( cacheSize );
indexedAttributes.add( index );
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Wed Apr 28 08:44:42 2010
@@ -40,7 +40,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.GenericIndex;
import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.junit.runner.Description;
@@ -243,7 +243,7 @@ public class DSAnnotationProcessor
{
if ( entry.isChangeAdd() )
{
- service.getAdminSession().add( new DefaultServerEntry( service.getSchemaManager(), entry.getEntry() ) );
+ service.getAdminSession().add( new DefaultClientEntry( service.getSchemaManager(), entry.getEntry() ) );
}
else if ( entry.isChangeModify() )
{
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java Wed Apr 28 08:44:42 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
/**
@@ -64,9 +64,9 @@ public class JdbmPartitionFactory implem
}
JdbmPartition jdbmPartition = ( JdbmPartition ) partition;
- Set<Index<? extends Object, ServerEntry, Long>> indexedAttributes = jdbmPartition.getIndexedAttributes();
+ Set<Index<? extends Object, Entry, Long>> indexedAttributes = jdbmPartition.getIndexedAttributes();
- JdbmIndex<Object, ServerEntry> index = new JdbmIndex<Object, ServerEntry>( attributeId );
+ JdbmIndex<Object, Entry> index = new JdbmIndex<Object, Entry>( attributeId );
index.setCacheSize( cacheSize );
indexedAttributes.add( index );
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java Wed Apr 28 08:44:42 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.avl.AvlIndex;
import org.apache.directory.server.core.partition.ldif.LdifPartition;
import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
/**
@@ -65,9 +65,9 @@ public class LdifPartitionFactory implem
}
LdifPartition ldifPartition = ( LdifPartition ) partition;
- Set<Index<? extends Object, ServerEntry, Long>> indexedAttributes = ldifPartition.getIndexedAttributes();
+ Set<Index<? extends Object, Entry, Long>> indexedAttributes = ldifPartition.getIndexedAttributes();
- AvlIndex<Object, ServerEntry> index = new AvlIndex<Object, ServerEntry>( attributeId );
+ AvlIndex<Object, Entry> index = new AvlIndex<Object, Entry>( attributeId );
//index.setCacheSize( cacheSize );
indexedAttributes.add( index );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java Wed Apr 28 08:44:42 2010
@@ -30,8 +30,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -206,7 +206,7 @@ public interface CoreSession
* @param entry the entry to add
* @exception Exception on failures to add the entry
*/
- void add( ServerEntry entry ) throws Exception;
+ void add( Entry entry ) throws Exception;
/**
@@ -216,7 +216,7 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @exception Exception on failures to add the entry
*/
- void add( ServerEntry entry, LogChange log ) throws Exception;
+ void add( Entry entry, LogChange log ) throws Exception;
/**
@@ -228,7 +228,7 @@ public interface CoreSession
* @param ignoreReferral a flag to tell the server to ignore referrals
* @exception Exception on failures to add the entry
*/
- void add( ServerEntry entry, boolean ignoreReferral ) throws Exception;
+ void add( Entry entry, boolean ignoreReferral ) throws Exception;
/**
@@ -241,7 +241,7 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @exception Exception on failures to add the entry
*/
- void add( ServerEntry entry, boolean ignoreReferral, LogChange log ) throws Exception;
+ void add( Entry entry, boolean ignoreReferral, LogChange log ) throws Exception;
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Wed Apr 28 08:44:42 2010
@@ -35,7 +35,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.replication.ReplicationConfiguration;
import org.apache.directory.server.core.schema.SchemaService;
import org.apache.directory.shared.ldap.csn.Csn;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -419,12 +419,12 @@ public interface DirectoryService extend
/**
- * Create a new ServerEntry.
+ * Create a new Entry.
*
* @param ldif the String representing the attributes, in LDIF format
* @param dn the DN for this new entry
*/
- ServerEntry newEntry( String ldif, String dn );
+ Entry newEntry( String ldif, String dn );
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Wed Apr 28 08:44:42 2010
@@ -53,13 +53,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.cursor.EmptyCursor;
import org.apache.directory.shared.ldap.entry.DefaultModification;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.filter.FilterParser;
import org.apache.directory.shared.ldap.filter.SearchScope;
@@ -82,8 +81,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.SchemaManager;
-
-
/**
* An implementation of LdapConnection based on the CoreSession.
*
@@ -191,15 +188,7 @@ public class LdapCoreSessionConnection i
try
{
- ServerEntry se;
- if ( entry instanceof ServerEntry )
- {
- se = ( ServerEntry ) entry;
- }
- else
- {
- se = new DefaultServerEntry( sm, entry );
- }
+ Entry se = new DefaultClientEntry( sm, entry );
session.add( se );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java Wed Apr 28 08:44:42 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.server.core;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
/**
@@ -83,7 +83,7 @@ public interface ReferralManager
* @param dn The DN from which we want to get the parent referral
* @return The parent referral of null if none is found
*/
- ServerEntry getParentReferral( DN dn );
+ Entry getParentReferral( DN dn );
/**
@@ -91,7 +91,7 @@ public interface ReferralManager
*
* @param dn The referral to add
*/
- void addReferral( ServerEntry entry );
+ void addReferral( Entry entry );
/**
@@ -99,7 +99,7 @@ public interface ReferralManager
*
* @param dn The referral to remove
*/
- void removeReferral( ServerEntry entry );
+ void removeReferral( Entry entry );
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/Evaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/Evaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/Evaluator.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/Evaluator.java Wed Apr 28 08:44:42 2010
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.event;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.name.DN;
@@ -45,5 +45,5 @@ public interface Evaluator
* @return true if the filter selects the candidate false otherwise
* @throws LdapException if there is a database fault during evaluation
*/
- boolean evaluate( ExprNode node, DN dn, ServerEntry entry ) throws LdapException;
+ boolean evaluate( ExprNode node, DN dn, Entry entry ) throws LdapException;
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/filtering/BaseEntryFilteringCursor.java Wed Apr 28 08:44:42 2010
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.cursor.CursorIterator;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -56,7 +56,7 @@ public class BaseEntryFilteringCursor im
private static final Logger log = LoggerFactory.getLogger( BaseEntryFilteringCursor.class );
/** the underlying wrapped search results Cursor */
- private final Cursor<ServerEntry> wrapped;
+ private final Cursor<Entry> wrapped;
/** the parameters associated with the search operation */
private final SearchingOperationContext operationContext;
@@ -82,7 +82,7 @@ public class BaseEntryFilteringCursor im
* @param invocation the search operation invocation creating this Cursor
* @param filter a single filter to be used
*/
- public BaseEntryFilteringCursor( Cursor<ServerEntry> wrapped,
+ public BaseEntryFilteringCursor( Cursor<Entry> wrapped,
SearchingOperationContext operationContext, EntryFilter filter )
{
this( wrapped, operationContext, Collections.singletonList( filter ) );
@@ -98,7 +98,7 @@ public class BaseEntryFilteringCursor im
* @param invocation the search operation invocation creating this Cursor
* @param filter a single filter to be used
*/
- public BaseEntryFilteringCursor( Cursor<ServerEntry> wrapped, SearchingOperationContext operationContext )
+ public BaseEntryFilteringCursor( Cursor<Entry> wrapped, SearchingOperationContext operationContext )
{
this.wrapped = wrapped;
this.operationContext = operationContext;
@@ -115,7 +115,7 @@ public class BaseEntryFilteringCursor im
* @param invocation the search operation invocation creating this Cursor
* @param filters a list of filters to be used
*/
- public BaseEntryFilteringCursor( Cursor<ServerEntry> wrapped,
+ public BaseEntryFilteringCursor( Cursor<Entry> wrapped,
SearchingOperationContext operationContext, List<EntryFilter> filters )
{
this.wrapped = wrapped;
@@ -500,7 +500,7 @@ public class BaseEntryFilteringCursor im
{
boolean accepted = true;
- ServerEntry tempEntry = wrapped.get();
+ Entry tempEntry = wrapped.get();
if ( tempEntry instanceof ClonedServerEntry )
{
tempResult = ( ClonedServerEntry ) tempEntry;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java Wed Apr 28 08:44:42 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.DN;
@@ -292,7 +292,7 @@ public abstract class AbstractOperationC
}
- public void add( ServerEntry entry, Collection<String> byPassed ) throws Exception
+ public void add( Entry entry, Collection<String> byPassed ) throws Exception
{
AddOperationContext opContext = new AddOperationContext( session, entry );
setup( opContext );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Wed Apr 28 08:44:42 2010
@@ -24,8 +24,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
import org.apache.directory.shared.ldap.name.DN;
@@ -68,7 +68,7 @@ public class AddOperationContext extends
* @param session the current Session
* @param entry the entry being added
*/
- public AddOperationContext( CoreSession session, ServerEntry entry )
+ public AddOperationContext( CoreSession session, Entry entry )
{
super( session, entry.getDn() );
this.entry = new ClonedServerEntry( entry );
@@ -82,7 +82,7 @@ public class AddOperationContext extends
* @param dn the name of the entry being added
* @param entry the entry being added
*/
- public AddOperationContext( CoreSession session, DN dn, ServerEntry entry )
+ public AddOperationContext( CoreSession session, DN dn, Entry entry )
{
super( session, dn );
this.entry = new ClonedServerEntry( entry );
@@ -93,7 +93,7 @@ public class AddOperationContext extends
{
super( session );
entry = new ClonedServerEntry(
- new DefaultServerEntry( session.getDirectoryService().getSchemaManager(), addRequest.getEntry() ) );
+ new DefaultClientEntry( session.getDirectoryService().getSchemaManager(), addRequest.getEntry() ) );
dn = addRequest.getEntry().getDn();
requestControls = addRequest.getControls();
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java Wed Apr 28 08:44:42 2010
@@ -35,7 +35,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -459,7 +459,7 @@ public class BindOperationContext implem
}
- public void add( ServerEntry entry, Collection<String> bypass ) throws Exception
+ public void add( Entry entry, Collection<String> bypass ) throws Exception
{
throw new NotImplementedException();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Wed Apr 28 08:44:42 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
import org.apache.directory.shared.ldap.name.DN;
@@ -119,7 +119,7 @@ public class ModifyOperationContext exte
}
- public static List<Modification> createModItems( ServerEntry serverEntry, ModificationOperation modOp ) throws NamingException
+ public static List<Modification> createModItems( Entry serverEntry, ModificationOperation modOp ) throws NamingException
{
List<Modification> items = new ArrayList<Modification>( serverEntry.size() );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java Wed Apr 28 08:44:42 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.DN;
@@ -121,7 +121,7 @@ public interface OperationContext
* InterceptorChain. This place holder is put here to prevent the need
* for repetitive lookups of the target entry. Furthermore the returned
* entry may be altered by any Interceptor in the chain and this is why a
- * ClonedServerEntry is returned instead of a ServerEntry. A
+ * ClonedServerEntry is returned instead of a Entry. A
* ClonedServerEntry has an immutable reference to the original state of
* the target entry. The original state can be accessed via a call to
* {@link ClonedServerEntry#getOriginalEntry()}. The return value may be
@@ -306,7 +306,7 @@ public interface OperationContext
void modify( DN dn, List<Modification> mods, Collection<String> byPass ) throws Exception;
- void add( ServerEntry entry, Collection<String> byPass ) throws Exception;
+ void add( Entry entry, Collection<String> byPass ) throws Exception;
void delete( DN dn, Collection<String> byPass ) throws Exception;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Wed Apr 28 08:44:42 2010
@@ -38,7 +38,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -189,14 +188,14 @@ public class PartitionSchemaLoader exten
public Set<String> listDependentSchemaNames( String schemaName ) throws Exception
{
Set<String> dependees = new HashSet<String>();
- Set<ServerEntry> results = dao.listSchemaDependents( schemaName );
+ Set<Entry> results = dao.listSchemaDependents( schemaName );
if ( results.isEmpty() )
{
return dependees;
}
- for ( ServerEntry sr : results )
+ for ( Entry sr : results )
{
EntryAttribute cn = sr.get( cnAT );
dependees.add( cn.getString() );
@@ -217,14 +216,14 @@ public class PartitionSchemaLoader exten
public Set<String> listEnabledDependentSchemaNames( String schemaName ) throws Exception
{
Set<String> dependees = new HashSet<String>();
- Set<ServerEntry> results = dao.listEnabledSchemaDependents( schemaName );
+ Set<Entry> results = dao.listEnabledSchemaDependents( schemaName );
if ( results.isEmpty() )
{
return dependees;
}
- for ( ServerEntry sr : results )
+ for ( Entry sr : results )
{
EntryAttribute cn = sr.get( cnAT );
dependees.add( cn.getString() );
@@ -327,7 +326,7 @@ public class PartitionSchemaLoader exten
// Loop on all the AttributeTypes and add them to the list
while ( list.next() )
{
- ServerEntry result = list.get();
+ Entry result = list.get();
attributeTypeList.add( result );
}
@@ -423,7 +422,7 @@ public class PartitionSchemaLoader exten
while ( list.next() )
{
- ServerEntry entry = list.get();
+ Entry entry = list.get();
matchingRuleList.add( entry );
}
@@ -556,7 +555,7 @@ public class PartitionSchemaLoader exten
while ( list.next() )
{
- ServerEntry entry = list.get();
+ Entry entry = list.get();
syntaxList.add( entry );
}
@@ -593,7 +592,7 @@ public class PartitionSchemaLoader exten
while ( list.next() )
{
- ServerEntry entry = list.get();
+ Entry entry = list.get();
syntaxCheckerList.add( entry );
}
@@ -603,7 +602,7 @@ public class PartitionSchemaLoader exten
}
- private String getOid( ServerEntry entry ) throws Exception
+ private String getOid( Entry entry ) throws Exception
{
EntryAttribute oid = entry.get( mOidAT );
@@ -616,7 +615,7 @@ public class PartitionSchemaLoader exten
}
- private NormalizerDescription getNormalizerDescription( String schemaName, ServerEntry entry ) throws Exception
+ private NormalizerDescription getNormalizerDescription( String schemaName, Entry entry ) throws Exception
{
NormalizerDescription description = new NormalizerDescription( getOid( entry ) );
List<String> values = new ArrayList<String>();
@@ -648,7 +647,7 @@ public class PartitionSchemaLoader exten
}
- private LdapComparatorDescription getLdapComparatorDescription( String schemaName, ServerEntry entry )
+ private LdapComparatorDescription getLdapComparatorDescription( String schemaName, Entry entry )
throws Exception
{
LdapComparatorDescription description = new LdapComparatorDescription( getOid( entry ) );
@@ -676,7 +675,7 @@ public class PartitionSchemaLoader exten
}
- private SyntaxCheckerDescription getSyntaxCheckerDescription( String schemaName, ServerEntry entry )
+ private SyntaxCheckerDescription getSyntaxCheckerDescription( String schemaName, Entry entry )
throws Exception
{
SyntaxCheckerDescription description = new SyntaxCheckerDescription( getOid( entry ) );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Wed Apr 28 08:44:42 2010
@@ -54,7 +54,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SchemaUtils;
@@ -351,7 +351,7 @@ public final class SchemaPartition exten
*/
public void modify( ModifyOperationContext opContext ) throws Exception
{
- ServerEntry entry = opContext.getEntry();
+ Entry entry = opContext.getEntry();
if ( entry == null )
{
@@ -359,7 +359,7 @@ public final class SchemaPartition exten
entry = wrapped.lookup( lookupCtx );
}
- ServerEntry targetEntry = ( ServerEntry ) SchemaUtils.getTargetEntry( opContext.getModItems(), entry );
+ Entry targetEntry = ( Entry ) SchemaUtils.getTargetEntry( opContext.getModItems(), entry );
boolean cascade = opContext.hasRequestControl( CascadeControl.CONTROL_OID );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Wed Apr 28 08:44:42 2010
@@ -7,7 +7,7 @@ import java.util.Set;
import javax.naming.NamingException;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -76,7 +76,7 @@ public interface SchemaPartitionDao
* @throws NamingException if more than one entity has the name, or if there
* are underlying data access problems
*/
- ServerEntry find( String entityName ) throws Exception;
+ Entry find( String entityName ) throws Exception;
/**
@@ -120,16 +120,16 @@ public interface SchemaPartitionDao
* @return the set of matchingRules and attributeTypes depending on a syntax
* @throws NamingException if the dao fails to perform search operations
*/
- Set<ServerEntry> listSyntaxDependents( String numericOid ) throws Exception;
+ Set<Entry> listSyntaxDependents( String numericOid ) throws Exception;
- Set<ServerEntry> listMatchingRuleDependents( MatchingRule mr ) throws Exception;
+ Set<Entry> listMatchingRuleDependents( MatchingRule mr ) throws Exception;
EntryFilteringCursor listAllNames() throws Exception;
- Set<ServerEntry> listAttributeTypeDependents( AttributeType at ) throws Exception;
+ Set<Entry> listAttributeTypeDependents( AttributeType at ) throws Exception;
/**
@@ -139,7 +139,7 @@ public interface SchemaPartitionDao
* @return a set of SearchResults over the schemas whose m-dependency attribute contains schemaName
* @throws NamingException if there is a problem while searching the schema partition
*/
- Set<ServerEntry> listSchemaDependents( String schemaName ) throws Exception;
+ Set<Entry> listSchemaDependents( String schemaName ) throws Exception;
/**
@@ -149,8 +149,8 @@ public interface SchemaPartitionDao
* @return a set of SearchResults over the schemas whose m-dependency attribute contains schemaName
* @throws NamingException if there is a problem while searching the schema partition
*/
- Set<ServerEntry> listEnabledSchemaDependents( String schemaName ) throws Exception;
+ Set<Entry> listEnabledSchemaDependents( String schemaName ) throws Exception;
- Set<ServerEntry> listObjectClassDependents( ObjectClass oc ) throws Exception;
+ Set<Entry> listObjectClassDependents( ObjectClass oc ) throws Exception;
}
\ No newline at end of file