From c3ddd7489abd06155b872cc23cef3575e2ee1b9a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 08 Jan 2014 09:55:13 +0000
Subject: [PATCH] Align server types API with SDK types API
---
opendj3-server-dev/src/server/org/opends/server/types/LDIFExportConfig.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 6
opendj3-server-dev/replace.rb | 39
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java | 24
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java | 94
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java | 8
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java | 8
opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java | 8
opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeAddOperation.java | 6
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java | 6
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 39
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java | 2
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java | 4
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java | 12
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java | 3
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java | 4
opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java | 18
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java | 28
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java | 11
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java | 6
opendj3-server-dev/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java | 8
opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java | 16
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java | 46
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java | 13
opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java | 18
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java | 4
opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java | 6
opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java | 14
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 10
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java | 12
opendj3-server-dev/src/server/org/opends/server/types/SubEntry.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java | 82
opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java | 40
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java | 76
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java | 12
opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java | 34
opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java | 3
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java | 10
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java | 6
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciContainer.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 18
opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java | 6
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java | 42
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 10
opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java | 22
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 52
opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java | 6
opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java | 20
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java | 16
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java | 14
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/types/Entry.java | 10
opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java | 14
opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskEntry.java | 3
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 16
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java | 14
opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java | 20
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 2
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java | 5
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java | 2
opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java | 36
opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java | 8
opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java | 12
opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java | 34
opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java | 8
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java | 23
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java | 20
opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java | 120 +-
opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java | 6
opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java | 5
opendj3-server-dev/src/server/org/opends/server/types/MemberList.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java | 24
opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java | 6
opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java | 10
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java | 46
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java | 12
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java | 4
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java | 17
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java | 58
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java | 4
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java | 22
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java | 20
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java | 24
opendj3-server-dev/src/server/org/opends/server/types/AbstractOperation.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 22
opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java | 6
opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java | 8
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java | 18
opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java | 14
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java | 118 +-
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 28
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java | 3
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 12
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java | 20
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java | 12
opendj3-server-dev/copyright.rb | 27
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java | 6
opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java | 24
opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java | 14
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java | 44
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java | 52
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java | 51
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java | 10
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java | 14
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java | 14
opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java | 13
opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java | 4
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java | 11
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java | 66
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java | 18
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java | 6
opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java | 14
opendj3-server-dev/src/server/org/opends/server/core/AuthenticatedUsers.java | 16
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java | 6
opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java | 17
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java | 30
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java | 18
opendj3-server-dev/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java | 76
opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java | 12
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java | 19
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java | 18
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java | 6
opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java | 12
opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java | 38
opendj3-server-dev/src/server/org/opends/server/tasks/ShutdownTask.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java | 14
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java | 5
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java | 22
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java | 6
opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java | 23
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java | 4
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java | 14
opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java | 14
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java | 2
205 files changed, 1,477 insertions(+), 1,382 deletions(-)
diff --git a/opendj3-server-dev/copyright.rb b/opendj3-server-dev/copyright.rb
index 51d36f0..023114d 100755
--- a/opendj3-server-dev/copyright.rb
+++ b/opendj3-server-dev/copyright.rb
@@ -41,11 +41,32 @@
def update_copyright(content)
- pattern = /(^\s+\*\s+)Portions Copyright (\d+)-(\d+) ForgeRock,? AS/i
+ # handle FG copyright with 1 date
+ pattern = /(^\s+\*\s+)Copyright (\d+) ForgeRock,? AS/i
+ mdata = content.match(pattern)
+ if !mdata.nil?
+ if mdata[2]!="2014"
+ replace = '\1Portions Copyright \2-2014 ForgeRock AS'
+ is_replaced = content.gsub!(pattern, replace)
+ else
+ is_replaced = true # no action needed
+ end
+ end
+
+ # handle FG copyright with 2 dates
+ pattern = /(^\s+\*\s+)Copyright (\d+)-(\d+) ForgeRock,? AS/i
replace = '\1Portions Copyright \2-2014 ForgeRock AS'
is_replaced = content.gsub!(pattern, replace)
if is_replaced.nil?
+ # handle FG portions copyright with 2 dates
+ pattern = /(^\s+\*\s+)Portions Copyright (\d+)-(\d+) ForgeRock,? AS/i
+ replace = '\1Portions Copyright \2-2014 ForgeRock AS'
+ is_replaced = content.gsub!(pattern, replace)
+ end
+
+ if is_replaced.nil?
+ # handle FG portions copyright with 1 date
pattern = /(^\s+\*\s+)Portions Copyright (\d+) ForgeRock,? AS/i
mdata = content.match(pattern)
if !mdata.nil? && mdata[2]!="2014"
@@ -53,7 +74,7 @@
is_replaced = content.gsub!(pattern, replace)
end
if is_replaced.nil?
- # No portions line, add it
+ # Handle no FG portions
pattern = /(^\s+\*)(\s+)Copyright (\d+-?\d*)\s(.*)$\n\s+\*\/$/i
replace = '\1\2Copyright \3 \4' + "\n\\1\\2Portions Copyright 2014 ForgeRock AS\n\\1/"
is_replaced = content.gsub!(pattern, replace)
@@ -66,7 +87,7 @@
if args.size==0
files = updated_files
else
- files = argv
+ files = args
end
files.each { |file|
puts "Processing file #{file}"
diff --git a/opendj3-server-dev/replace.rb b/opendj3-server-dev/replace.rb
index be281a8..a36f14a 100755
--- a/opendj3-server-dev/replace.rb
+++ b/opendj3-server-dev/replace.rb
@@ -85,13 +85,12 @@
}
# Replacement for types
- # Modify 688 files, for a total of 783 replacements - leaves 7605 compilation errors
TYPES = {
:dirs => JAVA_DIRS,
:extensions => ["java"],
:replacements =>
[
- /import org.opends.server.types.(DN|RDN|Attribute|ByteString|Entry|ResultCode);/,
+ /import org.opends.server.types.(DN|RDN|Attribute|Entry|ResultCode);/,
'import org.forgerock.opendj.ldap.\1;',
/import org.opends.server.(types|api).(AttributeType|MatchingRule);/,
@@ -100,6 +99,38 @@
]
}
+ BYTESTRING_TYPE = {
+ :dirs => JAVA_DIRS,
+ :extensions => ["java"],
+ :replacements =>
+ [
+ /package org.opends.server.types;/,
+ "package org.opends.server.types;\n\n" +
+ "import org.forgerock.opendj.ldap.ByteString;\n" +
+ "import org.forgerock.opendj.ldap.ByteStringBuilder;\n" +
+ "import org.forgerock.opendj.ldap.ByteSequence;\n" +
+ "import org.forgerock.opendj.ldap.ByteSequenceReader;",
+
+ /import org.opends.server.types.\*;/,
+ "import org.opends.server.types.*;\n" +
+ "import org.forgerock.opendj.ldap.ByteString;\n" +
+ "import org.forgerock.opendj.ldap.ByteStringBuilder;\n" +
+ "import org.forgerock.opendj.ldap.ByteSequence;\n" +
+ "import org.forgerock.opendj.ldap.ByteSequenceReader;",
+
+ /import org.opends.server.types.(ByteString|ByteStringBuilder|ByteSequence|ByteSequenceReader);/,
+ 'import org.forgerock.opendj.ldap.\1;',
+
+ /package org.opends.server.protocols.asn1;/,
+ "package org.opends.server.protocols.asn1;\n\n" +
+ "import com.forgerock.opendj.util.ByteSequenceOutputStream;",
+
+ /import org.opends.server.protocols.asn1.ByteSequenceOutputStream;/,
+ "import com.forgerock.opendj.util.ByteSequenceOutputStream;",
+
+ ]
+ }
+
# Replacement for exceptions
# Modify 36 files, for a total of 134 replacements - leaves 1277 compilation errors but mostly from generated config
EXCEPTIONS = {
@@ -214,8 +245,8 @@
}
# List of replacements to run
- REPLACEMENTS = [ I18N_LOGGERS ]
- #REPLACEMENTS = [ VALIDATOR, MESSAGES, TYPES, EXCEPTIONS, LOGGERS ]
+ REPLACEMENTS = [ BYTESTRING_TYPE ]
+ #REPLACEMENTS = [ VALIDATOR, MESSAGES, TYPES, EXCEPTIONS, LOGGERS, I18N_LOGGERS ]
# Run replacements
def run
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index 3fae7a6..8c50432 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -102,7 +102,7 @@
this.newEntry = newEntry;
this.controller = controller;
this.treePath = path;
- DN newDn = newEntry.getDN();
+ DN newDn = newEntry.getName();
try
{
oldDn = DN.valueOf(oldEntry.getDN());
@@ -139,7 +139,7 @@
modifications.remove(passwordModification);
}
hasModifications = modifications.size() > 0 ||
- !oldDn.equals(newEntry.getDN()) ||
+ !oldDn.equals(newEntry.getName()) ||
(passwordModification != null);
}
@@ -254,7 +254,7 @@
{
public void run()
{
- printEquivalentCommandToModify(newEntry.getDN(), modifications,
+ printEquivalentCommandToModify(newEntry.getName(), modifications,
useAdminCtx);
getProgressDialog().appendProgressHtml(
Utilities.getProgressWithPoints(
@@ -364,7 +364,7 @@
throws CannotRenameException, NamingException
{
RDN oldRDN = oldDN.rdn();
- RDN newRDN = newEntry.getDN().rdn();
+ RDN newRDN = newEntry.getName().rdn();
boolean rdnTypeChanged =
newRDN.getNumValues() != oldRDN.getNumValues();
@@ -418,17 +418,17 @@
{
public void run()
{
- printEquivalentRenameCommand(oldDN, newEntry.getDN(), useAdminCtx);
+ printEquivalentRenameCommand(oldDN, newEntry.getName(), useAdminCtx);
getProgressDialog().appendProgressHtml(
Utilities.getProgressWithPoints(
INFO_CTRL_PANEL_RENAMING_ENTRY.get(oldDN.toString(),
- newEntry.getDN().toString()),
+ newEntry.getName().toString()),
ColorAndFontConstants.progressFont));
}
});
ctx.rename(Utilities.getJNDIName(oldDn.toString()),
- Utilities.getJNDIName(newEntry.getDN().toString()));
+ Utilities.getJNDIName(newEntry.getName().toString()));
final TreePath[] newPath = {null};
@@ -443,7 +443,7 @@
controller.getNodeInfoFromPath(treePath));
newPath[0] = controller.notifyEntryAdded(
controller.getNodeInfoFromPath(parentPath),
- newEntry.getDN().toString());
+ newEntry.getName().toString());
}
});
@@ -456,7 +456,7 @@
{
public void run()
{
- DN dn = newEntry.getDN();
+ DN dn = newEntry.getName();
printEquivalentCommandToModify(dn, originalMods, useAdminCtx);
getProgressDialog().appendProgressHtml(
Utilities.getProgressWithPoints(
@@ -465,7 +465,7 @@
}
});
- ctx.modifyAttributes(Utilities.getJNDIName(newEntry.getDN().toString()),
+ ctx.modifyAttributes(Utilities.getJNDIName(newEntry.getName().toString()),
mods);
SwingUtilities.invokeLater(new Runnable()
@@ -522,7 +522,7 @@
boolean isAttributeInNewRdn = false;
AttributeValue rdnValue = null;
- RDN rdn = newEntry.getDN().rdn();
+ RDN rdn = newEntry.getName().rdn();
for (int i=0; i<rdn.getNumValues() && !isAttributeInNewRdn; i++)
{
isAttributeInNewRdn =
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
index b97a53a..049d154 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -92,7 +92,7 @@
this.ldif = ldif;
this.parentNode = parentNode;
this.controller = controller;
- dn = newEntry.getDN();
+ dn = newEntry.getName();
for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
{
for (BaseDNDescriptor baseDN : backend.getBaseDns())
@@ -240,7 +240,7 @@
}
});
- ctx.createSubcontext(Utilities.getJNDIName(newEntry.getDN().toString()),
+ ctx.createSubcontext(Utilities.getJNDIName(newEntry.getName().toString()),
attrs);
SwingUtilities.invokeLater(new Runnable()
@@ -257,7 +257,7 @@
{
DN parentDN = DN.valueOf(parentNode.getDN());
isReallyParentNode =
- parentDN.equals(newEntry.getDN().parent());
+ parentDN.equals(newEntry.getName().parent());
}
catch (Throwable t)
{
@@ -267,29 +267,29 @@
}
if (isReallyParentNode)
{
- insertNode(parentNode, newEntry.getDN(),
- isBaseDN(newEntry.getDN()));
+ insertNode(parentNode, newEntry.getName(),
+ isBaseDN(newEntry.getName()));
entryInserted = true;
}
}
if (!entryInserted)
{
BasicNode root = (BasicNode)controller.getTreeModel().getRoot();
- BasicNode realParentNode = findParentNode(newEntry.getDN(), root);
+ BasicNode realParentNode = findParentNode(newEntry.getName(), root);
if (realParentNode != null)
{
- insertNode(realParentNode, newEntry.getDN(), false);
+ insertNode(realParentNode, newEntry.getName(), false);
}
else
{
- if (isBaseDN(newEntry.getDN()))
+ if (isBaseDN(newEntry.getName()))
{
int nRootChildren = controller.getTreeModel().getChildCount(
controller.getTreeModel().getRoot());
if (nRootChildren > 1)
{
// Insert in the root.
- insertNode(root, newEntry.getDN(), true);
+ insertNode(root, newEntry.getName(), true);
}
}
}
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
index 10ee2e7..61e9c36 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -173,7 +174,7 @@
// Unexpected error: getEntry() should work after calling checkSyntax
throw new RuntimeException("Unexpected error: "+t, t);
}
- String dn = entry.getDN().toString();
+ String dn = entry.getName().toString();
// Checking for the existence of an entry is fast enough so we can do
// it on the event thread.
if (entryExists(dn))
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
index c23eefe..fadc42e 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
@@ -733,7 +733,7 @@
LDIFReader reader = new LDIFReader(ldifImportConfig);
Entry newConfigEntry = reader.readEntry();
Entry oldEntry = DirectoryServer.getConfigEntry(
- newConfigEntry.getDN()).getEntry();
+ newConfigEntry.getName()).getEntry();
DirectoryServer.getConfigHandler().replaceEntry(oldEntry,
newConfigEntry,
null);
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
index 986fac7..068969a 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
@@ -224,7 +224,7 @@
else
{
boolean modified =
- !Utilities.areDnsEqual(ev.getEntry().getDN().toString(),
+ !Utilities.areDnsEqual(ev.getEntry().getName().toString(),
searchResult.getDN()) ||
!ModifyEntryTask.getModifications(ev.getEntry(), searchResult,
getInfo()).isEmpty();
@@ -591,7 +591,7 @@
}
if ((errors.size() == 0) && newTask.hasModifications())
{
- String dn = entry.getDN().toString();
+ String dn = entry.getName().toString();
launchOperation(newTask,
INFO_CTRL_PANEL_MODIFYING_ENTRY_SUMMARY.get(dn),
INFO_CTRL_PANEL_MODIFYING_ENTRY_COMPLETE.get(),
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index 92c3eea..53d2acd 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -1427,7 +1427,7 @@
args.add(getNoPropertiesFileArgument());
args.add("--no-prompt");
- dns.add(indexEntry.getDN().toString());
+ dns.add(indexEntry.getName().toString());
attributes.add(attrs);
}
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
index 72c922f..da70d04 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -654,7 +654,7 @@
sb.append(" "+CommandBuilder.escapeValue(arg));
}
- ctx.createSubcontext(indexEntry.getDN().toString(), attrs);
+ ctx.createSubcontext(indexEntry.getName().toString(), attrs);
}
catch (Throwable t)
{
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
index 1cad8e1..5f6ee34 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -778,7 +778,7 @@
LDIFReader reader = new LDIFReader(ldifImportConfig);
Entry newConfigEntry = reader.readEntry();
Entry oldEntry = DirectoryServer.getConfigEntry(
- newConfigEntry.getDN()).getEntry();
+ newConfigEntry.getName()).getEntry();
DirectoryServer.getConfigHandler().replaceEntry(oldEntry,
newConfigEntry,
null);
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index 7339fe9..9d4600a 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -342,7 +342,7 @@
protected void addValuesInRDN(Entry entry)
{
// Add the values in the RDN if they are not there
- RDN rdn = entry.getDN().rdn();
+ RDN rdn = entry.getName().rdn();
for (int i=0; i<rdn.getNumValues(); i++)
{
String attrName = rdn.getAttributeName(i);
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
index a372ea7..bf1edde 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
@@ -177,7 +177,7 @@
baseDNs = new DN[] { configRootEntry.getDN() };
- configEntries.put(entry.getDN(), configRootEntry);
+ configEntries.put(entry.getName(), configRootEntry);
// Iterate through the rest of the configuration file and process the
// remaining entries.
while (entry != null)
@@ -186,7 +186,7 @@
entry = reader.readEntry(checkSchema);
if (entry != null)
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
DN parentDN = entryDN.parent();
ConfigEntry parentEntry = null;
if (parentDN != null)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java b/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java
index 0fd0e2f..8df9344 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.admin;
@@ -263,7 +263,7 @@
if (entry != null)
{
- returnDN = entry.getDN();
+ returnDN = entry.getName();
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
index f66fa36..8166b1f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2011 ForgeRock AS.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -84,7 +85,7 @@
boolean useDefaultOnError) throws DirectoryException
{
// First check to see if the ds-pwp-password-policy-dn is present.
- String userDNString = userEntry.getDN().toString();
+ String userDNString = userEntry.getName().toString();
AttributeType type = DirectoryServer.getAttributeType(
OP_ATTR_PWPOLICY_POLICY_DN, true);
List<Attribute> attrList = userEntry.getAttribute(type);
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
index cbb90cf..b851b7a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2011 ForgeRock AS.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -131,7 +132,8 @@
if (debugEnabled())
{
TRACER.debugInfo("Attribute %s resolves to true for user entry "
- + "%s", attributeType.getNameOrOID(), entry.getDN().toString());
+ + "%s", attributeType.getNameOrOID(),
+ entry.getName().toString());
}
return ConditionResult.TRUE;
@@ -143,7 +145,7 @@
if (debugEnabled())
{
TRACER.debugInfo("Attribute %s resolves to false for user "
- + "entry %s", attributeType.getNameOrOID(), entry.getDN()
+ + "entry %s", attributeType.getNameOrOID(), entry.getName()
.toString());
}
@@ -154,11 +156,11 @@
{
TRACER.debugError("Unable to resolve value %s for attribute %s "
+ "in user entry %s as a Boolean.", valueString,
- attributeType.getNameOrOID(), entry.getDN().toString());
+ attributeType.getNameOrOID(), entry.getName().toString());
}
final Message message = ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN
- .get(valueString, attributeType.getNameOrOID(), entry.getDN()
+ .get(valueString, attributeType.getNameOrOID(), entry.getName()
.toString());
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message);
@@ -169,7 +171,7 @@
{
TRACER.debugInfo("Returning %s because attribute %s does not exist "
+ "in user entry %s", ConditionResult.UNDEFINED.toString(),
- attributeType.getNameOrOID(), entry.getDN().toString());
+ attributeType.getNameOrOID(), entry.getName().toString());
}
return ConditionResult.UNDEFINED;
@@ -221,13 +223,13 @@
TRACER.debugWarning("Unable to decode value %s for attribute %s "
+ "in user entry %s: %s", v.getValue().toString(),
- attributeType.getNameOrOID(), entry.getDN().toString(),
+ attributeType.getNameOrOID(), entry.getName().toString(),
stackTraceToSingleLineString(e));
}
final Message message = ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME
.get(v.getValue().toString(), attributeType.getNameOrOID(), entry
- .getDN().toString(), String.valueOf(e));
+ .getName().toString(), String.valueOf(e));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message, e);
}
@@ -241,7 +243,7 @@
{
TRACER.debugInfo("Returning -1 because attribute %s does not "
+ "exist in user entry %s", attributeType.getNameOrOID(), entry
- .getDN().toString());
+ .getName().toString());
}
}
// FIXME: else to be consistent...
@@ -331,7 +333,7 @@
{
TRACER.debugWarning("User %s is considered administratively "
+ "disabled because an error occurred while "
- + "attempting to make the determination: %s.", userEntry.getDN()
+ + "attempting to make the determination: %s.", userEntry.getName()
.toString(), stackTraceToSingleLineString(e));
}
@@ -345,7 +347,7 @@
{
TRACER.debugInfo("User %s is not administratively disabled since "
+ "the attribute \"%s\" is not present in the entry.", userEntry
- .getDN().toString(), OP_ATTR_ACCOUNT_DISABLED);
+ .getName().toString(), OP_ATTR_ACCOUNT_DISABLED);
}
return false;
}
@@ -353,7 +355,7 @@
if (debugEnabled())
{
TRACER.debugInfo("User %s %s administratively disabled.", userEntry
- .getDN().toString(), ((isDisabled == ConditionResult.TRUE) ? " is"
+ .getName().toString(), ((isDisabled == ConditionResult.TRUE) ? " is"
: " is not"));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
index e2a2786..950812b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
@@ -221,23 +221,23 @@
if (authNEntry != null)
{
if ((authZEntry == null) ||
- authZEntry.getDN().equals(authNEntry.getDN()))
+ authZEntry.getName().equals(authNEntry.getName()))
{
DirectoryServer.getAuthenticatedUsers().remove(
- authNEntry.getDN(), this);
+ authNEntry.getName(), this);
}
else
{
DirectoryServer.getAuthenticatedUsers().remove(
- authNEntry.getDN(), this);
+ authNEntry.getName(), this);
DirectoryServer.getAuthenticatedUsers().remove(
- authZEntry.getDN(), this);
+ authZEntry.getName(), this);
}
}
else if (authZEntry != null)
{
DirectoryServer.getAuthenticatedUsers().remove(
- authZEntry.getDN(), this);
+ authZEntry.getName(), this);
}
networkGroup.removeConnection(this);
@@ -884,23 +884,23 @@
if (authNEntry != null)
{
if ((authZEntry == null) ||
- authZEntry.getDN().equals(authNEntry.getDN()))
+ authZEntry.getName().equals(authNEntry.getName()))
{
DirectoryServer.getAuthenticatedUsers().remove(
- authNEntry.getDN(), this);
+ authNEntry.getName(), this);
}
else
{
DirectoryServer.getAuthenticatedUsers().remove(
- authNEntry.getDN(), this);
+ authNEntry.getName(), this);
DirectoryServer.getAuthenticatedUsers().remove(
- authZEntry.getDN(), this);
+ authZEntry.getName(), this);
}
}
else if (authZEntry != null)
{
DirectoryServer.getAuthenticatedUsers().remove(
- authZEntry.getDN(), this);
+ authZEntry.getName(), this);
}
}
@@ -919,17 +919,17 @@
if (authNEntry != null)
{
if ((authZEntry == null) ||
- authZEntry.getDN().equals(authNEntry.getDN()))
+ authZEntry.getName().equals(authNEntry.getName()))
{
DirectoryServer.getAuthenticatedUsers().put(
- authNEntry.getDN(), this);
+ authNEntry.getName(), this);
}
else
{
DirectoryServer.getAuthenticatedUsers().put(
- authNEntry.getDN(), this);
+ authNEntry.getName(), this);
DirectoryServer.getAuthenticatedUsers().put(
- authZEntry.getDN(), this);
+ authZEntry.getName(), this);
}
}
else
@@ -937,7 +937,7 @@
if (authZEntry != null)
{
DirectoryServer.getAuthenticatedUsers().put(
- authZEntry.getDN(), this);
+ authZEntry.getName(), this);
}
}
@@ -965,10 +965,10 @@
Entry authZEntry = authenticationInfo.getAuthorizationEntry();
if ((authNEntry != null) &&
- authNEntry.getDN().equals(oldEntry.getDN()))
+ authNEntry.getName().equals(oldEntry.getName()))
{
if ((authZEntry == null) ||
- (! authZEntry.getDN().equals(authNEntry.getDN())))
+ (! authZEntry.getName().equals(authNEntry.getName())))
{
setAuthenticationInfo(
authenticationInfo.duplicate(newEntry, authZEntry));
@@ -982,7 +982,7 @@
}
}
else if ((authZEntry != null) &&
- (authZEntry.getDN().equals(oldEntry.getDN())))
+ (authZEntry.getName().equals(oldEntry.getName())))
{
setAuthenticationInfo(
authenticationInfo.duplicate(authNEntry, newEntry));
@@ -1019,7 +1019,7 @@
public static boolean hasPrivilege(Entry authorizationEntry,
Privilege privilege) {
boolean isRoot =
- DirectoryServer.isRootDN(authorizationEntry.getDN());
+ DirectoryServer.isRootDN(authorizationEntry.getName());
return getPrivileges(authorizationEntry,
isRoot).contains(privilege) ||
DirectoryServer.isDisabled(privilege);
@@ -1101,7 +1101,7 @@
else
{
boolean isRoot =
- DirectoryServer.isRootDN(authorizationEntry.getDN());
+ DirectoryServer.isRootDN(authorizationEntry.getName());
result = getPrivileges(authorizationEntry,
isRoot).contains(privilege) ||
DirectoryServer.isDisabled(privilege);
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciContainer.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
index 5e141f1..cd00948 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
@@ -511,7 +511,7 @@
* @return True if the authZid is equal to the authorization entry's DN.
*/
public boolean isAuthzidAuthorizationDN() {
- return this.authzid.equals(this.authorizationEntry.getDN());
+ return this.authzid.equals(this.authorizationEntry.getName());
}
/**
@@ -666,7 +666,7 @@
if(this.useAuthzid)
return this.authzid;
else if (this.authorizationEntry != null)
- return this.authorizationEntry.getDN();
+ return this.authorizationEntry.getName();
return DN.rootDN();
}
@@ -675,7 +675,7 @@
*/
@Override
public DN getResourceDN() {
- return resourceEntry.getDN();
+ return resourceEntry.getName();
}
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index 8a0ff12..d8d68c8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -409,7 +409,7 @@
return true;
}
- final RDN oldRDN = operation.getOriginalEntry().getDN().rdn();
+ final RDN oldRDN = operation.getOriginalEntry().getName().rdn();
final RDN newRDN = operation.getNewRDN();
final DN newSuperiorDN = operation.getNewSuperior();
@@ -502,7 +502,7 @@
final AuthenticationInfo authInfo =
new AuthenticationInfo(proxyUser, DirectoryServer.isRootDN(proxyUser
- .getDN()));
+ .getName()));
final AciContainer container =
new AciLDAPOperationContainer(op, proxiedUser, authInfo, ACI_PROXY);
return accessAllowedEntry(container);
@@ -810,7 +810,7 @@
throws DirectoryException
{
Entry resourceEntry = container.getResourceEntry();
- DN dn = resourceEntry.getDN();
+ DN dn = resourceEntry.getName();
List<Modification> modifications = operation.getModifications();
for (Modification m : modifications)
@@ -1473,7 +1473,7 @@
Privilege.MODIFY_ACL, operation))
{
Message message = INFO_ACI_ADD_FAILED_PRIVILEGE.get(
- String.valueOf(entry.getDN()), String.valueOf(clientDN));
+ String.valueOf(entry.getName()), String.valueOf(clientDN));
logError(message);
return false;
}
@@ -1485,12 +1485,12 @@
{
try
{
- Aci.decode(value.getValue(), entry.getDN());
+ Aci.decode(value.getValue(), entry.getName());
}
catch (AciException ex)
{
Message message = WARN_ACI_ADD_FAILED_DECODE.get(
- String.valueOf(entry.getDN()), ex.getMessage());
+ String.valueOf(entry.getName()), ex.getMessage());
throw new DirectoryException(
ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
index 07399e4..d1ba811 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
@@ -147,7 +147,7 @@
try
{
for (Entry entry : entries) {
- DN dn=entry.getDN();
+ DN dn=entry.getName();
List<Attribute> attributeList =
entry.getOperationalAttribute(AciHandler.aciType);
validAcis += addAciAttributeList(aciList, dn, configDN,
@@ -205,7 +205,7 @@
//Process global "ds-cfg-global-aci" attribute type. The oldentry
//DN is checked to verify it is equal to the config DN. If not those
//attributes are skipped.
- if(hasGlobalAci && entry.getDN().equals(configDN)) {
+ if(hasGlobalAci && entry.getName().equals(configDN)) {
List<Attribute> attributeList = entry.getAttribute(globalAciType);
validAcis = addAciAttributeList(aciList, DN.rootDN(), configDN,
attributeList, failedACIMsgs);
@@ -213,7 +213,7 @@
if(hasAci) {
List<Attribute> attributeList = entry.getAttribute(aciType);
- validAcis += addAciAttributeList(aciList, entry.getDN(), configDN,
+ validAcis += addAciAttributeList(aciList, entry.getName(), configDN,
attributeList, failedACIMsgs);
}
}
@@ -298,16 +298,16 @@
LinkedList<Message>failedACIMsgs=new LinkedList<Message>();
//Process "aci" attribute types.
if(hasAci) {
- aciList.remove(oldEntry.getDN());
+ aciList.remove(oldEntry.getName());
List<Attribute> attributeList =
newEntry.getOperationalAttribute(aciType);
- addAciAttributeList(aciList,newEntry.getDN(), configDN,
+ addAciAttributeList(aciList,newEntry.getName(), configDN,
attributeList, failedACIMsgs);
}
//Process global "ds-cfg-global-aci" attribute type. The oldentry
//DN is checked to verify it is equal to the config DN. If not those
//attributes are skipped.
- if(hasGlobalAci && oldEntry.getDN().equals(configDN)) {
+ if(hasGlobalAci && oldEntry.getName().equals(configDN)) {
aciList.remove(DN.rootDN());
List<Attribute> attributeList =
newEntry.getAttribute(globalAciType);
@@ -354,7 +354,7 @@
*/
public boolean removeAci(Entry entry, boolean hasAci,
boolean hasGlobalAci) {
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
lock.writeLock().lock();
try
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
index 420bc16..f2455df 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -138,7 +138,7 @@
Entry entry = modifyDNOperation.getUpdatedEntry();
if (entry != null)
{
- doPostModifyDN(entry.getDN(), entry.getDN());
+ doPostModifyDN(entry.getName(), entry.getName());
}
}
@@ -208,8 +208,8 @@
// has been a change.
if (modifyDNOperation.getResultCode() == ResultCode.SUCCESS)
{
- doPostModifyDN(modifyDNOperation.getOriginalEntry().getDN(),
- modifyDNOperation.getUpdatedEntry().getDN());
+ doPostModifyDN(modifyDNOperation.getOriginalEntry().getName(),
+ modifyDNOperation.getUpdatedEntry().getName());
}
// If we've gotten here, then everything is acceptable.
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
index cefcd7c..77b5201 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -555,7 +555,7 @@
public static boolean isTargetApplicable(Aci aci,
AciTargetMatchContext matchCtx) {
return isTargetApplicable(aci, aci.getTargets(),
- matchCtx.getResourceEntry().getDN());
+ matchCtx.getResourceEntry().getName());
}
/*
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
index 26b6c14..437c1af 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
@@ -547,7 +547,7 @@
{
// Make sure that the target entry does not already exist, but that its
// parent does exist (or that the entry being added is the base DN).
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if (entryMap.containsKey(entryDN))
{
Message m = ERR_LDIF_BACKEND_ADD_ALREADY_EXISTS.get(entryDN.toString());
@@ -752,7 +752,7 @@
try
{
// Make sure that the target entry exists. If not, then fail.
- DN entryDN = newEntry.getDN();
+ DN entryDN = newEntry.getName();
if (! entryMap.containsKey(entryDN))
{
DN matchedDN = null;
@@ -798,7 +798,7 @@
{
// Make sure that the original entry exists and that the new entry doesn't
// exist but its parent does.
- DN newDN = entry.getDN();
+ DN newDN = entry.getName();
if (! entryMap.containsKey(currentDN))
{
DN matchedDN = null;
@@ -1062,7 +1062,7 @@
{
for (Entry entry : entryMap.values())
{
- entryDN = entry.getDN();
+ entryDN = entry.getName();
ldifWriter.writeEntry(entry);
}
}
@@ -1171,7 +1171,7 @@
// Make sure that we don't already have an entry with the same DN. If
// a duplicate is encountered, then log a message and continue.
- DN entryDN = e.getDN();
+ DN entryDN = e.getName();
if (entryMap.containsKey(entryDN))
{
Message m = ERR_LDIF_BACKEND_DUPLICATE_ENTRY.get(ldifFilePath,
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
index bae0832..7919de5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends;
@@ -411,7 +412,7 @@
Entry e = entry.duplicate(false);
// See if the target entry already exists. If so, then fail.
- DN entryDN = e.getDN();
+ DN entryDN = e.getName();
if (entryMap.containsKey(entryDN))
{
Message message =
@@ -553,7 +554,7 @@
Entry e = newEntry.duplicate(false);
// Make sure the entry exists. If not, then throw an exception.
- DN entryDN = e.getDN();
+ DN entryDN = e.getName();
if (! entryMap.containsKey(entryDN))
{
Message message =
@@ -606,10 +607,10 @@
// Make sure that no entry exists with the new DN.
- if (entryMap.containsKey(e.getDN()))
+ if (entryMap.containsKey(e.getName()))
{
- Message message =
- ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(String.valueOf(e.getDN()));
+ Message message = ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(
+ String.valueOf(e.getName()));
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
@@ -618,7 +619,7 @@
boolean matchFound = false;
for (DN dn : baseDNs)
{
- if (dn.isAncestorOf(e.getDN()))
+ if (dn.isAncestorOf(e.getName()))
{
matchFound = true;
break;
@@ -634,7 +635,7 @@
// Make sure that the parent of the new entry exists.
- DN parentDN = e.getDN().getParentDNInSuffix();
+ DN parentDN = e.getName().getParentDNInSuffix();
if ((parentDN == null) || (! entryMap.containsKey(parentDN)))
{
Message message = ERR_MEMORYBACKEND_RENAME_PARENT_DOESNT_EXIST.get(
@@ -781,7 +782,7 @@
{
for (Entry entry : entryMap.values())
{
- entryDN = entry.getDN();
+ entryDN = entry.getName();
ldifWriter.writeEntry(entry);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
index bf862f1..17f883a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java
@@ -118,7 +118,7 @@
throws DirectoryException
{
final Message message = ERR_MONITOR_ADD_NOT_SUPPORTED.get(String
- .valueOf(entry.getDN()));
+ .valueOf(entry.getName()));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
@@ -717,7 +717,7 @@
final ModifyOperation modifyOperation) throws DirectoryException
{
final Message message = ERR_MONITOR_MODIFY_NOT_SUPPORTED.get(
- String.valueOf(newEntry.getDN()), String.valueOf(configEntryDN));
+ String.valueOf(newEntry.getName()), String.valueOf(configEntryDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
index ea15978..0d4061c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -1062,7 +1062,7 @@
throws DirectoryException
{
Message message =
- ERR_ROOTDSE_ADD_NOT_SUPPORTED.get(String.valueOf(entry.getDN()));
+ ERR_ROOTDSE_ADD_NOT_SUPPORTED.get(String.valueOf(entry.getName()));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
@@ -1090,7 +1090,7 @@
ModifyOperation modifyOperation) throws DirectoryException
{
Message message = ERR_ROOTDSE_MODIFY_NOT_SUPPORTED.get(
- String.valueOf(newEntry.getDN()), String.valueOf(configEntryDN));
+ String.valueOf(newEntry.getName()), String.valueOf(configEntryDN));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
index 0df87c6..7666dc4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -1091,7 +1091,7 @@
throws DirectoryException
{
Message message =
- ERR_SCHEMA_ADD_NOT_SUPPORTED.get(String.valueOf(entry.getDN()));
+ ERR_SCHEMA_ADD_NOT_SUPPORTED.get(String.valueOf(entry.getName()));
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
index 517d35a..ede21c5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -627,7 +627,7 @@
public void addEntry(Entry entry, AddOperation addOperation)
throws DirectoryException
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if (entryDN.equals(baseDN))
{
@@ -1571,7 +1571,7 @@
private void addCertificate(Entry entry)
throws DirectoryException
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
// Make sure that the DN specifies a certificate alias.
AttributeType t =
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
index d830d56..12e86a3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -682,7 +682,7 @@
{
checkDiskSpace(addOperation);
writerBegin();
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
EntryContainer ec;
if (rootContainer != null)
@@ -769,7 +769,7 @@
checkDiskSpace(modifyOperation);
writerBegin();
- DN entryDN = newEntry.getDN();
+ DN entryDN = newEntry.getName();
EntryContainer ec;
if (rootContainer != null)
{
@@ -826,7 +826,7 @@
message);
}
- EntryContainer container = rootContainer.getEntryContainer(entry.getDN());
+ EntryContainer container = rootContainer.getEntryContainer(entry.getName());
if (currentContainer != container)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
index 384ba5a..60cfc0f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java
@@ -287,7 +287,7 @@
List<Modification> mods)
throws DatabaseException
{
- DN entryDN = before.getDN();
+ DN entryDN = before.getName();
for (Modification mod : mods)
{
Attribute modAttr = mod.getAttribute();
@@ -374,7 +374,7 @@
Set<String> labeledURIs = entry.getReferralURLs();
if (labeledURIs != null)
{
- DN dn = entry.getDN();
+ DN dn = entry.getName();
for (String labeledURI : labeledURIs)
{
if(!insert(txn, dn, labeledURI))
@@ -400,7 +400,7 @@
Set<String> labeledURIs = entry.getReferralURLs();
if (labeledURIs != null)
{
- delete(txn, entry.getDN());
+ delete(txn, entry.getName());
}
}
@@ -421,7 +421,7 @@
Set<String> referralURLs = entry.getReferralURLs();
if (referralURLs != null)
{
- throwReferralException(entry.getDN(), entry.getDN(), referralURLs,
+ throwReferralException(entry.getName(), entry.getName(), referralURLs,
searchScope);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
index bb2678d..859016c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -303,7 +304,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ex);
}
Message message = ERR_CACHE_PRELOAD_ENTRY_FAILED.get(
- entry.getDN().toNormalizedString(),
+ entry.getName().toNormalizedString(),
(ex.getCause() != null ? ex.getCause().getMessage() :
stackTraceToSingleLineString(ex)));
logError(message);
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index fbf60d8..f97594e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -1523,7 +1523,7 @@
if (entry != null)
{
boolean isInScope = false;
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if (candidatesAreInScope)
{
@@ -1646,15 +1646,15 @@
throws DatabaseException, DirectoryException, CanceledOperationException
{
Transaction txn = beginTransaction();
- DN parentDN = getParentWithinBase(entry.getDN());
+ DN parentDN = getParentWithinBase(entry.getName());
try
{
// Check whether the entry already exists.
- if (dn2id.get(txn, entry.getDN(), LockMode.DEFAULT) != null)
+ if (dn2id.get(txn, entry.getName(), LockMode.DEFAULT) != null)
{
Message message =
- ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getDN().toString());
+ ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
}
@@ -1664,14 +1664,14 @@
if (parentDN != null)
{
// Check for referral entries above the target.
- dn2uri.targetEntryReferrals(entry.getDN(), null);
+ dn2uri.targetEntryReferrals(entry.getName(), null);
// Read the parent ID from dn2id.
parentID = dn2id.get(txn, parentDN, LockMode.DEFAULT);
if (parentID == null)
{
Message message = ERR_JEB_ADD_NO_SUCH_OBJECT.get(
- entry.getDN().toString());
+ entry.getName().toString());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
message, matchedDN, null);
@@ -1681,11 +1681,11 @@
EntryID entryID = rootContainer.getNextEntryID();
// Insert into dn2id.
- if (!dn2id.insert(txn, entry.getDN(), entryID))
+ if (!dn2id.insert(txn, entry.getName(), entryID))
{
// Do not ever expect to come through here.
Message message =
- ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getDN().toString());
+ ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
}
@@ -1695,7 +1695,7 @@
{
// Do not ever expect to come through here.
Message message =
- ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getDN().toString());
+ ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
}
@@ -1705,7 +1705,7 @@
{
// Do not ever expect to come through here.
Message message =
- ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getDN().toString());
+ ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
}
@@ -2135,7 +2135,7 @@
EntryCache<?> entryCache = DirectoryServer.getEntryCache();
if (entryCache != null)
{
- entryCache.removeEntry(entry.getDN());
+ entryCache.removeEntry(entry.getName());
}
}
@@ -2261,12 +2261,12 @@
try
{
// Read dn2id.
- EntryID entryID = dn2id.get(txn, newEntry.getDN(), LockMode.RMW);
+ EntryID entryID = dn2id.get(txn, newEntry.getName(), LockMode.RMW);
if (entryID == null)
{
// The entry does not exist.
Message message =
- ERR_JEB_MODIFY_NO_SUCH_OBJECT.get(newEntry.getDN().toString());
+ ERR_JEB_MODIFY_NO_SUCH_OBJECT.get(newEntry.getName().toString());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
message, matchedDN, null);
@@ -2380,7 +2380,7 @@
{
Transaction txn = beginTransaction();
DN oldSuperiorDN = getParentWithinBase(currentDN);
- DN newSuperiorDN = getParentWithinBase(entry.getDN());
+ DN newSuperiorDN = getParentWithinBase(entry.getName());
boolean isApexEntryMoved;
if(oldSuperiorDN != null)
@@ -2401,11 +2401,11 @@
try
{
// Check whether the renamed entry already exists.
- if (!currentDN.equals(entry.getDN()) &&
- dn2id.get(txn, entry.getDN(), LockMode.DEFAULT) != null)
+ if (!currentDN.equals(entry.getName()) &&
+ dn2id.get(txn, entry.getName(), LockMode.DEFAULT) != null)
{
Message message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
- entry.getDN().toString());
+ entry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
}
@@ -2472,7 +2472,7 @@
"Old entry ID: %d " +
"New entry ID: %d " +
"New Superior ID: %d" +
- oldApexEntry.getDN(), entry.getDN(),
+ oldApexEntry.getName(), entry.getName(),
oldApexID.longValue(), newApexID.longValue(),
newSuperiorID.longValue());
}
@@ -2540,9 +2540,9 @@
Entry oldEntry = id2entry.get(txn, oldID, LockMode.DEFAULT);
// Construct the new DN of the entry.
- DN newDN = modDN(oldEntry.getDN(),
+ DN newDN = modDN(oldEntry.getName(),
currentDN.size(),
- entry.getDN());
+ entry.getName());
// Assign a new entry ID if we are renumbering.
EntryID newID = oldID;
@@ -2558,7 +2558,7 @@
"New DN: %s " +
"Old entry ID: %d " +
"New entry ID: %d",
- oldEntry.getDN(), newDN, oldID.longValue(),
+ oldEntry.getName(), newDN, oldID.longValue(),
newID.longValue());
}
}
@@ -2663,10 +2663,10 @@
ModifyDNOperation modifyDNOperation)
throws DirectoryException, DatabaseException
{
- if (!dn2id.insert(txn, newEntry.getDN(), newID))
+ if (!dn2id.insert(txn, newEntry.getName(), newID))
{
Message message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
- newEntry.getDN().toString());
+ newEntry.getName().toString());
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
message);
}
@@ -2685,7 +2685,7 @@
EntryID parentID;
byte[] parentIDKeyBytes;
boolean isParent = true;
- for (DN dn = getParentWithinBase(newEntry.getDN()); dn != null;
+ for (DN dn = getParentWithinBase(newEntry.getName()); dn != null;
dn = getParentWithinBase(dn))
{
parentID = dn2id.get(txn, dn, LockMode.DEFAULT);
@@ -2710,7 +2710,7 @@
MovedEntry tail)
throws DirectoryException, DatabaseException
{
- DN oldDN = oldEntry.getDN();
+ DN oldDN = oldEntry.getName();
// Remove the old DN from dn2id.
dn2id.remove(txn, oldDN);
@@ -2783,7 +2783,7 @@
MovedEntry tail)
throws DirectoryException, DatabaseException
{
- DN oldDN = oldEntry.getDN();
+ DN oldDN = oldEntry.getName();
Entry newEntry = oldEntry.duplicate(false);
newEntry.setDN(newDN);
List<Modification> modifications =
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
index f21b7b3..9914f77 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -300,7 +300,7 @@
public boolean addEntry(Transaction txn, EntryID entryID, Entry entry)
throws DatabaseException, DirectoryException, JebException
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if(entryDN.matchesBaseAndScope(baseDN, scope) && filter.matchesEntry(entry))
{
return insertValues(txn, entryID.longValue(), entry);
@@ -322,7 +322,7 @@
public boolean addEntry(IndexBuffer buffer, EntryID entryID, Entry entry)
throws DirectoryException
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if(entryDN.matchesBaseAndScope(baseDN, scope) && filter.matchesEntry(entry))
{
SortValues sortValues = new SortValues(entryID, entry, sortOrder);
@@ -370,7 +370,7 @@
public boolean removeEntry(Transaction txn, EntryID entryID, Entry entry)
throws DatabaseException, DirectoryException, JebException
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if(entryDN.matchesBaseAndScope(baseDN, scope) && filter.matchesEntry(entry))
{
return removeValues(txn, entryID.longValue(), entry);
@@ -391,7 +391,7 @@
public boolean removeEntry(IndexBuffer buffer, EntryID entryID, Entry entry)
throws DirectoryException
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if(entryDN.matchesBaseAndScope(baseDN, scope) && filter.matchesEntry(entry))
{
SortValues sortValues = new SortValues(entryID, entry, sortOrder);
@@ -448,8 +448,8 @@
List<Modification> mods)
throws DatabaseException, DirectoryException, JebException
{
- DN oldEntryDN = oldEntry.getDN();
- DN newEntryDN = newEntry.getDN();
+ DN oldEntryDN = oldEntry.getName();
+ DN newEntryDN = newEntry.getName();
if(oldEntryDN.matchesBaseAndScope(baseDN, scope) &&
filter.matchesEntry(oldEntry))
{
@@ -540,8 +540,8 @@
List<Modification> mods)
throws DatabaseException, DirectoryException
{
- DN oldEntryDN = oldEntry.getDN();
- DN newEntryDN = newEntry.getDN();
+ DN oldEntryDN = oldEntry.getName();
+ DN newEntryDN = newEntry.getName();
if(oldEntryDN.matchesBaseAndScope(baseDN, scope) &&
filter.matchesEntry(oldEntry))
{
@@ -1682,7 +1682,7 @@
*/
public boolean shouldInclude(Entry entry) throws DirectoryException
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if(entryDN.matchesBaseAndScope(baseDN, scope) && filter.matchesEntry(entry))
{
return true;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 1037ad7..e60dbf4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -632,7 +632,7 @@
else
{
if (!Arrays.equals(JebFormat.dnToDNKey(
- entry.getDN(), verifyConfig.getBaseDN().size()),
+ entry.getName(), verifyConfig.getBaseDN().size()),
key.getData()))
{
errorCount++;
@@ -640,7 +640,7 @@
{
TRACER.debugError("File dn2id has DN <%s> referencing entry " +
"with wrong DN <%s>%n", new String(key.getData()),
- entry.getDN().toNormalizedString());
+ entry.getName().toNormalizedString());
}
}
}
@@ -769,17 +769,17 @@
continue;
}
- if (!childEntry.getDN().isDescendantOf(entry.getDN()) ||
- childEntry.getDN().size() !=
- entry.getDN().size() + 1)
+ if (!childEntry.getName().isDescendantOf(entry.getName()) ||
+ childEntry.getName().size() !=
+ entry.getName().size() + 1)
{
errorCount++;
if (debugEnabled())
{
TRACER.debugError("File id2children has ID %d with DN <%s> " +
"referencing ID %d with non-child DN <%s>%n",
- entryID.longValue(), entry.getDN().toString(),
- id.longValue(), childEntry.getDN().toString());
+ entryID.longValue(), entry.getName().toString(),
+ id.longValue(), childEntry.getName().toString());
}
}
}
@@ -908,7 +908,7 @@
continue;
}
- if (!subordEntry.getDN().isDescendantOf(entry.getDN()))
+ if (!subordEntry.getName().isDescendantOf(entry.getName()))
{
errorCount++;
if (debugEnabled())
@@ -916,8 +916,8 @@
TRACER.debugError("File id2subtree has ID %d with DN <%s> " +
"referencing ID %d with non-subordinate " +
"DN <%s>%n",
- entryID.longValue(), entry.getDN().toString(),
- id.longValue(), subordEntry.getDN().toString());
+ entryID.longValue(), entry.getName().toString(),
+ id.longValue(), subordEntry.getName().toString());
}
}
}
@@ -1241,7 +1241,8 @@
if (debugEnabled())
{
TRACER.debugError("Reference to entry "
- + "<%s> which does not match the value%n%s", entry.getDN(),
+ + "<%s> which does not match the value%n%s",
+ entry.getName(),
keyDump(index, value));
}
}
@@ -1286,7 +1287,7 @@
*/
private void verifyDN2ID(EntryID entryID, Entry entry)
{
- DN dn = entry.getDN();
+ DN dn = entry.getName();
// Check the ID is in dn2id with the correct DN.
try
@@ -1366,7 +1367,7 @@
*/
private void verifyID2Children(EntryID entryID, Entry entry)
{
- DN dn = entry.getDN();
+ DN dn = entry.getName();
DN parentDN = getParent(dn);
if (parentDN != null)
@@ -1441,7 +1442,7 @@
*/
private void verifyID2Subtree(EntryID entryID, Entry entry)
{
- for (DN dn = getParent(entry.getDN()); dn != null; dn = getParent(dn))
+ for (DN dn = getParent(entry.getName()); dn != null; dn = getParent(dn))
{
EntryID id = null;
try
@@ -1601,7 +1602,7 @@
TRACER.debugError("Error normalizing values of attribute %s in " +
"entry <%s>: %s.%n",
attrIndex.getAttributeType().toString(),
- entry.getDN().toString(),
+ entry.getName().toString(),
String.valueOf(e.getMessageObject()));
}
}
@@ -1619,7 +1620,7 @@
if(debugEnabled())
{
TRACER.debugError("Missing entry %s in VLV index %s",
- entry.getDN().toString(),
+ entry.getName().toString(),
vlvIndex.getName());
}
errorCount++;
@@ -1634,7 +1635,7 @@
TRACER.debugError("Error checking entry %s against filter or " +
"base DN for VLV index %s: %s",
- entry.getDN().toString(),
+ entry.getName().toString(),
vlvIndex.getName(),
String.valueOf(e.getMessageObject()));
}
@@ -1648,7 +1649,7 @@
TRACER.debugError("Error reading VLV index %s for entry %s: %s",
vlvIndex.getName(),
- entry.getDN().toString(),
+ entry.getName().toString(),
StaticUtils.getBacktrace(e));
}
errorCount++;
@@ -1661,7 +1662,7 @@
TRACER.debugError("Error reading VLV index %s for entry %s: %s",
vlvIndex.getName(),
- entry.getDN().toString(),
+ entry.getName().toString(),
StaticUtils.getBacktrace(e));
}
errorCount++;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index a27440d..6551bfa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -1512,7 +1512,7 @@
DirectoryException, JebException, InterruptedException
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
DN2ID dn2id = suffix.getDN2ID();
EntryID oldID = dn2id.get(null, entryDN, LockMode.DEFAULT);
if (oldID != null)
@@ -1640,7 +1640,7 @@
InterruptedException
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if (!skipDNValidation)
{
if (!dnSanityCheck(entryDN, entry, suffix))
@@ -3952,7 +3952,7 @@
{
if (dn2id != null)
{
- processDN2ID(suffix, entry.getDN(), entryID);
+ processDN2ID(suffix, entry.getName(), entryID);
}
if (dn2uri != null)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java
index 2b91d0f..f7303ff 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.task;
import java.text.SimpleDateFormat;
@@ -154,7 +155,7 @@
{
this.taskScheduler = taskScheduler;
this.recurringTaskEntry = recurringTaskEntry;
- this.recurringTaskEntryDN = recurringTaskEntry.getDN();
+ this.recurringTaskEntryDN = recurringTaskEntry.getName();
// Get the recurring task ID from the entry. If there isn't one, then fail.
AttributeType attrType = DirectoryServer.getAttributeType(
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
index 7bee472..53cc7bb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.task;
@@ -179,7 +180,7 @@
{
this.taskScheduler = taskScheduler;
this.taskEntry = taskEntry;
- this.taskEntryDN = taskEntry.getDN();
+ this.taskEntryDN = taskEntry.getName();
String taskDN = taskEntryDN.toString();
@@ -196,7 +197,7 @@
if (recurringTaskID == null)
{
Message message = ERR_TASK_MISSING_ATTR.get(
- String.valueOf(taskEntry.getDN()), ATTR_TASK_ID);
+ String.valueOf(taskEntry.getName()), ATTR_TASK_ID);
throw new InitializationException(message);
}
else
@@ -388,7 +389,7 @@
if (isRequired)
{
Message message = ERR_TASK_MISSING_ATTR.get(
- String.valueOf(taskEntry.getDN()), attributeName);
+ String.valueOf(taskEntry.getName()), attributeName);
throw new InitializationException(message);
}
else
@@ -400,7 +401,7 @@
if (attrList.size() > 1)
{
Message message = ERR_TASK_MULTIPLE_ATTRS_FOR_TYPE.get(
- attributeName, String.valueOf(taskEntry.getDN()));
+ attributeName, String.valueOf(taskEntry.getName()));
throw new InitializationException(message);
}
@@ -410,7 +411,7 @@
if (isRequired)
{
Message message = ERR_TASK_NO_VALUES_FOR_ATTR.get(
- attributeName, String.valueOf(taskEntry.getDN()));
+ attributeName, String.valueOf(taskEntry.getName()));
throw new InitializationException(message);
}
else
@@ -423,7 +424,7 @@
if (iterator.hasNext())
{
Message message = ERR_TASK_MULTIPLE_VALUES_FOR_ATTR.get(
- attributeName, String.valueOf(taskEntry.getDN()));
+ attributeName, String.valueOf(taskEntry.getName()));
throw new InitializationException(message);
}
@@ -460,7 +461,7 @@
if (attrList.size() > 1)
{
Message message = ERR_TASK_MULTIPLE_ATTRS_FOR_TYPE.get(
- attributeName, String.valueOf(taskEntry.getDN()));
+ attributeName, String.valueOf(taskEntry.getName()));
throw new InitializationException(message);
}
@@ -1160,7 +1161,7 @@
taskState = TaskState.STOPPED_BY_ERROR;
Message message = ERR_TASK_EXECUTE_FAILED.get(
- String.valueOf(taskEntry.getDN()), stackTraceToSingleLineString(e));
+ String.valueOf(taskEntry.getName()), stackTraceToSingleLineString(e));
logError(message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
index 9f9df48..59e2095 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -533,7 +533,7 @@
Entry e = entry.duplicate(false);
// Get the DN for the entry and then get its parent.
- DN entryDN = e.getDN();
+ DN entryDN = e.getName();
DN parentDN = entryDN.getParentDNInSuffix();
if (parentDN == null)
@@ -660,7 +660,7 @@
public void replaceEntry(Entry oldEntry, Entry newEntry,
ModifyOperation modifyOperation) throws DirectoryException
{
- DN entryDN = newEntry.getDN();
+ DN entryDN = newEntry.getName();
Lock entryLock = null;
if (! taskScheduler.holdsSchedulerLock())
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java
index 7370743..46d9c81 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.backends.task;
@@ -1117,7 +1117,7 @@
break;
}
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if (entryDN.equals(taskBackend.getTaskRootDN()))
{
taskRootEntry = entry;
@@ -1611,7 +1611,7 @@
{
for (Task t : tasks.values())
{
- if (taskEntryDN.equals(t.getTaskEntry().getDN()))
+ if (taskEntryDN.equals(t.getTaskEntry().getName()))
{
return t;
}
@@ -1721,7 +1721,7 @@
{
Entry taskEntry = task.getTaskEntry();
- if (scheduledTaskEntryDN.equals(taskEntry.getDN()))
+ if (scheduledTaskEntryDN.equals(taskEntry.getName()))
{
return taskEntry.duplicate(true);
}
@@ -1836,7 +1836,7 @@
{
for (RecurringTask rt : recurringTasks.values())
{
- if (recurringTaskEntryDN.equals(rt.getRecurringTaskEntry().getDN()))
+ if (recurringTaskEntryDN.equals(rt.getRecurringTaskEntry().getName()))
{
return rt;
}
@@ -1872,7 +1872,7 @@
{
Entry recurringTaskEntry = recurringTask.getRecurringTaskEntry();
- if (recurringTaskEntryDN.equals(recurringTaskEntry.getDN()))
+ if (recurringTaskEntryDN.equals(recurringTaskEntry.getName()))
{
return recurringTaskEntry.duplicate(true);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java
index 5fb4ca3..5ec235c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.backends.task;
@@ -217,7 +217,7 @@
Task task = getAssociatedTask();
Message message = ERR_TASK_EXECUTE_FAILED.
- get(String.valueOf(task.getTaskEntry().getDN()),
+ get(String.valueOf(task.getTaskEntry().getName()),
stackTraceToSingleLineString(e));
logError(message);
task.setTaskState(TaskState.STOPPED_BY_ERROR);
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
index 614251e..bef00b5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
@@ -148,7 +149,7 @@
*/
public DN getDN()
{
- return entry.getDN();
+ return entry.getName();
}
@@ -350,7 +351,7 @@
if (conflictingChild != null)
{
Message message = ERR_CONFIG_ENTRY_CONFLICTING_CHILD.get(
- conflictingChild.getDN().toString(), entry.getDN().toString());
+ conflictingChild.getDN().toString(), entry.getName().toString());
throw new ConfigException(message);
}
}
@@ -382,14 +383,14 @@
if (childEntry == null)
{
Message message = ERR_CONFIG_ENTRY_NO_SUCH_CHILD.get(
- childDN.toString(), entry.getDN().toString());
+ childDN.toString(), entry.getName().toString());
throw new ConfigException(message);
}
if (childEntry.hasChildren())
{
Message message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_NONLEAF.get(
- childDN.toString(), entry.getDN().toString());
+ childDN.toString(), entry.getName().toString());
throw new ConfigException(message);
}
@@ -408,7 +409,7 @@
}
Message message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_CHILD.
- get(String.valueOf(childDN), String.valueOf(entry.getDN()),
+ get(String.valueOf(childDN), String.valueOf(entry.getName()),
stackTraceToSingleLineString(e));
throw new ConfigException(message, e);
}
@@ -562,6 +563,6 @@
@Override
public String toString()
{
- return entry.getDN().toNormalizedString();
+ return entry.getName().toNormalizedString();
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java b/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
index fbc5d69..679b1c0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
@@ -320,7 +320,7 @@
if (state.isDisabled())
{
Message message = ERR_PROXYAUTH1_UNUSABLE_ACCOUNT.get(String
- .valueOf(userEntry.getDN()));
+ .valueOf(userEntry.getName()));
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java b/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
index 6c14d69..45108fc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -328,7 +328,7 @@
if (state.isDisabled())
{
Message message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(String
- .valueOf(userEntry.getDN()));
+ .valueOf(userEntry.getName()));
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
}
@@ -342,7 +342,7 @@
pwpState.isPasswordExpired())
{
Message message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(String
- .valueOf(userEntry.getDN()));
+ .valueOf(userEntry.getName()));
throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED,
message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AuthenticatedUsers.java b/opendj3-server-dev/src/server/org/opends/server/core/AuthenticatedUsers.java
index 0bcdd40..193b531 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AuthenticatedUsers.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AuthenticatedUsers.java
@@ -220,7 +220,7 @@
lock.writeLock().lock();
try
{
- userMap.removeSubtree(entry.getDN(), arraySet);
+ userMap.removeSubtree(entry.getName(), arraySet);
}
finally
{
@@ -232,7 +232,7 @@
for (ClientConnection conn : connectionSet)
{
Message message = WARN_CLIENTCONNECTION_DISCONNECT_DUE_TO_DELETE.get(
- String.valueOf(entry.getDN()));
+ String.valueOf(entry.getName()));
conn.disconnect(DisconnectReason.INVALID_CREDENTIALS, true, message);
}
@@ -261,7 +261,7 @@
try
{
CopyOnWriteArraySet<ClientConnection> connectionSet =
- userMap.get(oldEntry.getDN());
+ userMap.get(oldEntry.getName());
if (connectionSet != null)
{
for (ClientConnection conn : connectionSet)
@@ -291,8 +291,8 @@
PostResponseModifyDNOperation modifyDNOperation,
Entry oldEntry, Entry newEntry)
{
- String oldDNString = oldEntry.getDN().toNormalizedString();
- String newDNString = newEntry.getDN().toNormalizedString();
+ String oldDNString = oldEntry.getName().toNormalizedString();
+ String newDNString = newEntry.getName().toNormalizedString();
// Identify any client connections that may be authenticated
// or authorized as the user whose entry has been modified
@@ -302,7 +302,7 @@
{
Set<CopyOnWriteArraySet<ClientConnection>> arraySet =
new HashSet<CopyOnWriteArraySet<ClientConnection>>();
- userMap.removeSubtree(oldEntry.getDN(), arraySet);
+ userMap.removeSubtree(oldEntry.getName(), arraySet);
for (CopyOnWriteArraySet<ClientConnection>
connectionSet : arraySet)
{
@@ -359,7 +359,7 @@
}
}
if ((newAuthNDN != null) && (authNDN != null) &&
- authNDN.isDescendantOf(oldEntry.getDN()))
+ authNDN.isDescendantOf(oldEntry.getName()))
{
if (newAuthNSet == null)
{
@@ -369,7 +369,7 @@
newAuthNSet.add(conn);
}
if ((newAuthZDN != null) && (authZDN != null) &&
- authZDN.isDescendantOf(oldEntry.getDN()))
+ authZDN.isDescendantOf(oldEntry.getName()))
{
if (newAuthZSet == null)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java b/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
index 31fa61b..5f9945e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java
@@ -659,7 +659,7 @@
try
{
Group groupInstance = groupImplementation.newInstance(entry);
- groupInstances.put(entry.getDN(), groupInstance);
+ groupInstances.put(entry.getName(), groupInstance);
refreshToken++;
}
catch (DirectoryException e)
@@ -761,7 +761,7 @@
lock.writeLock().lock();
try
{
- if (groupInstances.removeSubtree(entry.getDN(), null))
+ if (groupInstances.removeSubtree(entry.getName(), null))
{
refreshToken++;
}
@@ -791,7 +791,7 @@
lock.readLock().lock();
try
{
- if (!groupInstances.containsKey(oldEntry.getDN()))
+ if (!groupInstances.containsKey(oldEntry.getName()))
{
// If the modified entry is not in any group instance, it's probably
// not a group, exit fast
@@ -806,12 +806,12 @@
lock.writeLock().lock();
try
{
- if (groupInstances.containsKey(oldEntry.getDN()))
+ if (groupInstances.containsKey(oldEntry.getName()))
{
- if (! oldEntry.getDN().equals(newEntry.getDN()))
+ if (! oldEntry.getName().equals(newEntry.getName()))
{
// This should never happen, but check for it anyway.
- groupInstances.remove(oldEntry.getDN());
+ groupInstances.remove(oldEntry.getName());
}
createAndRegisterGroup(newEntry);
}
@@ -843,9 +843,9 @@
try
{
Set<Group> groupSet = new HashSet<Group>();
- groupInstances.removeSubtree(oldEntry.getDN(), groupSet);
- String oldDNString = oldEntry.getDN().toNormalizedString();
- String newDNString = newEntry.getDN().toNormalizedString();
+ groupInstances.removeSubtree(oldEntry.getName(), groupSet);
+ String oldDNString = oldEntry.getName().toNormalizedString();
+ String newDNString = newEntry.getName().toNormalizedString();
for (Group group : groupSet)
{
StringBuilder builder = new StringBuilder(
@@ -1024,7 +1024,7 @@
lock.writeLock().lock();
try
{
- groupInstances.put(entry.getDN(), groupInstance);
+ groupInstances.put(entry.getName(), groupInstance);
refreshToken++;
}
finally
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
index 6482af1..247d5b3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.core;
@@ -373,14 +373,14 @@
try
{
PasswordPolicy policy = new SubentryPasswordPolicy(new SubEntry(entry));
- DirectoryServer.registerAuthenticationPolicy(entry.getDN(), policy);
+ DirectoryServer.registerAuthenticationPolicy(entry.getName(), policy);
}
catch (Exception e)
{
if (debugEnabled())
{
TRACER.debugError("Could not create password policy subentry "
- + "DN %s: %s", entry.getDN().toString(),
+ + "DN %s: %s", entry.getName().toString(),
stackTraceToSingleLineString(e));
}
}
@@ -396,7 +396,7 @@
{
if (entry.isPasswordPolicySubentry())
{
- DirectoryServer.deregisterAuthenticationPolicy(entry.getDN());
+ DirectoryServer.deregisterAuthenticationPolicy(entry.getName());
}
}
@@ -409,7 +409,7 @@
{
if (oldEntry.isPasswordPolicySubentry())
{
- DirectoryServer.deregisterAuthenticationPolicy(oldEntry.getDN());
+ DirectoryServer.deregisterAuthenticationPolicy(oldEntry.getName());
}
if (newEntry.isPasswordPolicySubentry())
@@ -418,14 +418,15 @@
{
PasswordPolicy policy = new SubentryPasswordPolicy(new SubEntry(
newEntry));
- DirectoryServer.registerAuthenticationPolicy(newEntry.getDN(), policy);
+ DirectoryServer.registerAuthenticationPolicy(newEntry.getName(),
+ policy);
}
catch (Exception e)
{
if (debugEnabled())
{
TRACER.debugError("Could not create password policy subentry "
- + "DN %s: %s", newEntry.getDN().toString(),
+ + "DN %s: %s", newEntry.getName().toString(),
stackTraceToSingleLineString(e));
}
}
@@ -441,7 +442,7 @@
{
if (oldEntry.isPasswordPolicySubentry())
{
- DirectoryServer.deregisterAuthenticationPolicy(oldEntry.getDN());
+ DirectoryServer.deregisterAuthenticationPolicy(oldEntry.getName());
}
if (newEntry.isPasswordPolicySubentry())
@@ -450,14 +451,15 @@
{
PasswordPolicy policy = new SubentryPasswordPolicy(new SubEntry(
newEntry));
- DirectoryServer.registerAuthenticationPolicy(newEntry.getDN(), policy);
+ DirectoryServer.registerAuthenticationPolicy(newEntry.getName(),
+ policy);
}
catch (Exception e)
{
if (debugEnabled())
{
TRACER.debugError("Could not create password policy subentry "
- + "DN %s: %s", newEntry.getDN().toString(),
+ + "DN %s: %s", newEntry.getName().toString(),
stackTraceToSingleLineString(e));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
index b42b52f..2f02f0a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.core;
@@ -153,7 +153,7 @@
{
super(userEntry);
this.currentTime = currentTime;
- this.userDNString = userEntry.getDN().toString();
+ this.userDNString = userEntry.getName().toString();
this.passwordPolicy = policy;
}
@@ -3700,7 +3700,7 @@
// If this is a root user, or if the password policy says that we should
// ignore these problems, then log a warning message. Otherwise, cause
// the bind to fail.
- if ((DirectoryServer.isRootDN(userEntry.getDN()) ||
+ if ((DirectoryServer.isRootDN(userEntry.getName()) ||
(passwordPolicy.getStateUpdateFailurePolicy() ==
PasswordPolicyCfgDefn.StateUpdateFailurePolicy.IGNORE)))
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java b/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
index 3148ac9..75d2a3f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java
@@ -275,25 +275,26 @@
switch (scope)
{
case BASE_OBJECT:
- if (!baseDN.equals(entry.getDN()))
+ if (!baseDN.equals(entry.getName()))
{
return;
}
break;
case SINGLE_LEVEL:
- if (!baseDN.equals(entry.getDN().getParentDNInSuffix()))
+ if (!baseDN.equals(entry.getName().getParentDNInSuffix()))
{
return;
}
break;
case WHOLE_SUBTREE:
- if (!baseDN.isAncestorOf(entry.getDN()))
+ if (!baseDN.isAncestorOf(entry.getName()))
{
return;
}
break;
case SUBORDINATE_SUBTREE:
- if (baseDN.equals(entry.getDN()) || (!baseDN.isAncestorOf(entry.getDN())))
+ if (baseDN.equals(entry.getName()) || (!baseDN.isAncestorOf(
+ entry.getName())))
{
return;
}
@@ -391,25 +392,26 @@
switch (scope)
{
case BASE_OBJECT:
- if (!baseDN.equals(entry.getDN()))
+ if (!baseDN.equals(entry.getName()))
{
return;
}
break;
case SINGLE_LEVEL:
- if (!baseDN.equals(entry.getDN().getParentDNInSuffix()))
+ if (!baseDN.equals(entry.getName().getParentDNInSuffix()))
{
return;
}
break;
case WHOLE_SUBTREE:
- if (!baseDN.isAncestorOf(entry.getDN()))
+ if (!baseDN.isAncestorOf(entry.getName()))
{
return;
}
break;
case SUBORDINATE_SUBTREE:
- if (baseDN.equals(entry.getDN()) || (!baseDN.isAncestorOf(entry.getDN())))
+ if (baseDN.equals(entry.getName()) || (!baseDN.isAncestorOf(
+ entry.getName())))
{
return;
}
@@ -523,26 +525,26 @@
switch (scope)
{
case BASE_OBJECT:
- if (!baseDN.equals(oldEntry.getDN()))
+ if (!baseDN.equals(oldEntry.getName()))
{
return;
}
break;
case SINGLE_LEVEL:
- if (!baseDN.equals(oldEntry.getDN().parent()))
+ if (!baseDN.equals(oldEntry.getName().parent()))
{
return;
}
break;
case WHOLE_SUBTREE:
- if (!baseDN.isAncestorOf(oldEntry.getDN()))
+ if (!baseDN.isAncestorOf(oldEntry.getName()))
{
return;
}
break;
case SUBORDINATE_SUBTREE:
- if (baseDN.equals(oldEntry.getDN())
- || (!baseDN.isAncestorOf(oldEntry.getDN())))
+ if (baseDN.equals(oldEntry.getName())
+ || (!baseDN.isAncestorOf(oldEntry.getName())))
{
return;
}
@@ -646,7 +648,7 @@
{
case BASE_OBJECT:
oldMatches = baseDN.equals(oldDN);
- newMatches = baseDN.equals(entry.getDN());
+ newMatches = baseDN.equals(entry.getName());
if (!(oldMatches || newMatches))
{
@@ -656,7 +658,7 @@
break;
case SINGLE_LEVEL:
oldMatches = baseDN.equals(oldDN.parent());
- newMatches = baseDN.equals(entry.getDN().parent());
+ newMatches = baseDN.equals(entry.getName().parent());
if (!(oldMatches || newMatches))
{
@@ -666,7 +668,7 @@
break;
case WHOLE_SUBTREE:
oldMatches = baseDN.isAncestorOf(oldDN);
- newMatches = baseDN.isAncestorOf(entry.getDN());
+ newMatches = baseDN.isAncestorOf(entry.getName());
if (!(oldMatches || newMatches))
{
@@ -676,8 +678,8 @@
break;
case SUBORDINATE_SUBTREE:
oldMatches = ((!baseDN.equals(oldDN)) && baseDN.isAncestorOf(oldDN));
- newMatches = ((!baseDN.equals(entry.getDN())) && baseDN
- .isAncestorOf(entry.getDN()));
+ newMatches = ((!baseDN.equals(entry.getName())) && baseDN
+ .isAncestorOf(entry.getName()));
if (!(oldMatches || newMatches))
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
index 937ecbc..8777bf9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
@@ -1701,7 +1701,8 @@
Message message = ERR_PLUGIN_LDIF_IMPORT_PLUGIN_EXCEPTION.
get(String.valueOf(p.getPluginEntryDN()),
- String.valueOf(entry.getDN()), stackTraceToSingleLineString(e));
+ String.valueOf(entry.getName()),
+ stackTraceToSingleLineString(e));
logError(message);
return PluginResult.ImportLDIF.stopEntryProcessing(message);
@@ -1711,7 +1712,7 @@
{
Message message = ERR_PLUGIN_LDIF_IMPORT_PLUGIN_RETURNED_NULL.
get(String.valueOf(p.getPluginEntryDN()),
- String.valueOf(entry.getDN()));
+ String.valueOf(entry.getName()));
logError(message);
return PluginResult.ImportLDIF.stopEntryProcessing(message);
@@ -1800,7 +1801,8 @@
Message message = ERR_PLUGIN_LDIF_EXPORT_PLUGIN_EXCEPTION.
get(String.valueOf(p.getPluginEntryDN()),
- String.valueOf(entry.getDN()), stackTraceToSingleLineString(e));
+ String.valueOf(entry.getName()),
+ stackTraceToSingleLineString(e));
logError(message);
return PluginResult.ImportLDIF.stopEntryProcessing(message);
@@ -1810,7 +1812,7 @@
{
Message message = ERR_PLUGIN_LDIF_EXPORT_PLUGIN_RETURNED_NULL.
get(String.valueOf(p.getPluginEntryDN()),
- String.valueOf(entry.getDN()));
+ String.valueOf(entry.getName()));
logError(message);
return PluginResult.ImportLDIF.stopEntryProcessing(message);
@@ -4586,7 +4588,7 @@
get(String.valueOf(p.getPluginEntryDN()),
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
- String.valueOf(searchEntry.getDN()),
+ String.valueOf(searchEntry.getName()),
stackTraceToSingleLineString(e));
logError(message);
@@ -4600,7 +4602,7 @@
get(String.valueOf(p.getPluginEntryDN()),
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
- String.valueOf(searchEntry.getDN()));
+ String.valueOf(searchEntry.getName()));
logError(message);
return PluginResult.IntermediateResponse.stopProcessing(false,
@@ -4670,7 +4672,7 @@
get(String.valueOf(p.getPluginEntryDN()),
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
- String.valueOf(searchEntry.getDN()),
+ String.valueOf(searchEntry.getName()),
stackTraceToSingleLineString(e));
logError(message);
@@ -4684,7 +4686,7 @@
get(String.valueOf(p.getPluginEntryDN()),
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
- String.valueOf(searchEntry.getDN()));
+ String.valueOf(searchEntry.getName()));
logError(message);
return PluginResult.IntermediateResponse.stopProcessing(false,
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java b/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
index f18b48c..91fd2b5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java
@@ -225,7 +225,7 @@
dn2SubEntry.put(subDN, subList);
}
}
- dit2SubEntry.put(entry.getDN(), subEntry);
+ dit2SubEntry.put(entry.getName(), subEntry);
subList.add(subEntry);
}
finally
@@ -254,9 +254,9 @@
while (listIterator.hasNext())
{
SubEntry subEntry = listIterator.next();
- if (subEntry.getDN().equals(entry.getDN()))
+ if (subEntry.getDN().equals(entry.getName()))
{
- dit2SubEntry.remove(entry.getDN());
+ dit2SubEntry.remove(entry.getName());
listIterator.remove();
removed = true;
break;
@@ -280,9 +280,9 @@
while (listIterator.hasNext())
{
SubEntry subEntry = listIterator.next();
- if (subEntry.getDN().equals(entry.getDN()))
+ if (subEntry.getDN().equals(entry.getName()))
{
- dit2SubEntry.remove(entry.getDN());
+ dit2SubEntry.remove(entry.getName());
listIterator.remove();
removed = true;
break;
@@ -518,7 +518,7 @@
lock.readLock().lock();
try
{
- for (DN subDN = entry.getDN(); subDN != null;
+ for (DN subDN = entry.getName(); subDN != null;
subDN = subDN.parent())
{
List<SubEntry> subList = dn2SubEntry.get(subDN);
@@ -610,7 +610,7 @@
lock.readLock().lock();
try
{
- for (DN subDN = entry.getDN(); subDN != null;
+ for (DN subDN = entry.getName(); subDN != null;
subDN = subDN.parent())
{
List<SubEntry> subList = dn2CollectiveSubEntry.get(subDN);
@@ -779,7 +779,7 @@
lock.writeLock().lock();
try
{
- for (SubEntry subEntry : dit2SubEntry.getSubtree(entry.getDN()))
+ for (SubEntry subEntry : dit2SubEntry.getSubtree(entry.getName()))
{
removeSubEntry(subEntry.getEntry());
@@ -866,14 +866,14 @@
private void doPostModifyDN(Entry oldEntry, Entry newEntry)
{
- String oldDNString = oldEntry.getDN().toNormalizedString();
- String newDNString = newEntry.getDN().toNormalizedString();
+ String oldDNString = oldEntry.getName().toNormalizedString();
+ String newDNString = newEntry.getName().toNormalizedString();
lock.writeLock().lock();
try
{
Collection<SubEntry> setToDelete =
- dit2SubEntry.getSubtree(oldEntry.getDN());
+ dit2SubEntry.getSubtree(oldEntry.getName());
for (SubEntry subentry : setToDelete)
{
removeSubEntry(subentry.getEntry());
@@ -881,7 +881,7 @@
try
{
StringBuilder builder = new StringBuilder(
- subentry.getEntry().getDN().toNormalizedString());
+ subentry.getEntry().getName().toNormalizedString());
int oldDNIndex = builder.lastIndexOf(oldDNString);
builder.replace(oldDNIndex, builder.length(),
newDNString);
@@ -980,7 +980,7 @@
lock.readLock().lock();
try
{
- for (SubEntry subEntry : dit2SubEntry.getSubtree(entry.getDN()))
+ for (SubEntry subEntry : dit2SubEntry.getSubtree(entry.getName()))
{
if (!hasSubentryWritePrivilege)
{
@@ -1082,15 +1082,15 @@
{
Entry oldEntry = modifyDNOperation.getOriginalEntry();
Entry newEntry = modifyDNOperation.getUpdatedEntry();
- String oldDNString = oldEntry.getDN().toNormalizedString();
- String newDNString = newEntry.getDN().toNormalizedString();
+ String oldDNString = oldEntry.getName().toNormalizedString();
+ String newDNString = newEntry.getName().toNormalizedString();
boolean hasSubentryWritePrivilege = false;
lock.readLock().lock();
try
{
Collection<SubEntry> setToDelete =
- dit2SubEntry.getSubtree(oldEntry.getDN());
+ dit2SubEntry.getSubtree(oldEntry.getName());
for (SubEntry subentry : setToDelete)
{
if (!hasSubentryWritePrivilege)
@@ -1113,7 +1113,7 @@
try
{
StringBuilder builder = new StringBuilder(
- subentry.getEntry().getDN().toNormalizedString());
+ subentry.getEntry().getName().toNormalizedString());
int oldDNIndex = builder.lastIndexOf(oldDNString);
builder.replace(oldDNIndex, builder.length(),
newDNString);
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index fd6b9a9..6905c37 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -549,7 +549,7 @@
final Entry entry = new Entry(entryDN, null, null, null);
entry.addObjectClass(DirectoryServer.getTopObjectClass());
entry.addObjectClass(ocCertRequest);
- AddOperation addOperation = icc.processAdd(entry.getDN(),
+ AddOperation addOperation = icc.processAdd(entry.getName(),
entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
@@ -557,7 +557,7 @@
throw new DirectoryException(
addOperation.getResultCode(),
ERR_CRYPTOMGR_FAILED_TO_INITIATE_INSTANCE_KEY_GENERATION.get(
- entry.getDN().toString()));
+ entry.getName().toString()));
}
}
else {
@@ -697,7 +697,7 @@
entry.addAttribute(certificateAttr,
new ArrayList<AttributeValue>(0));
- AddOperation addOperation = icc.processAdd(entry.getDN(),
+ AddOperation addOperation = icc.processAdd(entry.getName(),
entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
@@ -705,7 +705,7 @@
throw new DirectoryException(
addOperation.getResultCode(),
ERR_CRYPTOMGR_FAILED_TO_ADD_INSTANCE_KEY_ENTRY_TO_ADS.get(
- entry.getDN().toString()));
+ entry.getName().toString()));
}
}
} catch (DirectoryException ex) {
@@ -1209,7 +1209,7 @@
{
throw new CryptoManagerException(
ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_DECODE.get(
- entry.getDN().toString()));
+ entry.getName().toString()));
}
secretKey = decodeSymmetricKeyAttribute(symmetricKey);
CipherKeyEntry.importCipherKeyEntry(this, keyID, transformation,
@@ -1226,13 +1226,13 @@
new Modification(ModificationType.ADD, attribute,
false));
ModifyOperation internalModify =
- internalConnection.processModify(entry.getDN(),
+ internalConnection.processModify(entry.getName(),
modifications);
if (internalModify.getResultCode() != ResultCode.SUCCESS)
{
throw new CryptoManagerException(
ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_ADD_KEY.get(
- entry.getDN().toString()));
+ entry.getName().toString()));
}
}
catch (DirectoryException ex)
@@ -1242,7 +1242,7 @@
}
throw new CryptoManagerException(
ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_OTHER.get(
- entry.getDN().toString(), ex.getMessage()), ex);
+ entry.getName().toString(), ex.getMessage()), ex);
}
}
@@ -1306,7 +1306,7 @@
{
throw new CryptoManagerException(
ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_DECODE.get(
- entry.getDN().toString()));
+ entry.getName().toString()));
}
secretKey = decodeSymmetricKeyAttribute(symmetricKey);
MacKeyEntry.importMacKeyEntry(this, keyID, algorithm,
@@ -1324,13 +1324,13 @@
new Modification(ModificationType.ADD, attribute,
false));
ModifyOperation internalModify =
- internalConnection.processModify(entry.getDN(),
+ internalConnection.processModify(entry.getName(),
modifications);
if (internalModify.getResultCode() != ResultCode.SUCCESS)
{
throw new CryptoManagerException(
ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_ADD_KEY.get(
- entry.getDN().toString()));
+ entry.getName().toString()));
}
}
else
@@ -1348,7 +1348,7 @@
}
throw new CryptoManagerException(
ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_OTHER.get(
- entry.getDN().toString(), ex.getMessage()), ex);
+ entry.getName().toString(), ex.getMessage()), ex);
}
}
@@ -1807,7 +1807,7 @@
{
throw new CryptoManagerException(
ERR_CRYPTOMGR_SYMMETRIC_KEY_ENTRY_ADD_FAILED.get(
- entry.getDN().toString(),
+ entry.getName().toString(),
addOperation.getErrorMessage()));
}
}
@@ -2352,7 +2352,7 @@
{
throw new CryptoManagerException(
ERR_CRYPTOMGR_SYMMETRIC_KEY_ENTRY_ADD_FAILED.get(
- entry.getDN().toString(),
+ entry.getName().toString(),
addOperation.getErrorMessage()));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
index 4d5ef60..b11ff90 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
@@ -301,7 +301,7 @@
private void handleInstanceKeySearchEntry(SearchResultEntry searchEntry)
throws DirectoryException
{
- RDN srcRDN = searchEntry.getDN().rdn();
+ RDN srcRDN = searchEntry.getName().rdn();
// Only process the entry if it has the expected form of RDN.
if (!srcRDN.isMultiValued() &&
@@ -416,7 +416,7 @@
{
// The trust store backend does not implement modify so we need to
// delete then add.
- DN dstDN = dstEntry.getDN();
+ DN dstDN = dstEntry.getName();
deleteEntry(dstDN);
addEntry(srcEntry, dstDN);
}
@@ -522,7 +522,7 @@
private void handleInstanceKeyAddOperation(Entry entry)
{
- RDN srcRDN = entry.getDN().rdn();
+ RDN srcRDN = entry.getName().rdn();
// Only process the entry if it has the expected form of RDN.
if (!srcRDN.isMultiValued() &&
@@ -548,7 +548,7 @@
return;
}
- RDN srcRDN = entry.getDN().rdn();
+ RDN srcRDN = entry.getName().rdn();
// Only process the entry if it has the expected form of RDN.
// FIXME: Technically it is possible to perform a subtree in
@@ -597,7 +597,7 @@
private void handleInstanceKeyModifyOperation(Entry newEntry)
{
- RDN srcRDN = newEntry.getDN().rdn();
+ RDN srcRDN = newEntry.getName().rdn();
// Only process the entry if it has the expected form of RDN.
if (!srcRDN.isMultiValued() &&
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
index f58fe94..2afc227 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -424,7 +424,7 @@
{
bindOperation.setResultCode(ResultCode.INAPPROPRIATE_AUTHENTICATION);
Message message = ERR_SASL_ACCOUNT_NOT_LOCAL
- .get(SASL_MECHANISM_CRAM_MD5, String.valueOf(userEntry.getDN()));
+ .get(SASL_MECHANISM_CRAM_MD5, String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
}
@@ -436,7 +436,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS.get(
- String.valueOf(userEntry.getDN()));
+ String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
}
@@ -446,7 +446,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLCRAMMD5_CANNOT_GET_REVERSIBLE_PASSWORDS.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
String.valueOf(e));
bindOperation.setAuthFailureReason(message);
return;
@@ -480,7 +480,7 @@
bindOperation.setResultCode(ResultCode.SUCCESS);
AuthenticationInfo authInfo = new AuthenticationInfo(userEntry,
- SASL_MECHANISM_CRAM_MD5, DirectoryServer.isRootDN(userEntry.getDN()));
+ SASL_MECHANISM_CRAM_MD5, DirectoryServer.isRootDN(userEntry.getName()));
bindOperation.setAuthenticationInfo(authInfo);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 72cb0f5..876039f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -396,10 +396,10 @@
try
{
DN configRootDN = DN.valueOf(DN_CONFIG_ROOT);
- if (! entry.getDN().equals(configRootDN))
+ if (! entry.getName().equals(configRootDN))
{
Message message = ERR_CONFIG_FILE_INVALID_BASE_DN.get(
- f.getAbsolutePath(), entry.getDN().toString(),
+ f.getAbsolutePath(), entry.getName().toString(),
DN_CONFIG_ROOT);
throw new InitializationException(message);
}
@@ -434,7 +434,7 @@
// hash.
configEntries = new ConcurrentHashMap<DN,ConfigEntry>();
configRootEntry = new ConfigEntry(entry, null);
- configEntries.put(entry.getDN(), configRootEntry);
+ configEntries.put(entry.getName(), configRootEntry);
// Iterate through the rest of the configuration file and process the
@@ -485,7 +485,7 @@
// Make sure that the DN of the entry read doesn't already exist.
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if (configEntries.containsKey(entryDN))
{
close(reader);
@@ -1184,7 +1184,7 @@
{
// Make sure that the target DN does not already exist. If it does, then
// fail.
- DN entryDN = e.getDN();
+ DN entryDN = e.getName();
if (configEntries.containsKey(entryDN))
{
Message message =
@@ -1530,7 +1530,7 @@
synchronized (configLock)
{
// Get the DN of the target entry for future reference.
- DN entryDN = e.getDN();
+ DN entryDN = e.getName();
// Get the target entry. If it does not exist, then fail.
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
index 7042690..88dcbc4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -167,7 +168,8 @@
}
Message message = ERR_DYNAMICGROUP_CANNOT_DECODE_MEMBERURL.
- get(v.getValue().toString(), String.valueOf(groupEntry.getDN()),
+ get(v.getValue().toString(),
+ String.valueOf(groupEntry.getName()),
de.getMessageObject());
ErrorLogger.logError(message);
}
@@ -175,7 +177,7 @@
}
}
- return new DynamicGroup(groupEntry.getDN(), memberURLs);
+ return new DynamicGroup(groupEntry.getName(), memberURLs);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
index bea0403..2bfd8a0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -175,7 +176,7 @@
if (! memberList.addResult(searchEntry))
{
Message message = ERR_DYNAMICGROUP_CANNOT_RETURN_ENTRY.
- get(String.valueOf(searchEntry.getDN()),
+ get(String.valueOf(searchEntry.getName()),
String.valueOf(memberList.getDynamicGroupDN()));
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(), message);
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
index 6ca69d7..a9ee1c7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -73,7 +73,7 @@
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
{
- String normDNString = entry.getDN().toNormalizedString();
+ String normDNString = entry.getName().toNormalizedString();
AttributeValue value = AttributeValues.create(
ByteString.valueOf(normDNString),
ByteString.valueOf(normDNString));
@@ -95,7 +95,7 @@
{
try
{
- String normalizedDN = entry.getDN().toNormalizedString();
+ String normalizedDN = entry.getName().toNormalizedString();
String normalizedValue = value.getNormalizedValue().toString();
return normalizedDN.equals(normalizedValue);
}
@@ -115,7 +115,7 @@
public boolean hasAnyValue(Entry entry, VirtualAttributeRule rule,
Collection<AttributeValue> values)
{
- String ndnString = entry.getDN().toNormalizedString();
+ String ndnString = entry.getName().toNormalizedString();
AttributeValue v = AttributeValues.create(ByteString.valueOf(ndnString),
ByteString.valueOf(ndnString));
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
index 1cd0801..24b0e3c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -81,7 +81,7 @@
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
{
- String normDNString = entry.getDN().toNormalizedString();
+ String normDNString = entry.getName().toNormalizedString();
String uuidString =
UUID.nameUUIDFromBytes(getBytes(normDNString)).toString();
AttributeValue value = AttributeValues.create(
@@ -105,7 +105,7 @@
{
try
{
- String normalizedDN = entry.getDN().toNormalizedString();
+ String normalizedDN = entry.getName().toNormalizedString();
String uuidString =
UUID.nameUUIDFromBytes(getBytes(normalizedDN)).toString();
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 8a760de..093a70d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -241,7 +241,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLEXTERNAL_NO_CERT_IN_ENTRY.get(
- String.valueOf(userEntry.getDN()));
+ String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
}
@@ -270,7 +270,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(
- String.valueOf(userEntry.getDN()));
+ String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
}
@@ -285,7 +285,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLEXTERNAL_CANNOT_VALIDATE_CERT.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
getExceptionMessage(e));
bindOperation.setAuthFailureReason(message);
return;
@@ -318,7 +318,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(
- String.valueOf(userEntry.getDN()));
+ String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
}
@@ -333,7 +333,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLEXTERNAL_CANNOT_VALIDATE_CERT.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
getExceptionMessage(e));
bindOperation.setAuthFailureReason(message);
return;
@@ -343,7 +343,7 @@
AuthenticationInfo authInfo = new AuthenticationInfo(userEntry,
- SASL_MECHANISM_EXTERNAL, DirectoryServer.isRootDN(userEntry.getDN()));
+ SASL_MECHANISM_EXTERNAL, DirectoryServer.isRootDN(userEntry.getName()));
bindOperation.setAuthenticationInfo(authInfo);
bindOperation.setResultCode(ResultCode.SUCCESS);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
index 7d7a734..7a4a1cc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -351,7 +351,7 @@
long usedMemory = runtime.totalMemory() - runtime.freeMemory();
if (usedMemory > maxAllowedMemory)
{
- CacheEntry cachedEntry = dnMap.remove(entry.getDN());
+ CacheEntry cachedEntry = dnMap.remove(entry.getName());
if (cachedEntry == null)
{
// The current entry wasn't there, let's remove an existing entry.
@@ -388,7 +388,7 @@
{
// Add the entry to the cache. This will replace it if it is already
// present and add it if it isn't.
- dnMap.put(entry.getDN(), cacheEntry);
+ dnMap.put(entry.getName(), cacheEntry);
HashMap<Long,CacheEntry> map = idMap.get(backend);
if (map == null)
@@ -478,7 +478,7 @@
{
// See if the entry already exists in the cache. If it does, then we will
// fail and not actually store the entry.
- if (dnMap.containsKey(entry.getDN()))
+ if (dnMap.containsKey(entry.getName()))
{
return false;
}
@@ -507,7 +507,7 @@
{
// Add the entry to the cache. This will replace it if it is already
// present and add it if it isn't.
- dnMap.put(entry.getDN(), cacheEntry);
+ dnMap.put(entry.getName(), cacheEntry);
HashMap<Long,CacheEntry> map = idMap.get(backend);
if (map == null)
@@ -702,7 +702,7 @@
int entriesDeleted = 0;
for (CacheEntry e : map.values())
{
- dnMap.remove(e.getEntry().getDN());
+ dnMap.remove(e.getEntry().getName());
entriesDeleted++;
if ((entriesDeleted % 1000) == 0)
@@ -804,7 +804,7 @@
while (iterator.hasNext())
{
CacheEntry e = iterator.next();
- DN entryDN = e.getEntry().getDN();
+ DN entryDN = e.getEntry().getName();
if (entryDN.isDescendantOf(baseDN))
{
iterator.remove();
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
index 85b5e2d..7200776 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
@@ -619,7 +619,7 @@
// TODO: Cache the buffer?
ByteStringBuilder buffer = new ByteStringBuilder();
entry.encode(buffer, encodeConfig);
- putEntryToDB(entry.getDN().toNormalizedString(),
+ putEntryToDB(entry.getName().toNormalizedString(),
backend, entryID, buffer);
} catch (Exception e) {
if (debugEnabled()) {
@@ -639,7 +639,7 @@
// See if the entry already exists in the cache. If it does, then we
// will fail and not actually store the entry.
if (entryCacheIndex.dnMap.containsKey(
- entry.getDN().toNormalizedString())) {
+ entry.getName().toNormalizedString())) {
return false;
}
} finally {
@@ -649,7 +649,7 @@
// TODO: Cache the buffer?
ByteStringBuilder buffer = new ByteStringBuilder();
entry.encode(buffer, encodeConfig);
- return putEntryToDB(entry.getDN().toNormalizedString(),
+ return putEntryToDB(entry.getName().toNormalizedString(),
backend, entryID, buffer);
} catch (Exception e) {
if (debugEnabled()) {
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
index e19a0c2..dd1b88a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
@@ -302,7 +302,7 @@
}
else
{
- return e.getDN();
+ return e.getName();
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
index 8ab549b..3a67521 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -301,8 +301,8 @@
else
{
Message message = ERR_FCM_MULTIPLE_MATCHING_ENTRIES.
- get(fingerprintString, String.valueOf(userEntry.getDN()),
- String.valueOf(entry.getDN()));
+ get(fingerprintString, String.valueOf(userEntry.getName()),
+ String.valueOf(entry.getName()));
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
index b6b3475..9fe1b3c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java
@@ -159,7 +159,7 @@
AcceptRejectWarn structuralPolicy,
Entry entry)
{
- RDN rdn = entry.getDN().rdn();
+ RDN rdn = entry.getName().rdn();
if (rdn != null)
{
// Make sure that all the required attributes are present.
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
index 66512a0..a6781a3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -77,11 +77,11 @@
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
{
- Backend backend = DirectoryServer.getBackend(entry.getDN());
+ Backend backend = DirectoryServer.getBackend(entry.getName());
try
{
- ConditionResult ret = backend.hasSubordinates(entry.getDN());
+ ConditionResult ret = backend.hasSubordinates(entry.getName());
if(ret != null && ret != ConditionResult.UNDEFINED)
{
AttributeValue value =
@@ -105,11 +105,11 @@
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
- Backend backend = DirectoryServer.getBackend(entry.getDN());
+ Backend backend = DirectoryServer.getBackend(entry.getName());
try
{
- ConditionResult ret = backend.hasSubordinates(entry.getDN());
+ ConditionResult ret = backend.hasSubordinates(entry.getName());
return ret != null && ret != ConditionResult.UNDEFINED;
}
catch(DirectoryException de)
@@ -128,11 +128,11 @@
public boolean hasValue(Entry entry, VirtualAttributeRule rule,
AttributeValue value)
{
- Backend backend = DirectoryServer.getBackend(entry.getDN());
+ Backend backend = DirectoryServer.getBackend(entry.getName());
try
{
- ConditionResult ret = backend.hasSubordinates(entry.getDN());
+ ConditionResult ret = backend.hasSubordinates(entry.getName());
return ret != null
&& ret != ConditionResult.UNDEFINED
&& ConditionResult.valueOf(value.getNormalizedValue().toString())
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java b/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
index da0a4c2..a693f63 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2011-2013 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -1674,7 +1674,7 @@
InternalClientConnection conn = InternalClientConnection
.getRootConnection();
ModifyOperation internalModify = conn.processModify(userEntry
- .getDN().toString(), modifications);
+ .getName().toString(), modifications);
ResultCode resultCode = internalModify.getResultCode();
if (resultCode != ResultCode.SUCCESS)
@@ -1687,7 +1687,7 @@
{
TRACER.debugWarning(
"An error occurred while trying to update the LDAP PTA "
- + "cached password for user %s: %s", userEntry.getDN()
+ + "cached password for user %s: %s", userEntry.getName()
.toString(), String.valueOf(internalModify
.getErrorMessage()));
}
@@ -1738,7 +1738,7 @@
{
case UNMAPPED:
// The bind DN is the name of the user's entry.
- username = ByteString.valueOf(userEntry.getDN().toString());
+ username = ByteString.valueOf(userEntry.getName().toString());
break;
case MAPPED_BIND:
// The bind DN is contained in an attribute in the user's entry.
@@ -1768,7 +1768,7 @@
*/
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_LDAP_PTA_MAPPING_ATTRIBUTE_NOT_FOUND.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
String.valueOf(cfg.dn()),
mappedAttributesAsString(cfg.getMappedAttribute())));
}
@@ -1807,7 +1807,7 @@
*/
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_LDAP_PTA_MAPPING_ATTRIBUTE_NOT_FOUND.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
String.valueOf(cfg.dn()),
mappedAttributesAsString(cfg.getMappedAttribute())));
}
@@ -1845,7 +1845,7 @@
// More than one matching entry was returned.
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_LDAP_PTA_MAPPED_SEARCH_TOO_MANY_CANDIDATES.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
String.valueOf(cfg.dn()), String.valueOf(baseDN),
String.valueOf(filter)));
default:
@@ -1854,7 +1854,7 @@
// error.
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_LDAP_PTA_MAPPED_SEARCH_FAILED.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
String.valueOf(cfg.dn()), e.getMessageObject()), e);
}
}
@@ -1874,7 +1874,7 @@
*/
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_LDAP_PTA_MAPPED_SEARCH_NO_CANDIDATES.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
String.valueOf(cfg.dn()), String.valueOf(filter)));
}
@@ -1907,7 +1907,7 @@
// error.
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_LDAP_PTA_MAPPED_BIND_FAILED.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
String.valueOf(cfg.dn()), e.getMessageObject()), e);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java
index aab9c76..fad987d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -131,7 +131,7 @@
}
Group<?> g =
- DirectoryServer.getGroupManager().getGroupInstance(entry.getDN());
+ DirectoryServer.getGroupManager().getGroupInstance(entry.getName());
if (g == null)
{
return Collections.emptySet();
@@ -181,7 +181,7 @@
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
Group<?> g =
- DirectoryServer.getGroupManager().getGroupInstance(entry.getDN());
+ DirectoryServer.getGroupManager().getGroupInstance(entry.getName());
if (g == null)
{
return false;
@@ -231,7 +231,7 @@
AttributeValue value)
{
Group<?> g =
- DirectoryServer.getGroupManager().getGroupInstance(entry.getDN());
+ DirectoryServer.getGroupManager().getGroupInstance(entry.getName());
if (g == null)
{
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
index ba85a98..a56a371 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -78,11 +78,11 @@
public Set<AttributeValue> getValues(Entry entry,
VirtualAttributeRule rule)
{
- Backend backend = DirectoryServer.getBackend(entry.getDN());
+ Backend backend = DirectoryServer.getBackend(entry.getName());
try
{
- long count = backend.numSubordinates(entry.getDN(), false);
+ long count = backend.numSubordinates(entry.getName(), false);
if(count >= 0)
{
AttributeValue value =
@@ -106,11 +106,11 @@
@Override()
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
- Backend backend = DirectoryServer.getBackend(entry.getDN());
+ Backend backend = DirectoryServer.getBackend(entry.getName());
try
{
- return backend.numSubordinates(entry.getDN(), false) >= 0;
+ return backend.numSubordinates(entry.getName(), false) >= 0;
}
catch(DirectoryException de)
{
@@ -128,11 +128,11 @@
public boolean hasValue(Entry entry, VirtualAttributeRule rule,
AttributeValue value)
{
- Backend backend = DirectoryServer.getBackend(entry.getDN());
+ Backend backend = DirectoryServer.getBackend(entry.getName());
try
{
- long count = backend.numSubordinates(entry.getDN(), false);
+ long count = backend.numSubordinates(entry.getName(), false);
return count >= 0
&& Long.parseLong(value.getNormalizedValue().toString()) == count;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
index 066b85a..6d0265a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2012 profiq s.r.o.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -153,7 +153,7 @@
{
TRACER.debugError("Failed to retrieve password " +
"policy for user %s: %s",
- entry.getDN().toString(),
+ entry.getName().toString(),
stackTraceToSingleLineString(de));
}
}
@@ -165,7 +165,7 @@
if (debugEnabled())
{
TRACER.debugError("No applicable password policy for user %s", entry
- .getDN().toString());
+ .getName().toString());
}
}
else if (policy.isPasswordPolicy())
@@ -185,7 +185,7 @@
{
TRACER.debugError("Failed to retrieve password " +
"policy state for user %s: %s",
- entry.getDN().toString(),
+ entry.getName().toString(),
stackTraceToSingleLineString(de));
}
}
@@ -200,7 +200,7 @@
{
TRACER.debugVerbose("Authentication policy %s found for user %s is "
+ "not a password policy", policy.getDN().toString(), entry
- .getDN().toString());
+ .getName().toString());
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index b50d3a9..7536f71 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -309,7 +309,7 @@
// Retrieve a write lock on that user's entry.
- userDN = requestorEntry.getDN();
+ userDN = requestorEntry.getName();
userLock = LockManager.lockWrite(userDN);
if (userLock == null)
@@ -373,7 +373,7 @@
return;
}
- userDN = userEntry.getDN();
+ userDN = userEntry.getName();
}
catch (DirectoryException de)
{
@@ -437,7 +437,7 @@
return;
}
- userDN = userEntry.getDN();
+ userDN = userEntry.getName();
}
}
@@ -490,7 +490,7 @@
}
else
{
- selfChange = userDN.equals(requestorEntry.getDN());
+ selfChange = userDN.equals(requestorEntry.getName());
}
if (! selfChange)
@@ -991,7 +991,7 @@
}
// Get an internal connection and use it to perform the modification.
- boolean isRoot = DirectoryServer.isRootDN(requestorEntry.getDN());
+ boolean isRoot = DirectoryServer.isRootDN(requestorEntry.getName());
AuthenticationInfo authInfo = new AuthenticationInfo(requestorEntry,
isRoot);
InternalClientConnection internalConnection = new
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
index 97ee780..f9ba3d6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -100,7 +100,7 @@
{
TRACER.debugError("Failed to retrieve password " +
"policy for user %s: %s",
- entry.getDN().toString(),
+ entry.getName().toString(),
stackTraceToSingleLineString(de));
}
}
@@ -112,7 +112,7 @@
if (debugEnabled())
{
TRACER.debugError("No applicable password policy for user %s", entry
- .getDN().toString());
+ .getName().toString());
}
}
else if (policy.isPasswordPolicy())
@@ -131,7 +131,7 @@
{
TRACER.debugVerbose("Authentication policy %s found for user %s is "
+ "not a password policy", policy.getDN().toString(), entry
- .getDN().toString());
+ .getName().toString());
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
index 4a2bf6f..92b18b2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -358,11 +358,11 @@
authzDN = actualAuthzDN;
}
- if (! authzDN.equals(userEntry.getDN()))
+ if (! authzDN.equals(userEntry.getName()))
{
AuthenticationInfo tempAuthInfo =
new AuthenticationInfo(userEntry,
- DirectoryServer.isRootDN(userEntry.getDN()));
+ DirectoryServer.isRootDN(userEntry.getName()));
InternalClientConnection tempConn =
new InternalClientConnection(tempAuthInfo);
if (! tempConn.hasPrivilege(Privilege.PROXIED_AUTH, bindOperation))
@@ -370,7 +370,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(
- String.valueOf(userEntry.getDN()));
+ String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
}
@@ -460,11 +460,11 @@
}
if ((authZEntry == null) ||
- (! authZEntry.getDN().equals(userEntry.getDN())))
+ (! authZEntry.getName().equals(userEntry.getName())))
{
AuthenticationInfo tempAuthInfo =
new AuthenticationInfo(userEntry,
- DirectoryServer.isRootDN(userEntry.getDN()));
+ DirectoryServer.isRootDN(userEntry.getName()));
InternalClientConnection tempConn =
new InternalClientConnection(tempAuthInfo);
if (! tempConn.hasPrivilege(Privilege.PROXIED_AUTH, bindOperation))
@@ -472,7 +472,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(
- String.valueOf(userEntry.getDN()));
+ String.valueOf(userEntry.getName()));
bindOperation.setAuthFailureReason(message);
return;
}
@@ -518,7 +518,7 @@
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
Message message = ERR_SASLPLAIN_CANNOT_CHECK_PASSWORD_VALIDITY.get(
- String.valueOf(userEntry.getDN()),
+ String.valueOf(userEntry.getName()),
String.valueOf(e));
bindOperation.setAuthFailureReason(message);
return;
@@ -531,7 +531,7 @@
AuthenticationInfo authInfo =
new AuthenticationInfo(userEntry, authZEntry, SASL_MECHANISM_PLAIN,
bindOperation.getSASLCredentials(),
- DirectoryServer.isRootDN(userEntry.getDN()));
+ DirectoryServer.isRootDN(userEntry.getName()));
bindOperation.setAuthenticationInfo(authInfo);
return;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java
index a5dbd93..ae30059 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java
@@ -277,7 +277,7 @@
bindOp.setSASLAuthUserEntry(authEntry);
final AuthenticationInfo authInfo = new AuthenticationInfo(authEntry,
authzEntry, mechanism, clientCredentials,
- DirectoryServer.isRootDN(authEntry.getDN()));
+ DirectoryServer.isRootDN(authEntry.getName()));
bindOp.setAuthenticationInfo(authInfo);
// If confidentiality/integrity has been negotiated then
@@ -373,7 +373,7 @@
bindOp.setSASLAuthUserEntry(authEntry);
final AuthenticationInfo authInfo = new AuthenticationInfo(authEntry,
authzEntry, mechanism, clientCredentials,
- DirectoryServer.isRootDN(authEntry.getDN()));
+ DirectoryServer.isRootDN(authEntry.getName()));
bindOp.setAuthenticationInfo(authInfo);
// If confidentiality/integrity has been negotiated, then create a
@@ -746,7 +746,7 @@
authzDN = actualAuthzDN;
}
- if (!authzDN.equals(authEntry.getDN()))
+ if (!authzDN.equals(authEntry.getName()))
{
if (authzDN.isRootDN())
{
@@ -777,7 +777,7 @@
}
}
final AuthenticationInfo authInfo = new AuthenticationInfo(authEntry,
- DirectoryServer.isRootDN(authEntry.getDN()));
+ DirectoryServer.isRootDN(authEntry.getName()));
if (!hasPrivilege(authInfo))
{
callback.setAuthorized(false);
@@ -842,12 +842,13 @@
}
}
- if ((authzEntry == null) || (!authzEntry.getDN().equals(authEntry.getDN())))
+ if ((authzEntry == null) || (!authzEntry.getName().
+ equals(authEntry.getName())))
{
// Create temporary authorization information and run it both
// through the privilege and then the access control subsystems.
final AuthenticationInfo authInfo = new AuthenticationInfo(authEntry,
- DirectoryServer.isRootDN(authEntry.getDN()));
+ DirectoryServer.isRootDN(authEntry.getName()));
if (!hasPrivilege(authInfo))
{
callback.setAuthorized(false);
@@ -1002,7 +1003,7 @@
.mayProxy(authInfo.getAuthenticationEntry(), e, bindOp))
{
setCallbackMsg(ERR_SASL_AUTHZID_INSUFFICIENT_ACCESS.get(String
- .valueOf(authEntry.getDN())));
+ .valueOf(authEntry.getName())));
ret = false;
}
@@ -1028,7 +1029,7 @@
if (!tempConn.hasPrivilege(Privilege.PROXIED_AUTH, bindOp))
{
setCallbackMsg(ERR_SASL_AUTHZID_INSUFFICIENT_PRIVILEGES.get(String
- .valueOf(authEntry.getDN())));
+ .valueOf(authEntry.getName())));
ret = false;
}
return ret;
@@ -1181,7 +1182,7 @@
if (!authState.isPasswordPolicy())
{
final Message message = ERR_SASL_ACCOUNT_NOT_LOCAL.get(mechanism,
- String.valueOf(authEntry.getDN()));
+ String.valueOf(authEntry.getName()));
setCallbackMsg(ResultCode.INAPPROPRIATE_AUTHENTICATION, message);
return;
}
@@ -1192,7 +1193,7 @@
if ((clearPasswords == null) || clearPasswords.isEmpty())
{
setCallbackMsg(ERR_SASL_NO_REVERSIBLE_PASSWORDS.get(mechanism,
- String.valueOf(authEntry.getDN())));
+ String.valueOf(authEntry.getName())));
return;
}
}
@@ -1203,7 +1204,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
setCallbackMsg(ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS.get(
- String.valueOf(authEntry.getDN()), mechanism, String.valueOf(e)));
+ String.valueOf(authEntry.getName()), mechanism, String.valueOf(e)));
return;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
index 6ef5db6..b349fb4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -300,7 +300,7 @@
SoftReference<CacheEntry> ref =
new SoftReference<CacheEntry>(cacheEntry, referenceQueue);
- SoftReference<CacheEntry> oldRef = dnMap.put(entry.getDN(), ref);
+ SoftReference<CacheEntry> oldRef = dnMap.put(entry.getName(), ref);
if (oldRef != null)
{
oldRef.clear();
@@ -333,7 +333,7 @@
long entryID)
{
// See if the entry already exists. If so, then return false.
- if (dnMap.containsKey(entry.getDN()))
+ if (dnMap.containsKey(entry.getName()))
{
return false;
}
@@ -344,7 +344,7 @@
SoftReference<CacheEntry> ref =
new SoftReference<CacheEntry>(cacheEntry, referenceQueue);
- dnMap.put(entry.getDN(), ref);
+ dnMap.put(entry.getName(), ref);
ConcurrentHashMap<Long,SoftReference<CacheEntry>> map = idMap.get(backend);
if (map == null)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
index c468a44..1bf784f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -187,14 +187,14 @@
if (groupEntry.hasObjectClass(groupOfNamesClass))
{
Message message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
- get(String.valueOf(groupEntry.getDN()), OC_GROUP_OF_ENTRIES,
+ get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_ENTRIES,
OC_GROUP_OF_NAMES);
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
else if (groupEntry.hasObjectClass(groupOfUniqueNamesClass))
{
Message message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
- get(String.valueOf(groupEntry.getDN()), OC_GROUP_OF_ENTRIES,
+ get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_ENTRIES,
OC_GROUP_OF_UNIQUE_NAMES);
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
@@ -207,7 +207,7 @@
if (groupEntry.hasObjectClass(groupOfUniqueNamesClass))
{
Message message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
- get(String.valueOf(groupEntry.getDN()), OC_GROUP_OF_NAMES,
+ get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_NAMES,
OC_GROUP_OF_UNIQUE_NAMES);
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
@@ -223,7 +223,7 @@
else
{
Message message = ERR_STATICGROUP_NO_VALID_OC.
- get(String.valueOf(groupEntry.getDN()), OC_GROUP_OF_NAMES,
+ get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_NAMES,
OC_GROUP_OF_UNIQUE_NAMES);
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
@@ -261,7 +261,8 @@
Message message = ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN.
get(v.getValue().toString(),
someMemberAttributeType.getNameOrOID(),
- String.valueOf(groupEntry.getDN()), de.getMessageObject());
+ String.valueOf(groupEntry.getName()),
+ de.getMessageObject());
ErrorLogger.logError(message);
}
}
@@ -269,7 +270,7 @@
}
- return new StaticGroup(groupEntry.getDN(),
+ return new StaticGroup(groupEntry.getName(),
someMemberAttributeType, someMemberDNs);
}
@@ -561,7 +562,7 @@
public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
throws DirectoryException
{
- return isMember(userEntry.getDN(), examinedGroups);
+ return isMember(userEntry.getName(), examinedGroups);
}
@@ -675,7 +676,7 @@
synchronized (this)
{
- DN userDN = userEntry.getDN();
+ DN userDN = userEntry.getName();
ByteString userDNString = ByteString.valueOf(userDN.toNormalizedString());
if (memberDNs.contains(userDNString))
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index 5ae0262..8552842 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -365,8 +365,8 @@
else
{
Message message = ERR_SATUACM_MULTIPLE_MATCHING_ENTRIES.
- get(String.valueOf(peerDN), String.valueOf(userEntry.getDN()),
- String.valueOf(entry.getDN()));
+ get(String.valueOf(peerDN), String.valueOf(userEntry.getName()),
+ String.valueOf(entry.getName()));
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index a50ae0c..b26c0ee 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -265,8 +265,8 @@
else
{
Message message = ERR_SDTUACM_MULTIPLE_MATCHING_ENTRIES.
- get(peerName, String.valueOf(userEntry.getDN()),
- String.valueOf(entry.getDN()));
+ get(peerName, String.valueOf(userEntry.getName()),
+ String.valueOf(entry.getName()));
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java
index e512533..931ffcd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -151,7 +152,7 @@
if (targetDN != null)
{
Message message = ERR_VIRTUAL_STATIC_GROUP_MULTIPLE_TARGETS.get(
- String.valueOf(groupEntry.getDN()));
+ String.valueOf(groupEntry.getName()));
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION,
message);
}
@@ -168,7 +169,8 @@
}
Message message = ERR_VIRTUAL_STATIC_GROUP_CANNOT_DECODE_TARGET.
- get(v.getValue().toString(), String.valueOf(groupEntry.getDN()),
+ get(v.getValue().toString(),
+ String.valueOf(groupEntry.getName()),
de.getMessageObject());
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
message, de);
@@ -180,11 +182,11 @@
if (targetDN == null)
{
Message message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET.get(
- String.valueOf(groupEntry.getDN()));
+ String.valueOf(groupEntry.getName()));
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
- return new VirtualStaticGroup(groupEntry.getDN(), targetDN);
+ return new VirtualStaticGroup(groupEntry.getName(), targetDN);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index 5637ad5..909ec1f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -552,7 +552,7 @@
&& bindOperation.getSASLAuthUserEntry() != null)
{ // SASL bind and we have successfully found a user entry for auth
appendLabel(buffer, "authDN", bindOperation.getSASLAuthUserEntry()
- .getDN());
+ .getName());
}
else
{ // SASL bind failed to find user entry for auth or simple bind
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
index 8e6ecd9..341e454 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -173,7 +174,7 @@
// Construct a new UUID. In order to make sure that UUIDs are consistent
// when the same LDIF is generated on multiple servers, we'll base the UUID
// on the byte representation of the normalized DN.
- byte[] dnBytes = getBytes(entry.getDN().toNormalizedString());
+ byte[] dnBytes = getBytes(entry.getName().toNormalizedString());
UUID uuid = UUID.nameUUIDFromBytes(dnBytes);
Attribute uuidAttr = Attributes.create(entryUUIDType,
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index 1410e82..0597ef9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.plugins;
@@ -372,7 +372,7 @@
if (authPolicy == null)
{
Message message = WARN_PLUGIN_PWIMPORT_NO_SUCH_POLICY.get(
- String.valueOf(entry.getDN()), String.valueOf(policyDN));
+ String.valueOf(entry.getName()), String.valueOf(policyDN));
logError(message);
}
else if (authPolicy.isPasswordPolicy())
@@ -385,7 +385,7 @@
catch (DirectoryException de)
{
Message message = WARN_PLUGIN_PWIMPORT_CANNOT_DECODE_POLICY_DN.get(
- String.valueOf(entry.getDN()), de.getMessageObject());
+ String.valueOf(entry.getName()), de.getMessageObject());
logError(message);
break policyLoop;
}
@@ -435,7 +435,7 @@
Message message =
ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
.get(policy.getPasswordAttribute().getNameOrOID(),
- String.valueOf(entry.getDN()),
+ String.valueOf(entry.getName()),
stackTraceToSingleLineString(e));
logError(message);
gotError = true;
@@ -470,7 +470,7 @@
Message message =
ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
.get(policy.getPasswordAttribute().getNameOrOID(),
- String.valueOf(entry.getDN()),
+ String.valueOf(entry.getName()),
stackTraceToSingleLineString(e));
logError(message);
gotError = true;
@@ -533,7 +533,7 @@
}
Message message = ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
- .get(t.getNameOrOID(), String.valueOf(entry.getDN()),
+ .get(t.getNameOrOID(), String.valueOf(entry.getName()),
stackTraceToSingleLineString(e));
logError(message);
gotError = true;
@@ -591,7 +591,7 @@
}
Message message = ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD
- .get(t.getNameOrOID(), String.valueOf(entry.getDN()),
+ .get(t.getNameOrOID(), String.valueOf(entry.getName()),
stackTraceToSingleLineString(e));
logError(message);
gotError = true;
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 659e675..46672b6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -432,8 +432,8 @@
modDNmap=new LinkedHashMap<DN,DN>();
modifyDNOperation.setAttachment(MODIFYDN_DNS, modDNmap);
}
- DN oldEntryDN=modifyDNOperation.getOriginalEntry().getDN();
- DN newEntryDN=modifyDNOperation.getUpdatedEntry().getDN();
+ DN oldEntryDN=modifyDNOperation.getOriginalEntry().getName();
+ DN newEntryDN=modifyDNOperation.getUpdatedEntry().getName();
modDNmap.put(oldEntryDN, newEntryDN);
processModifyDN(modDNmap, (interval != 0));
@@ -491,7 +491,7 @@
modDNmap=new LinkedHashMap<DN,DN>();
modifyDNOperation.setAttachment(MODIFYDN_DNS, modDNmap);
}
- modDNmap.put(oldEntry.getDN(), newEntry.getDN());
+ modDNmap.put(oldEntry.getName(), newEntry.getName());
return PluginResult.SubordinateModifyDN.continueOperationProcessing();
}
@@ -514,7 +514,7 @@
deleteDNset = new HashSet<DN>();
deleteOperation.setAttachment(DELETE_DNS, deleteDNset);
}
- deleteDNset.add(entry.getDN());
+ deleteDNset.add(entry.getName());
return PluginResult.SubordinateDelete.continueOperationProcessing();
}
@@ -793,7 +793,7 @@
private void deleteAddAttributesEntry(Entry e, DN oldEntryDN, DN newEntryDN)
{
LinkedList<Modification> mods = new LinkedList<Modification>();
- DN entryDN=e.getDN();
+ DN entryDN=e.getName();
for(AttributeType type : attributeTypes)
{
if(e.hasAttribute(type))
@@ -1133,7 +1133,7 @@
/* Make sure the entry belongs to one of the configured naming
* contexts.
*/
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
DN entryBaseDN = getEntryBaseDN(entryDN);
if (entryBaseDN == null)
{
@@ -1192,7 +1192,7 @@
/* Make sure the entry belongs to one of the configured naming
* contexts.
*/
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
DN entryBaseDN = getEntryBaseDN(entryDN);
if (entryBaseDN == null)
{
@@ -1316,7 +1316,7 @@
return PluginResult.PreOperation.stopProcessing(
ResultCode.CONSTRAINT_VIOLATION,
ERR_PLUGIN_REFERENT_FILTER_MISMATCH.get(
- valueEntry.getDN().toString(),
+ valueEntry.getName().toString(),
attr.getName(),
entryDN.toString(),
filter.toString())
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
index a8664f0..e216f74 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -148,7 +149,7 @@
boolean found = true;
for (DN baseDN : baseDNs)
{
- if (baseDN.isAncestorOf(entry.getDN()))
+ if (baseDN.isAncestorOf(entry.getName()))
{
found = true;
break;
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index 3040fa6..3ca37d7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -183,14 +183,14 @@
UniqueAttributePluginCfg config = currentConfiguration;
Entry entry = addOperation.getEntryToAdd();
- Set<DN> baseDNs = getBaseDNs(config, entry.getDN());
+ Set<DN> baseDNs = getBaseDNs(config, entry.getName());
if (baseDNs == null)
{
// The entry is outside the scope of this plugin.
return PluginResult.PreOperation.continueOperationProcessing();
}
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
List<AttributeValue> recordedValues = new LinkedList<AttributeValue>();
for (AttributeType t : config.getType())
{
@@ -366,7 +366,7 @@
UniqueAttributePluginCfg config = currentConfiguration;
Set<DN> baseDNs = getBaseDNs(config,
- modifyDNOperation.getUpdatedEntry().getDN());
+ modifyDNOperation.getUpdatedEntry().getName());
if (baseDNs == null)
{
// The entry is outside the scope of this plugin.
@@ -409,14 +409,14 @@
UniqueAttributePluginCfg config = currentConfiguration;
Entry entry = addOperation.getEntryToAdd();
- Set<DN> baseDNs = getBaseDNs(config, entry.getDN());
+ Set<DN> baseDNs = getBaseDNs(config, entry.getName());
if (baseDNs == null)
{
// The entry is outside the scope of this plugin.
return;
}
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
for (AttributeType t : config.getType())
{
List<Attribute> attrList = entry.getAttribute(t);
@@ -518,7 +518,7 @@
UniqueAttributePluginCfg config = currentConfiguration;
Set<DN> baseDNs = getBaseDNs(config,
- modifyDNOperation.getUpdatedEntry().getDN());
+ modifyDNOperation.getUpdatedEntry().getName());
if (baseDNs == null)
{
// The entry is outside the scope of this plugin.
@@ -526,7 +526,7 @@
}
DN entryDN = modifyDNOperation.getEntryDN();
- DN updatedEntryDN = modifyDNOperation.getUpdatedEntry().getDN();
+ DN updatedEntryDN = modifyDNOperation.getUpdatedEntry().getName();
RDN newRDN = modifyDNOperation.getNewRDN();
for (int i=0; i < newRDN.getNumValues(); i++)
{
@@ -673,9 +673,9 @@
false, filter, SEARCH_ATTRS);
for (SearchResultEntry e : searchOperation.getSearchEntries())
{
- if (! e.getDN().equals(targetDN))
+ if (! e.getName().equals(targetDN))
{
- return e.getDN();
+ return e.getName();
}
}
@@ -837,7 +837,7 @@
UniqueAttributePluginCfg config = currentConfiguration;
Entry entry = addOperation.getEntryToAdd();
- Set<DN> baseDNs = getBaseDNs(config, entry.getDN());
+ Set<DN> baseDNs = getBaseDNs(config, entry.getName());
if (baseDNs == null)
{
// The entry is outside the scope of this plugin.
@@ -947,7 +947,7 @@
{
UniqueAttributePluginCfg config = currentConfiguration;
Set<DN> baseDNs = getBaseDNs(config,
- modifyDNOperation.getUpdatedEntry().getDN());
+ modifyDNOperation.getUpdatedEntry().getName());
if (baseDNs == null)
{
// The entry is outside the scope of this plugin.
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
index 249f7ac..d03023c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -859,7 +859,7 @@
*/
public AddOperation processAdd(Entry entry, List<Control> controls)
{
- return processAdd(entry.getDN(), entry.getObjectClasses(),
+ return processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes(),
controls);
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
index 9e82e62..5c87526 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -114,7 +115,7 @@
*/
public SearchResultEntryProtocolOp(SearchResultEntry searchEntry)
{
- this(searchEntry.getDN(), null, searchEntry, 3);
+ this(searchEntry.getName(), null, searchEntry, 3);
}
@@ -130,7 +131,7 @@
public SearchResultEntryProtocolOp(SearchResultEntry searchEntry,
int ldapVersion)
{
- this(searchEntry.getDN(), null, searchEntry, ldapVersion);
+ this(searchEntry.getName(), null, searchEntry, ldapVersion);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java
index 4c139c6..f2be9b8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java
@@ -77,7 +77,7 @@
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
// There's only a value for the rootDSE, i.e. the Null DN.
- return entry.getDN().isRootDN();
+ return entry.getName().isRootDN();
}
/** {@inheritDoc} */
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java
index 320edee..ba11c9b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java
@@ -77,7 +77,7 @@
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
// There's only a value for the rootDSE, i.e. the Null DN.
- return entry.getDN().isRootDN();
+ return entry.getName().isRootDN();
}
/** {@inheritDoc} */
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java b/opendj3-server-dev/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java
index 7a54c96..2f70c47 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java
@@ -77,7 +77,7 @@
public boolean hasValue(Entry entry, VirtualAttributeRule rule)
{
// There's only a value for the rootDSE, i.e. the Null DN.
- return entry.getDN().isRootDN();
+ return entry.getName().isRootDN();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
index 4c19f42..23a97f4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -690,7 +690,8 @@
* Log information for the repair tool.
*/
Message message = ERR_UNKNOWN_ATTRIBUTE_IN_HISTORICAL.get(
- entry.getDN().toNormalizedString(), histVal.getAttrString());
+ entry.getName().toNormalizedString(),
+ histVal.getAttrString());
logError(message);
continue;
}
@@ -733,7 +734,7 @@
// Any exception happening here means that the coding of the historical
// information was wrong.
// Log an error and continue with an empty historical.
- Message message = ERR_BAD_HISTORICAL.get(entry.getDN().toString());
+ Message message = ERR_BAD_HISTORICAL.get(entry.getName().toString());
logError(message);
}
@@ -800,7 +801,7 @@
{
String uuidString = getEntryUUID(entry);
FakeModifyOperation modifyFakeOperation =
- new FakeModifyOperation(entry.getDN(), csn, uuidString);
+ new FakeModifyOperation(entry.getName(), csn, uuidString);
modifyFakeOperation.addModification(mod);
operations.put(histVal.getCSN(), modifyFakeOperation);
}
@@ -839,7 +840,7 @@
DirectoryServer.getSchema().getAttributeType(ENTRYUUID_ATTRIBUTE_NAME);
List<Attribute> uuidAttrs =
entry.getOperationalAttribute(entryuuidAttrType);
- return extractEntryUUID(uuidAttrs, entry.getDN());
+ return extractEntryUUID(uuidAttrs, entry.getName());
}
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeAddOperation.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeAddOperation.java
index 31acdbd..496014c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeAddOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeAddOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -60,10 +60,10 @@
@Override
public AddMsg generateMessage()
{
- return new AddMsg(getCSN(), entry.getDN(),
+ return new AddMsg(getCSN(), entry.getName(),
EntryHistorical.getEntryUUID(entry),
LDAPReplicationDomain.findEntryUUID(
- entry.getDN().getParentDNInSuffix()),
+ entry.getName().getParentDNInSuffix()),
entry.getObjectClasses(),
entry.getUserAttributes(), entry.getOperationalAttributes());
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java
index 7a5ec58..1f54d08 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FakeModdnOperation.java
@@ -61,7 +61,7 @@
@Override
public ReplicationMsg generateMessage()
{
- DN dn = entry.getDN();
+ DN dn = entry.getName();
return new ModifyDNMsg(dn, getCSN(),
EntryHistorical.getEntryUUID(entry),
LDAPReplicationDomain.findEntryUUID(dn.parent()),
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
index c784e47..84559c1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
@@ -197,7 +197,7 @@
sync.getReplicationDomain(domainName);
// Is the entry a sub entry of the replicated domain main entry ?
DN replicatedDn = replicationDomainCfg.getBaseDN();
- DN entryDn = entry.getDN();
+ DN entryDn = entry.getName();
if (entryDn.isDescendantOf(replicatedDn))
{
// Found the matching replicated domain configuration object
@@ -247,7 +247,7 @@
ImportFractionalContext importFractionalContext =
importSessionContexts.get(importConfig);
- DN entryDn = entry.getDN();
+ DN entryDn = entry.getName();
FractionalConfig localFractionalConfig = null;
// If no context, create it
@@ -414,7 +414,7 @@
// If we get here, local domain fractional configuration is enabled.
// Now filter for potential attributes to be removed.
LDAPReplicationDomain.fractionalRemoveAttributesFromEntry(
- localFractionalConfig, entry.getDN().rdn(),
+ localFractionalConfig, entry.getName().rdn(),
entry.getObjectClasses(), entry.getUserAttributes(), true);
return PluginResult.ImportLDIF.continueEntryProcessing();
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 0d9e656..596b373 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -2253,7 +2253,7 @@
if (entryToRename != null)
{
- DN entryDN = entryToRename.getDN();
+ DN entryDN = entryToRename.getName();
ModifyDNOperation newOp = renameEntry(
entryDN, freedDN.rdn(), freedDN.parent(), false);
@@ -2695,7 +2695,7 @@
SearchResultEntry resultEntry = result.get(0);
if (resultEntry != null)
{
- return resultEntry.getDN();
+ return resultEntry.getName();
}
}
}
@@ -3126,7 +3126,7 @@
* and keep the entry as a conflicting entry,
*/
conflict = true;
- renameConflictEntry(conflictOp, entry.getDN(),
+ renameConflictEntry(conflictOp, entry.getName(),
EntryHistorical.getEntryUUID(entry));
}
}
@@ -5285,7 +5285,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(0),
- entry.getDN(),
+ entry.getName(),
mods);
runAsSynchronizedOperation(newOp);
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index bc9f5ba..d1797cc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -298,7 +298,7 @@
SearchResultEntry configEntry = searchConfigEntry();
if (configEntry != null)
{
- DN configDN = configEntry.getDN();
+ DN configDN = configEntry.getName();
result = runUpdateStateEntry(configDN);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java
index b65ce79..6ff846d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.tasks;
@@ -103,7 +103,8 @@
if ((attrList == null) || attrList.isEmpty())
{
Message message = ERR_TASK_ADDSCHEMAFILE_NO_FILENAME.get(
- ATTR_TASK_ADDSCHEMAFILE_FILENAME, String.valueOf(taskEntry.getDN()));
+ ATTR_TASK_ADDSCHEMAFILE_FILENAME,
+ String.valueOf(taskEntry.getName()));
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/ShutdownTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/ShutdownTask.java
index 14120bb..cb85ba9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/ShutdownTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/ShutdownTask.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tasks;
@@ -92,7 +93,7 @@
restart = false;
shutdownMessage = INFO_TASK_SHUTDOWN_DEFAULT_MESSAGE.get(
- String.valueOf(taskEntry.getDN()));
+ String.valueOf(taskEntry.getName()));
AttributeType attrType =
DirectoryServer.getAttributeType(ATTR_SHUTDOWN_MESSAGE, true);
@@ -106,7 +107,7 @@
.getValue().toString();
shutdownMessage = INFO_TASK_SHUTDOWN_CUSTOM_MESSAGE.get(String
- .valueOf(taskEntry.getDN()), String.valueOf(valueString));
+ .valueOf(taskEntry.getName()), String.valueOf(valueString));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
index 9ce208a..24c7b8e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
@@ -444,9 +444,9 @@
break;
}
- if (! ignoreEntries.contains(entry.getDN()))
+ if (! ignoreEntries.contains(entry.getName()))
{
- sourceMap.put(entry.getDN(), entry);
+ sourceMap.put(entry.getName(), entry);
}
}
}
@@ -493,9 +493,9 @@
break;
}
- if (! ignoreEntries.contains(entry.getDN()))
+ if (! ignoreEntries.contains(entry.getName()))
{
- targetMap.put(entry.getDN(), entry);
+ targetMap.put(entry.getName(), entry);
}
}
}
@@ -980,7 +980,7 @@
{
LinkedList<Modification> attrMods = new LinkedList<Modification>();
attrMods.add(m);
- writer.writeModifyChangeRecord(sourceEntry.getDN(), attrMods);
+ writer.writeModifyChangeRecord(sourceEntry.getName(), attrMods);
}
else
{
@@ -993,14 +993,14 @@
attrMods.clear();
attrMods.add(new Modification(m.getModificationType(), attr));
- writer.writeModifyChangeRecord(sourceEntry.getDN(), attrMods);
+ writer.writeModifyChangeRecord(sourceEntry.getName(), attrMods);
}
}
}
}
else
{
- writer.writeModifyChangeRecord(sourceEntry.getDN(), modifications);
+ writer.writeModifyChangeRecord(sourceEntry.getName(), modifications);
}
return true;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
index bae7455..81af056 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -274,7 +274,7 @@
// If the entry is to be deleted, then just skip over it without writing
// it to the output.
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if (deletes.remove(entryDN) != null)
{
continue;
@@ -310,7 +310,7 @@
// If we've gotten here, then the (possibly updated) entry should be
// written to the LDIF entry Map.
- ldifEntries.put(entry.getDN(),entry);
+ ldifEntries.put(entry.getName(),entry);
}
@@ -362,7 +362,7 @@
Entry e = new Entry(add.getDN(), objectClasses, userAttributes,
operationalAttributes);
//Put the entry to be added into the LDIF entry map.
- ldifEntries.put(e.getDN(),e);
+ ldifEntries.put(e.getName(),e);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskEntry.java b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskEntry.java
index 4437a9c..1a42233 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskEntry.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools.tasks;
@@ -115,7 +116,7 @@
* @param entry to wrap
*/
public TaskEntry(Entry entry) {
- dn = entry.getDN();
+ dn = entry.getName();
String p = "ds-task-";
id = getSingleStringValue(entry, p + "id");
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AbstractOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/AbstractOperation.java
index bd1814a..643209a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AbstractOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AbstractOperation.java
@@ -539,7 +539,7 @@
{
if (authorizationEntry != null)
{
- return authorizationEntry.getDN();
+ return authorizationEntry.getName();
}
return DN.rootDN();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java b/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java
index b294caa..9037672 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.types;
@@ -133,7 +133,7 @@
*/
public DN getUserDN()
{
- return userEntry.getDN();
+ return userEntry.getName();
}
@@ -319,7 +319,7 @@
public String toString()
{
return "AccountStatusNotification(type=" +
- notificationType.getName() + ",dn=" + userEntry.getDN() +
+ notificationType.getName() + ",dn=" + userEntry.getName() +
",message=" + message + ")";
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java b/opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java
index b1f88d7..ddd6975 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.types;
@@ -109,7 +109,7 @@
isAuthenticated = (authenticationEntry != null);
mustChangePassword = false;
simpleBindDN = authenticationEntry != null ?
- authenticationEntry.getDN() : null;
+ authenticationEntry.getName() : null;
authorizationEntry = authenticationEntry;
saslMechanism = null;
authenticationType = AuthenticationType.INTERNAL;
@@ -322,7 +322,7 @@
{
if (authenticationEntry != null)
{
- return authenticationEntry.getDN();
+ return authenticationEntry.getName();
}
return null;
}
@@ -374,7 +374,7 @@
{
if (authorizationEntry != null)
{
- return authorizationEntry.getDN();
+ return authorizationEntry.getName();
}
return null;
}
@@ -466,7 +466,7 @@
if (authenticationEntry != null)
{
- authenticationEntry.getDN().toString(buffer);
+ authenticationEntry.getName().toString(buffer);
}
if (authorizationEntry == null)
@@ -476,7 +476,7 @@
else
{
buffer.append("\",authorizationDN=\"");
- authorizationEntry.getDN().toString(buffer);
+ authorizationEntry.getName().toString(buffer);
buffer.append("\"");
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java b/opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java
index 99719a4..b9b7083 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
@@ -149,7 +150,7 @@
*/
public DN getDN()
{
- return entry.getDN();
+ return entry.getName();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Entry.java b/opendj3-server-dev/src/server/org/opends/server/types/Entry.java
index da0017c..2cd60d7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Entry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/Entry.java
@@ -176,7 +176,7 @@
*
* @return The distinguished name for this entry.
*/
- public DN getDN()
+ public DN getName()
{
return dn;
}
@@ -2432,7 +2432,7 @@
}
else if (! parentProvided)
{
- DN parentDN = getDN().getParentDNInSuffix();
+ DN parentDN = getName().getParentDNInSuffix();
if (parentDN != null)
{
// Get the parent entry and check its structural class.
@@ -2518,7 +2518,7 @@
{
Message message = ERR_ENTRY_SCHEMA_DSR_NO_PARENT_OC.get(
String.valueOf(dn),
- String.valueOf(parentEntry.getDN()));
+ String.valueOf(parentEntry.getName()));
if (structuralPolicy == AcceptRejectWarn.REJECT)
{
@@ -2547,7 +2547,7 @@
Message message =
ERR_ENTRY_SCHEMA_VIOLATES_PARENT_DSR.get(
String.valueOf(dn),
- String.valueOf(parentEntry.getDN()));
+ String.valueOf(parentEntry.getName()));
if (structuralPolicy == AcceptRejectWarn.REJECT)
{
@@ -2601,7 +2601,7 @@
{
Message message = ERR_ENTRY_SCHEMA_DSR_NO_PARENT_OC.get(
String.valueOf(dn),
- String.valueOf(parentEntry.getDN()));
+ String.valueOf(parentEntry.getName()));
if (structuralPolicy == AcceptRejectWarn.REJECT)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/LDIFExportConfig.java b/opendj3-server-dev/src/server/org/opends/server/types/LDIFExportConfig.java
index a5a7728..8e124ec 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/LDIFExportConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/LDIFExportConfig.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types;
@@ -875,7 +875,7 @@
public boolean includeEntry(Entry entry)
throws DirectoryException
{
- DN dn = entry.getDN();
+ DN dn = entry.getName();
if (! excludeBranches.isEmpty())
{
for (DN excludeBranch : excludeBranches)
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/MemberList.java b/opendj3-server-dev/src/server/org/opends/server/types/MemberList.java
index 3ef228d..db5cf59 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/MemberList.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/MemberList.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.types;
@@ -70,7 +70,7 @@
Entry e = nextMemberEntry();
if (e != null)
{
- return e.getDN();
+ return e.getName();
}
return null;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java b/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
index 2835826..a896eb2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
@@ -2269,7 +2269,7 @@
return false;
default:
Message message = ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getDN()), toString(),
+ get(String.valueOf(entry.getName()), toString(),
String.valueOf(result));
logError(message);
return false;
@@ -2339,7 +2339,7 @@
default:
// This is an invalid filter type.
Message message = ERR_SEARCH_FILTER_INVALID_FILTER_TYPE.
- get(String.valueOf(entry.getDN()), toString(),
+ get(String.valueOf(entry.getName()), toString(),
filterType.toString());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
@@ -2377,7 +2377,7 @@
// The set of subcomponents was null. This is not allowed.
Message message =
ERR_SEARCH_FILTER_COMPOUND_COMPONENTS_NULL.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(filterType));
throw new DirectoryException(
@@ -2405,7 +2405,7 @@
if (depth >= MAX_NESTED_FILTER_DEPTH)
{
Message message = ERR_SEARCH_FILTER_NESTED_TOO_DEEP.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter));
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(),
@@ -2427,7 +2427,7 @@
TRACER.debugVerbose(
"Returning FALSE for AND component %s in " +
"filter %s for entry %s",
- f, completeFilter, entry.getDN());
+ f, completeFilter, entry.getName());
}
return result;
case UNDEFINED:
@@ -2435,13 +2435,13 @@
{
TRACER.debugInfo(
"Undefined result for AND component %s in filter " +
- "%s for entry %s", f, completeFilter, entry.getDN());
+ "%s for entry %s", f, completeFilter, entry.getName());
}
return result;
default:
Message message =
ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(result));
throw new
@@ -2457,7 +2457,7 @@
{
TRACER.debugVerbose(
"Returning TRUE for AND component %s in filter %s " +
- "for entry %s", this, completeFilter, entry.getDN());
+ "for entry %s", this, completeFilter, entry.getName());
}
return ConditionResult.TRUE;
}
@@ -2494,7 +2494,7 @@
// The set of subcomponents was null. This is not allowed.
Message message =
ERR_SEARCH_FILTER_COMPOUND_COMPONENTS_NULL.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(filterType));
throw new DirectoryException(
@@ -2522,7 +2522,7 @@
if (depth >= MAX_NESTED_FILTER_DEPTH)
{
Message message = ERR_SEARCH_FILTER_NESTED_TOO_DEEP.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter));
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(),
@@ -2541,7 +2541,7 @@
TRACER.debugVerbose(
"Returning TRUE for OR component %s in filter " +
"%s for entry %s",
- f, completeFilter, entry.getDN());
+ f, completeFilter, entry.getName());
}
return ConditionResult.TRUE;
case FALSE:
@@ -2552,14 +2552,14 @@
TRACER.debugInfo(
"Undefined result for OR component %s in filter " +
"%s for entry %s",
- f, completeFilter, entry.getDN());
+ f, completeFilter, entry.getName());
}
result = ConditionResult.UNDEFINED;
break;
default:
Message message =
ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(result));
throw new
@@ -2575,7 +2575,7 @@
TRACER.debugVerbose(
"Returning %s for OR component %s in filter %s for " +
"entry %s", result, this, completeFilter,
- entry.getDN());
+ entry.getName());
}
return result;
}
@@ -2611,7 +2611,7 @@
{
// The NOT subcomponent was null. This is not allowed.
Message message = ERR_SEARCH_FILTER_NOT_COMPONENT_NULL.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter));
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(),
@@ -2625,7 +2625,7 @@
if (depth >= MAX_NESTED_FILTER_DEPTH)
{
Message message = ERR_SEARCH_FILTER_NESTED_TOO_DEEP.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter));
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(),
@@ -2643,7 +2643,7 @@
TRACER.debugVerbose(
"Returning FALSE for NOT component %s in filter " +
"%s for entry %s",
- notComponent, completeFilter, entry.getDN());
+ notComponent, completeFilter, entry.getName());
}
return ConditionResult.FALSE;
case FALSE:
@@ -2652,7 +2652,7 @@
TRACER.debugVerbose(
"Returning TRUE for NOT component %s in filter " +
"%s for entry %s",
- notComponent, completeFilter, entry.getDN());
+ notComponent, completeFilter, entry.getName());
}
return ConditionResult.TRUE;
case UNDEFINED:
@@ -2661,12 +2661,12 @@
TRACER.debugInfo(
"Undefined result for NOT component %s in filter " +
"%s for entry %s",
- notComponent, completeFilter, entry.getDN());
+ notComponent, completeFilter, entry.getName());
}
return ConditionResult.UNDEFINED;
default:
Message message = ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(result));
throw new
@@ -2704,7 +2704,7 @@
{
Message message =
ERR_SEARCH_FILTER_EQUALITY_NO_ATTRIBUTE_TYPE.
- get(String.valueOf(entry.getDN()), toString());
+ get(String.valueOf(entry.getName()), toString());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
}
@@ -2714,7 +2714,7 @@
{
Message message =
ERR_SEARCH_FILTER_EQUALITY_NO_ASSERTION_VALUE.
- get(String.valueOf(entry.getDN()), toString(),
+ get(String.valueOf(entry.getName()), toString(),
attributeType.getNameOrOID());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
@@ -2731,7 +2731,7 @@
"Returning FALSE for equality component %s in " +
"filter %s because entry %s didn't have attribute " +
"type %s",
- this, completeFilter, entry.getDN(),
+ this, completeFilter, entry.getName(),
attributeType.getNameOrOID());
}
return ConditionResult.FALSE;
@@ -2748,7 +2748,7 @@
TRACER.debugVerbose(
"Returning TRUE for equality component %s in " +
"filter %s for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
return ConditionResult.TRUE;
}
@@ -2760,7 +2760,7 @@
"Returning FALSE for equality component %s in filter " +
"%s because entry %s didn't have attribute type " +
"%s with value %s",
- this, completeFilter, entry.getDN(),
+ this, completeFilter, entry.getName(),
attributeType.getNameOrOID(),
assertionValue.getValue().toString());
}
@@ -2795,7 +2795,7 @@
{
Message message =
ERR_SEARCH_FILTER_SUBSTRING_NO_ATTRIBUTE_TYPE.
- get(String.valueOf(entry.getDN()), toString());
+ get(String.valueOf(entry.getName()), toString());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
}
@@ -2808,7 +2808,7 @@
{
Message message =
ERR_SEARCH_FILTER_SUBSTRING_NO_SUBSTRING_COMPONENTS.
- get(String.valueOf(entry.getDN()), toString(),
+ get(String.valueOf(entry.getName()), toString(),
attributeType.getNameOrOID());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
@@ -2825,7 +2825,7 @@
"Returning FALSE for substring component %s in " +
"filter %s because entry %s didn't have attribute " +
"type %s",
- this, completeFilter, entry.getDN(),
+ this, completeFilter, entry.getName(),
attributeType.getNameOrOID());
}
return ConditionResult.FALSE;
@@ -2846,7 +2846,7 @@
TRACER.debugVerbose(
"Returning TRUE for substring component %s in " +
"filter %s for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
return ConditionResult.TRUE;
case FALSE:
@@ -2857,7 +2857,7 @@
TRACER.debugVerbose(
"Undefined result encountered for substring " +
"component %s in filter %s for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
result = ConditionResult.UNDEFINED;
break;
@@ -2870,7 +2870,7 @@
TRACER.debugVerbose(
"Returning %s for substring component %s in filter " +
"%s for entry %s",
- result, this, completeFilter, entry.getDN());
+ result, this, completeFilter, entry.getName());
}
return result;
}
@@ -2903,7 +2903,7 @@
{
Message message =
ERR_SEARCH_FILTER_GREATER_OR_EQUAL_NO_ATTRIBUTE_TYPE.
- get(String.valueOf(entry.getDN()), toString());
+ get(String.valueOf(entry.getName()), toString());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
}
@@ -2913,7 +2913,7 @@
{
Message message =
ERR_SEARCH_FILTER_GREATER_OR_EQUAL_NO_VALUE.
- get(String.valueOf(entry.getDN()), toString(),
+ get(String.valueOf(entry.getName()), toString(),
attributeType.getNameOrOID());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
@@ -2929,7 +2929,7 @@
TRACER.debugVerbose("Returning FALSE for " +
"greater-or-equal component %s in filter %s " +
"because entry %s didn't have attribute type %s",
- this, completeFilter, entry.getDN(),
+ this, completeFilter, entry.getName(),
attributeType.getNameOrOID());
}
return ConditionResult.FALSE;
@@ -2948,7 +2948,7 @@
TRACER.debugVerbose(
"Returning TRUE for greater-or-equal component " +
"%s in filter %s for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
return ConditionResult.TRUE;
case FALSE:
@@ -2960,7 +2960,7 @@
"Undefined result encountered for " +
"greater-or-equal component %s in filter %s " +
"for entry %s", this, completeFilter,
- entry.getDN());
+ entry.getName());
}
result = ConditionResult.UNDEFINED;
break;
@@ -2973,7 +2973,7 @@
TRACER.debugVerbose(
"Returning %s for greater-or-equal component %s in " +
"filter %s for entry %s",
- result, this, completeFilter, entry.getDN());
+ result, this, completeFilter, entry.getName());
}
return result;
}
@@ -3006,7 +3006,7 @@
{
Message message =
ERR_SEARCH_FILTER_LESS_OR_EQUAL_NO_ATTRIBUTE_TYPE.
- get(String.valueOf(entry.getDN()), toString());
+ get(String.valueOf(entry.getName()), toString());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
}
@@ -3016,7 +3016,7 @@
{
Message message =
ERR_SEARCH_FILTER_LESS_OR_EQUAL_NO_ASSERTION_VALUE.
- get(String.valueOf(entry.getDN()), toString(),
+ get(String.valueOf(entry.getName()), toString(),
attributeType.getNameOrOID());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
@@ -3032,7 +3032,7 @@
TRACER.debugVerbose(
"Returning FALSE for less-or-equal component %s in " +
"filter %s because entry %s didn't have attribute " +
- "type %s", this, completeFilter, entry.getDN(),
+ "type %s", this, completeFilter, entry.getName(),
attributeType.getNameOrOID());
}
return ConditionResult.FALSE;
@@ -3051,7 +3051,7 @@
TRACER.debugVerbose(
"Returning TRUE for less-or-equal component %s " +
"in filter %s for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
return ConditionResult.TRUE;
case FALSE:
@@ -3063,7 +3063,7 @@
"Undefined result encountered for " +
"less-or-equal component %s in filter %s " +
"for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
result = ConditionResult.UNDEFINED;
break;
@@ -3076,7 +3076,7 @@
TRACER.debugVerbose(
"Returning %s for less-or-equal component %s in " +
"filter %s for entry %s",
- result, this, completeFilter, entry.getDN());
+ result, this, completeFilter, entry.getName());
}
return result;
}
@@ -3108,7 +3108,7 @@
{
Message message =
ERR_SEARCH_FILTER_PRESENCE_NO_ATTRIBUTE_TYPE.
- get(String.valueOf(entry.getDN()), toString());
+ get(String.valueOf(entry.getName()), toString());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
}
@@ -3123,7 +3123,7 @@
TRACER.debugVerbose(
"Returning TRUE for presence component %s in " +
"filter %s for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
return ConditionResult.TRUE;
}
@@ -3134,7 +3134,7 @@
TRACER.debugVerbose(
"Returning FALSE for presence component %s in " +
"filter %s for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
return ConditionResult.FALSE;
}
@@ -3168,7 +3168,7 @@
{
Message message =
ERR_SEARCH_FILTER_APPROXIMATE_NO_ATTRIBUTE_TYPE.
- get(String.valueOf(entry.getDN()), toString());
+ get(String.valueOf(entry.getName()), toString());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
}
@@ -3178,7 +3178,7 @@
{
Message message =
ERR_SEARCH_FILTER_APPROXIMATE_NO_ASSERTION_VALUE.
- get(String.valueOf(entry.getDN()), toString(),
+ get(String.valueOf(entry.getName()), toString(),
attributeType.getNameOrOID());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
@@ -3194,7 +3194,7 @@
TRACER.debugVerbose(
"Returning FALSE for approximate component %s in " +
"filter %s because entry %s didn't have attribute " +
- "type %s", this, completeFilter, entry.getDN(),
+ "type %s", this, completeFilter, entry.getName(),
attributeType.getNameOrOID());
}
return ConditionResult.FALSE;
@@ -3213,7 +3213,7 @@
TRACER.debugVerbose(
"Returning TRUE for approximate component %s in " +
"filter %s for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
return ConditionResult.TRUE;
case FALSE:
@@ -3224,7 +3224,7 @@
TRACER.debugVerbose(
"Undefined result encountered for approximate " +
"component %s in filter %s for entry %s",
- this, completeFilter, entry.getDN());
+ this, completeFilter, entry.getName());
}
result = ConditionResult.UNDEFINED;
break;
@@ -3237,7 +3237,7 @@
TRACER.debugVerbose(
"Returning %s for approximate component %s in filter " +
"%s for entry %s",
- result, this, completeFilter, entry.getDN());
+ result, this, completeFilter, entry.getName());
}
return result;
}
@@ -3274,7 +3274,7 @@
{
Message message =
ERR_SEARCH_FILTER_EXTENSIBLE_MATCH_NO_ASSERTION_VALUE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter));
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
@@ -3306,7 +3306,7 @@
{
Message message =
ERR_SEARCH_FILTER_EXTENSIBLE_MATCH_NO_RULE_OR_TYPE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter));
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
message);
@@ -3406,7 +3406,7 @@
default:
Message message =
ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(r));
throw new DirectoryException(
@@ -3454,7 +3454,7 @@
default:
Message message =
ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(r));
throw new DirectoryException(
@@ -3496,7 +3496,7 @@
break;
default:
Message message = ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(r));
throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
@@ -3544,7 +3544,7 @@
default:
Message message =
ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(r));
throw new DirectoryException(
@@ -3574,7 +3574,7 @@
// attributes, then do so.
if (dnAttributes)
{
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
int count = entryDN.size();
for (int rdnIndex = 0; rdnIndex < count; rdnIndex++)
{
@@ -3605,7 +3605,7 @@
default:
Message message =
ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
- get(String.valueOf(entry.getDN()),
+ get(String.valueOf(entry.getName()),
String.valueOf(completeFilter),
String.valueOf(r));
throw new DirectoryException(
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java b/opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java
index 688e564..94311cb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
@@ -67,7 +68,7 @@
*/
public SearchResultEntry(Entry entry)
{
- super(entry.getDN(), entry.getObjectClasses(),
+ super(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
@@ -90,7 +91,7 @@
*/
public SearchResultEntry(Entry entry, List<Control> controls)
{
- super(entry.getDN(), entry.getObjectClasses(),
+ super(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SubEntry.java b/opendj3-server-dev/src/server/org/opends/server/types/SubEntry.java
index 63f86ca..ec59675 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SubEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SubEntry.java
@@ -210,7 +210,7 @@
try
{
this.subTreeSpec = SubtreeSpecification.valueOf(
- entry.getDN().parent(), specString);
+ entry.getName().parent(), specString);
isValidSpec = true;
}
catch (DirectoryException de)
@@ -245,7 +245,7 @@
{
// There is none for some reason eg this could be
// old Draft based ldapSubEntry so create a dummy.
- this.subTreeSpec = new SubtreeSpecification(entry.getDN().parent(),
+ this.subTreeSpec = new SubtreeSpecification(entry.getName().parent(),
null, -1, -1, null, null, null);
}
@@ -424,7 +424,7 @@
*/
public final DN getDN()
{
- return this.entry.getDN();
+ return this.entry.getName();
}
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java b/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java
index ebc7bc1..ca1eb51 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java
@@ -1616,7 +1616,7 @@
public boolean isWithinScope(final Entry entry)
{
- if (isDNWithinScope(entry.getDN()))
+ if (isDNWithinScope(entry.getName()))
{
if (refinements != null)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java b/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java
index 963d48e..4b13487 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttributeRule.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.types;
@@ -266,7 +266,7 @@
// If there are any base DNs defined, then the entry must be below
// one of them.
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if (! baseDNs.isEmpty())
{
boolean found = false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
index 1db53ff..b28a110 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
@@ -361,7 +361,7 @@
}
suffix.removePending(entryDN);
Message message = ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT.
- get(String.valueOf(entry.getDN()), lastEntryLineNumber,
+ get(String.valueOf(entry.getName()), lastEntryLineNumber,
String.valueOf(e));
logToSkipWriter(lines, message);
suffix.removePending(entryDN);
@@ -559,7 +559,7 @@
}
Message message = ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT.
- get(String.valueOf(entry.getDN()), lastEntryLineNumber,
+ get(String.valueOf(entry.getName()), lastEntryLineNumber,
String.valueOf(e));
throw new LDIFException(message, lastEntryLineNumber, true, e);
}
@@ -1337,7 +1337,7 @@
rejectWriter.write(message.toString());
rejectWriter.newLine();
}
- rejectWriter.write(e.getDN().toString());
+ rejectWriter.write(e.getName().toString());
rejectWriter.newLine();
List<StringBuilder> eLDIF = e.toLDIF();
for(StringBuilder l : eLDIF) {
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java
index 076d2bc..ea1c66c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.util;
@@ -409,7 +409,7 @@
// First, write the DN.
- writeDN("dn", entry.getDN(), writer, wrapLines, wrapColumn);
+ writeDN("dn", entry.getName(), writer, wrapLines, wrapColumn);
// Next, the changetype.
@@ -478,7 +478,7 @@
// Add the DN and changetype lines.
- writeDN("dn", entry.getDN(), writer, wrapLines, wrapColumn);
+ writeDN("dn", entry.getName(), writer, wrapLines, wrapColumn);
StringBuilder changeTypeLine = new StringBuilder("changetype: delete");
writeLDIFLine(changeTypeLine, writer, wrapLines, wrapColumn);
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
index 564c68a..4385cca 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
@@ -486,7 +486,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (OID_PROXIED_AUTH_V2.equals(oid))
@@ -510,7 +510,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (OID_PERSISTENT_SEARCH.equals(oid))
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
index dddf2a6..0531cb0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
@@ -1239,7 +1239,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (oid.equals(OID_PROXIED_AUTH_V2))
@@ -1264,7 +1264,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (oid.equals(OID_PASSWORD_POLICY_CONTROL))
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
index ff64011..3658be0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
@@ -498,7 +498,7 @@
}
else
{
- setUserEntryDN(userEntry.getDN());
+ setUserEntryDN(userEntry.getName());
}
@@ -543,7 +543,7 @@
ERR_BIND_REJECTED_LOCKDOWN_MODE.get());
}
setAuthenticationInfo(new AuthenticationInfo(userEntry, getBindDN(),
- DirectoryServer.isRootDN(userEntry.getDN())));
+ DirectoryServer.isRootDN(userEntry.getName())));
// Set resource limits for the authenticated user.
setResourceLimits(userEntry);
@@ -613,7 +613,7 @@
ERR_BIND_REJECTED_LOCKDOWN_MODE.get());
}
setAuthenticationInfo(new AuthenticationInfo(userEntry, getBindDN(),
- DirectoryServer.isRootDN(userEntry.getDN())));
+ DirectoryServer.isRootDN(userEntry.getName())));
// Set resource limits for the authenticated user.
setResourceLimits(userEntry);
@@ -735,7 +735,7 @@
// Create the password policy state object.
if (saslAuthUserEntry != null)
{
- setUserEntryDN(saslAuthUserEntry.getDN());
+ setUserEntryDN(saslAuthUserEntry.getName());
// FIXME -- Need to have a way to enable debugging.
authPolicyState = AuthenticationPolicyState.forUser(
@@ -914,11 +914,11 @@
{
// This policy isn't applicable to root users, so if it's a root
// user then ignore it.
- if (! DirectoryServer.isRootDN(userEntry.getDN()))
+ if (! DirectoryServer.isRootDN(userEntry.getName()))
{
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_BIND_OPERATION_WRITABILITY_DISABLED.get(
- String.valueOf(userEntry.getDN())));
+ String.valueOf(userEntry.getName())));
}
}
@@ -935,7 +935,7 @@
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_BIND_OPERATION_INSECURE_SASL_BIND.get(
saslMechanism,
- String.valueOf(userEntry.getDN())));
+ String.valueOf(userEntry.getName())));
}
}
else
@@ -1168,13 +1168,13 @@
}
logError(cannotProcessAttributeMessage.get(v.getValue().toString(),
- String.valueOf(userEntry.getDN())));
+ String.valueOf(userEntry.getName())));
}
}
else if (a.size() > 1)
{
logError(nonUniqueAttributeMessage.get(String
- .valueOf(userEntry.getDN())));
+ .valueOf(userEntry.getName())));
}
}
return null;
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
index 0ea1ecd..a811d27 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java
@@ -486,7 +486,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (oid.equals(OID_PROXIED_AUTH_V2))
@@ -510,7 +510,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
index b613350..259762f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
@@ -543,7 +543,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (oid.equals(OID_PROXIED_AUTH_V2))
@@ -567,7 +567,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
index 002fa2a..03847ac 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
@@ -225,7 +225,7 @@
for (PersistentSearch psearch : wfe.getPersistentSearches())
{
psearch.processModifyDN(newEntry, getChangeNumber(), currentEntry
- .getDN());
+ .getName());
}
// Notify change listeners.
@@ -705,7 +705,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (oid.equals(OID_PROXIED_AUTH_V2))
@@ -729,7 +729,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
index e803463..79daf6e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
@@ -805,7 +805,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (oid.equals(OID_PROXIED_AUTH_V2))
@@ -829,7 +829,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (oid.equals(OID_PASSWORD_POLICY_CONTROL))
@@ -1567,7 +1567,7 @@
{
AttributeType t = attr.getAttributeType();
- RDN rdn = modifiedEntry.getDN().rdn();
+ RDN rdn = modifiedEntry.getName().rdn();
if ((rdn != null) && rdn.hasAttributeType(t) &&
(! modifiedEntry.hasValue(t, attr.getOptions(),
rdn.getAttributeValue(t))))
@@ -1690,7 +1690,7 @@
// Make sure that the RDN attribute value(s) has not been removed.
AttributeType t = attr.getAttributeType();
- RDN rdn = modifiedEntry.getDN().rdn();
+ RDN rdn = modifiedEntry.getName().rdn();
if ((rdn != null)
&& rdn.hasAttributeType(t)
&& (!modifiedEntry.hasValue(t, attr.getOptions(), rdn
@@ -1719,7 +1719,7 @@
{
// The specified attribute type must not be an RDN attribute.
AttributeType t = attr.getAttributeType();
- RDN rdn = modifiedEntry.getDN().rdn();
+ RDN rdn = modifiedEntry.getName().rdn();
if ((rdn != null) && rdn.hasAttributeType(t))
{
throw newDirectoryException(modifiedEntry, ResultCode.NOT_ALLOWED_ON_RDN,
@@ -2012,7 +2012,7 @@
if (selfChange)
{
AuthenticationInfo authInfo = clientConnection.getAuthenticationInfo();
- if (authInfo.getAuthenticationDN().equals(modifiedEntry.getDN()))
+ if (authInfo.getAuthenticationDN().equals(modifiedEntry.getName()))
{
clientConnection.setMustChangePassword(false);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
index b66255c..368f29e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
@@ -446,7 +446,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (oid.equals(OID_PROXIED_AUTH_V2))
@@ -470,7 +470,7 @@
}
else
{
- setProxiedAuthorizationDN(authorizationEntry.getDN());
+ setProxiedAuthorizationDN(authorizationEntry.getName());
}
}
else if (oid.equals(OID_PERSISTENT_SEARCH))
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index 6a2ca13..1888f48 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -1266,7 +1266,7 @@
*/
public static void deleteEntry(Entry entry) throws Exception
{
- deleteEntry(entry.getDN());
+ deleteEntry(entry.getName());
}
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
index 81aabb4..c2c4e90 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
@@ -296,7 +296,7 @@
*/
private void addEntry(Entry entry) {
MockEntry parent = rootEntry;
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
// Create required glue entries.
for (int i = 0; i < entryDN.size() - 1; i++) {
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
index 1c9711a..2eec165 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -94,7 +95,7 @@
return mo.getConfiguration();
} catch (DefinitionDecodingException e) {
throw ConfigExceptionFactory.getInstance()
- .createDecodingExceptionAdaptor(entry.getDN(), e);
+ .createDecodingExceptionAdaptor(entry.getName(), e);
} catch (ServerManagedObjectDecodingException e) {
throw ConfigExceptionFactory.getInstance()
.createDecodingExceptionAdaptor(e);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
index c49c6f9..556d67e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.admin.server;
@@ -542,7 +543,7 @@
InternalClientConnection conn = InternalClientConnection
.getRootConnection();
- AddOperation add = conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ AddOperation add = conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(), entry.getOperationalAttributes());
Assert.assertEquals(add.getResultCode(), expected, add.getErrorMessage()
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
index b8cdb61..74c4118 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.api;
@@ -134,7 +134,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -192,7 +192,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -255,7 +255,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -312,7 +312,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -375,7 +375,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -437,7 +437,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -497,7 +497,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -575,7 +575,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -657,7 +657,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -746,7 +746,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -830,7 +830,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
index 7c40dfb..d48c9d4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
@@ -109,7 +109,7 @@
DN schemaDN = DN.valueOf("cn=schema");
Entry schemaEntry = schemaBackend.getEntry(schemaDN);
assertNotNull(schemaEntry);
- assertEquals(schemaEntry.getDN(), schemaDN);
+ assertEquals(schemaEntry.getName(), schemaDN);
AttributeType t = DirectoryServer.getAttributeType("attributetypes");
assertTrue(schemaEntry.hasAttribute(t));
@@ -160,7 +160,7 @@
DN schemaDN = DN.valueOf("cn=schema");
Entry schemaEntry = schemaBackend.getSchemaEntry(schemaDN, false);
assertNotNull(schemaEntry);
- assertEquals(schemaEntry.getDN(), schemaDN);
+ assertEquals(schemaEntry.getName(), schemaDN);
AttributeType t = DirectoryServer.getAttributeType("attributetypes");
assertTrue(schemaEntry.hasAttribute(t));
@@ -178,7 +178,7 @@
schemaDN = DN.valueOf("cn=subschema");
schemaEntry = schemaBackend.getSchemaEntry(schemaDN, false);
assertNotNull(schemaEntry);
- assertEquals(schemaEntry.getDN(), schemaDN);
+ assertEquals(schemaEntry.getName(), schemaDN);
t = DirectoryServer.getAttributeType("attributetypes");
assertTrue(schemaEntry.hasAttribute(t));
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
index 5d284c3..cb0eaaa 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -81,9 +82,9 @@
new LDIFReader(new LDIFImportConfig(ldifEntryStream));
for(int i =0; i<numEntries;i++) {
Entry entry = reader.readEntry(false);
- entryTreeMap.put(entry.getDN(), entry);
+ entryTreeMap.put(entry.getName(), entry);
AddOperation addOperation =
- connection.processAdd(entry.getDN(),
+ connection.processAdd(entry.getName(),
entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
index 938d497..f5626fc 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -552,12 +552,12 @@
public void testAdd() throws Exception {
for (Entry topEntry : topEntries) {
backend.addEntry(topEntry, null);
- assertNotNull(backend.getEntry(topEntry.getDN()));
+ assertNotNull(backend.getEntry(topEntry.getName()));
}
for (Entry entry : entries) {
backend.addEntry(entry, null);
- assertNotNull(backend.getEntry(entry.getDN()));
+ assertNotNull(backend.getEntry(entry.getName()));
}
}
@@ -572,7 +572,7 @@
List<SearchResultEntry> result = search.getSearchEntries();
assertEquals(result.size(), 1);
- assertEquals(result.get(0).getDN().toString(), "dc=test,dc=com");
+ assertEquals(result.get(0).getName().toString(), "dc=test,dc=com");
search = conn.processSearch(DN.valueOf("dc=test,dc=com"),
SearchScope.BASE_OBJECT, LDAPFilter.decode("(ou=People)").toSearchFilter());
@@ -586,7 +586,7 @@
result = search.getSearchEntries();
assertEquals(result.size(), 1);
- assertEquals(result.get(0).getDN().toString(),
+ assertEquals(result.get(0).getName().toString(),
"ou=People,dc=test,dc=com");
search = conn.processSearch(DN.valueOf("dc=test,dc=com"),
@@ -596,7 +596,7 @@
assertEquals(result.size(), 13);
for (Entry entry : result) {
- assertThat(entry.getDN().toString()).isNotEqualTo("dc=test,dc=com");
+ assertThat(entry.getName().toString()).isNotEqualTo("dc=test,dc=com");
}
search = conn.processSearch(DN.valueOf("dc=test,dc=com"),
@@ -1176,7 +1176,7 @@
DN subDN = DN.valueOf("uid=user.0,ou=Good People,ou=JEB Testers,dc=test,dc=com");
Entry subEntry = backend.getEntry(subDN);
assertNotNull(subEntry);
- assertEquals(subDN, subEntry.getDN());
+ assertEquals(subDN, subEntry.getName());
EntryID newSubordinateID = ec.getDN2ID().get(null, subDN, LockMode.DEFAULT);
assertTrue(newSubordinateID.compareTo(newID) > 0);
@@ -1465,7 +1465,7 @@
//Add 2 more entries to overflow the index entry limit.
for (Entry entry : additionalEntries) {
backend.addEntry(entry, null);
- assertNotNull(backend.getEntry(entry.getDN()));
+ assertNotNull(backend.getEntry(entry.getName()));
}
InternalClientConnection conn =
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
index 15fabaf..965edf2 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
@@ -166,7 +166,7 @@
for (Entry entry : entryList) {
entryContainer.addEntry(entry, null);
- Entry afterEntry = entryContainer.getEntry(entry.getDN());
+ Entry afterEntry = entryContainer.getEntry(entry.getName());
assertTrue(afterEntry != null);
}
actualHighestID = entryContainer.getHighestEntryID();
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
index 61b19d6..ac30245 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -197,7 +198,7 @@
buffer.append((byte)0x01);
// TODO: Can we encode the DN directly into buffer?
- byte[] dnBytes = getBytes(entry.getDN().toString());
+ byte[] dnBytes = getBytes(entry.getName().toString());
buffer.appendBERLength(dnBytes.length);
buffer.append(dnBytes);
@@ -300,7 +301,7 @@
if (! config.excludeDN())
{
// TODO: Can we encode the DN directly into buffer?
- byte[] dnBytes = getBytes(entry.getDN().toString());
+ byte[] dnBytes = getBytes(entry.getName().toString());
buffer.appendBERLength(dnBytes.length);
buffer.append(dnBytes);
}
@@ -439,7 +440,7 @@
assertEquals(entryBefore.getAttributes().size(), entryAfter
.getAttributes().size());
- assertEquals(entryBefore.getDN(), entryAfter.getDN());
+ assertEquals(entryBefore.getName(), entryAfter.getName());
// check the object classes were not changed
for (String ocBefore : entryBefore.getObjectClasses().values()) {
@@ -556,7 +557,7 @@
entryAfterV2 = Entry.decode(bsb.asReader());
if (config.excludeDN())
{
- entryAfterV2.setDN(entryBefore.getDN());
+ entryAfterV2.setDN(entryBefore.getName());
}
assertEquals(entryBefore, entryAfterV2);
}
@@ -588,7 +589,7 @@
entryAfterV3 = Entry.decode(bsb.asReader());
if (config.excludeDN())
{
- entryAfterV3.setDN(entryBefore.getDN());
+ entryAfterV3.setDN(entryBefore.getName());
}
assertEquals(entryBefore, entryAfterV3);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
index 9aac929..72c4006 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
@@ -395,7 +395,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -483,7 +483,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -571,7 +571,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -765,7 +765,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -833,7 +833,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -921,7 +921,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -1010,7 +1010,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -1099,7 +1099,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -1189,7 +1189,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -1278,7 +1278,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
index 33c6229..e91fdcd 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
@@ -424,7 +424,7 @@
ProxiedAuthV1Control proxyControl =
new ProxiedAuthV1Control(DN.valueOf("uid=test,o=test"));
- assertEquals(proxyControl.getAuthorizationEntry().getDN(),
+ assertEquals(proxyControl.getAuthorizationEntry().getName(),
DN.valueOf("uid=test,o=test"));
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
index ba4da8a..22d0c4f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
@@ -314,7 +314,7 @@
ProxiedAuthV2Control proxyControl =
new ProxiedAuthV2Control(ByteString.valueOf("dn:uid=test,o=test"));
- assertEquals(proxyControl.getAuthorizationEntry().getDN(),
+ assertEquals(proxyControl.getAuthorizationEntry().getName(),
DN.valueOf("uid=test,o=test"));
}
@@ -411,7 +411,7 @@
ProxiedAuthV2Control proxyControl =
new ProxiedAuthV2Control(ByteString.valueOf("u:test"));
- assertEquals(proxyControl.getAuthorizationEntry().getDN(),
+ assertEquals(proxyControl.getAuthorizationEntry().getName(),
DN.valueOf("uid=test,o=test"));
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
index b5bba98..0dfc948 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
@@ -342,7 +342,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -413,7 +413,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -482,7 +482,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -553,7 +553,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -622,7 +622,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -691,7 +691,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
index 1a3fac9..c1e14d7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
@@ -528,7 +528,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -621,7 +621,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -714,7 +714,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -921,7 +921,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -992,7 +992,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -1085,7 +1085,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -1179,7 +1179,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -1273,7 +1273,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
@@ -1368,7 +1368,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
index 05af03f..3824b20 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.core;
@@ -403,7 +403,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -622,7 +622,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
index 6dff957..1697f60 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
@@ -108,11 +108,11 @@
noControls, ByteString.valueOf("ou=People,o=test"),
ldapAttrList),
new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
- null, entry.getDN(), entry.getObjectClasses(),
+ null, entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes()),
new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
- noControls, entry.getDN(), entry.getObjectClasses(),
+ noControls, entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes()),
};
@@ -223,7 +223,7 @@
AddOperationBasis addOperation =
new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
- null, entry.getDN(), entry.getObjectClasses(),
+ null, entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertNotNull(addOperation.getEntryDN());
@@ -253,7 +253,7 @@
AddOperationBasis addOperation =
new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
- null, entry.getDN(), entry.getObjectClasses(),
+ null, entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertNotNull(addOperation.getEntryDN());
@@ -338,7 +338,7 @@
UpdatePreOpPlugin.addObjectClassToAdd(oc);
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -379,7 +379,7 @@
UpdatePreOpPlugin.addObjectClassToRemove(oc);
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -421,7 +421,7 @@
UpdatePreOpPlugin.addAttributeToSet(a);
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -484,7 +484,7 @@
UpdatePreOpPlugin.addAttributeToSet(a);
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -528,7 +528,7 @@
UpdatePreOpPlugin.addAttributeToRemove(attrType);
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -619,7 +619,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -927,7 +927,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1090,7 +1090,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1153,7 +1153,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1188,7 +1188,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1223,7 +1223,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1270,7 +1270,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1299,7 +1299,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1329,7 +1329,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1362,7 +1362,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1396,7 +1396,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1432,7 +1432,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1469,7 +1469,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1508,7 +1508,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1547,7 +1547,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(), userAttrs,
+ conn.processAdd(entry.getName(), entry.getObjectClasses(), userAttrs,
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
}
@@ -1584,7 +1584,7 @@
DirectoryServer.setWritabilityMode(WritabilityMode.DISABLED);
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1624,7 +1624,7 @@
DirectoryServer.setWritabilityMode(WritabilityMode.INTERNAL_ONLY);
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1731,7 +1731,7 @@
b.setWritabilityMode(WritabilityMode.DISABLED);
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1772,7 +1772,7 @@
b.setWritabilityMode(WritabilityMode.INTERNAL_ONLY);
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1876,7 +1876,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1915,7 +1915,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1948,7 +1948,7 @@
AddOperationBasis addOperation =
new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
- null, entry.getDN(), entry.getObjectClasses(),
+ null, entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
@@ -1981,7 +1981,7 @@
AddOperationBasis addOperation =
new AddOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
- null, entry.getDN(), entry.getObjectClasses(),
+ null, entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
@@ -2023,7 +2023,7 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.BUSY);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
index a42e773..1da628a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
@@ -93,7 +93,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(backendEntry.getDN(), backendEntry.getObjectClasses(),
+ conn.processAdd(backendEntry.getName(), backendEntry.getObjectClasses(),
backendEntry.getUserAttributes(),
backendEntry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -135,7 +135,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(backendEntry.getDN(), backendEntry.getObjectClasses(),
+ conn.processAdd(backendEntry.getName(), backendEntry.getObjectClasses(),
backendEntry.getUserAttributes(),
backendEntry.getOperationalAttributes());
assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
@@ -160,14 +160,14 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(backendEntry.getDN(), backendEntry.getObjectClasses(),
+ conn.processAdd(backendEntry.getName(), backendEntry.getObjectClasses(),
backendEntry.getUserAttributes(),
backendEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(backendID));
assertNull(DirectoryServer.getBackendWithBaseDN(baseDN));
- DeleteOperation deleteOperation = conn.processDelete(backendEntry.getDN());
+ DeleteOperation deleteOperation = conn.processDelete(backendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -190,7 +190,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(backendEntry.getDN(), backendEntry.getObjectClasses(),
+ conn.processAdd(backendEntry.getName(), backendEntry.getObjectClasses(),
backendEntry.getUserAttributes(),
backendEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -204,13 +204,13 @@
assertTrue(DirectoryServer.isNamingContext(baseDN));
Entry e = createEntry(baseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
assertTrue(backend.entryExists(baseDN));
- DeleteOperation deleteOperation = conn.processDelete(backendEntry.getDN());
+ DeleteOperation deleteOperation = conn.processDelete(backendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(backendID));
}
@@ -236,7 +236,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(backendEntry.getDN(), backendEntry.getObjectClasses(),
+ conn.processAdd(backendEntry.getName(), backendEntry.getObjectClasses(),
backendEntry.getUserAttributes(),
backendEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -249,7 +249,7 @@
mods.add(new Modification(ModificationType.REPLACE,
Attributes.create("ds-cfg-enabled", "true")));
ModifyOperation modifyOperation =
- conn.processModify(backendEntry.getDN(), mods);
+ conn.processModify(backendEntry.getName(), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
Backend backend = DirectoryServer.getBackend(backendID);
@@ -261,7 +261,7 @@
assertTrue(DirectoryServer.isNamingContext(baseDN));
Entry e = createEntry(baseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -273,14 +273,14 @@
mods.add(new Modification(ModificationType.REPLACE,
Attributes.create("ds-cfg-enabled", "false")));
modifyOperation =
- conn.processModify(backendEntry.getDN(), mods);
+ conn.processModify(backendEntry.getName(), mods);
assertNull(DirectoryServer.getBackend(backendID));
assertFalse(DirectoryServer.entryExists(baseDN));
assertFalse(DirectoryServer.isNamingContext(baseDN));
// Delete the disabled backend.
- DeleteOperation deleteOperation = conn.processDelete(backendEntry.getDN());
+ DeleteOperation deleteOperation = conn.processDelete(backendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -305,7 +305,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(parentBackendEntry.getDN(),
+ conn.processAdd(parentBackendEntry.getName(),
parentBackendEntry.getObjectClasses(),
parentBackendEntry.getUserAttributes(),
parentBackendEntry.getOperationalAttributes());
@@ -321,7 +321,7 @@
assertTrue(DirectoryServer.isNamingContext(parentBaseDN));
Entry e = createEntry(parentBaseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -335,7 +335,7 @@
childBaseDN);
addOperation =
- conn.processAdd(childBackendEntry.getDN(),
+ conn.processAdd(childBackendEntry.getName(),
childBackendEntry.getObjectClasses(),
childBackendEntry.getUserAttributes(),
childBackendEntry.getOperationalAttributes());
@@ -352,7 +352,7 @@
assertFalse(DirectoryServer.isNamingContext(childBaseDN));
e = createEntry(childBaseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -371,17 +371,17 @@
// Make sure that we can't remove the parent backend with the child still
// in place.
DeleteOperation deleteOperation =
- conn.processDelete(parentBackendEntry.getDN());
+ conn.processDelete(parentBackendEntry.getName());
assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
assertNotNull(DirectoryServer.getBackend(parentBackendID));
// Delete the child and then delete the parent.
- deleteOperation = conn.processDelete(childBackendEntry.getDN());
+ deleteOperation = conn.processDelete(childBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(childBackendID));
assertTrue(parentBackend.getSubordinateBackends().length == 0);
- deleteOperation = conn.processDelete(parentBackendEntry.getDN());
+ deleteOperation = conn.processDelete(parentBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(parentBackendID));
}
@@ -408,7 +408,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(childBackendEntry.getDN(),
+ conn.processAdd(childBackendEntry.getName(),
childBackendEntry.getObjectClasses(),
childBackendEntry.getUserAttributes(),
childBackendEntry.getOperationalAttributes());
@@ -424,7 +424,7 @@
assertFalse(childBackend.entryExists(childBaseDN));
Entry e = createEntry(childBaseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -440,7 +440,7 @@
parentBaseDN);
addOperation =
- conn.processAdd(parentBackendEntry.getDN(),
+ conn.processAdd(parentBackendEntry.getName(),
parentBackendEntry.getObjectClasses(),
parentBackendEntry.getUserAttributes(),
parentBackendEntry.getOperationalAttributes());
@@ -455,7 +455,7 @@
assertTrue(parentBackend.getSubordinateBackends().length == 1);
e = createEntry(parentBaseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -474,12 +474,12 @@
// Delete the backends from the server.
DeleteOperation deleteOperation =
- conn.processDelete(childBackendEntry.getDN());
+ conn.processDelete(childBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(childBackendID));
assertTrue(parentBackend.getSubordinateBackends().length == 0);
- deleteOperation = conn.processDelete(parentBackendEntry.getDN());
+ deleteOperation = conn.processDelete(parentBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(parentBackendID));
}
@@ -506,7 +506,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(parentBackendEntry.getDN(),
+ conn.processAdd(parentBackendEntry.getName(),
parentBackendEntry.getObjectClasses(),
parentBackendEntry.getUserAttributes(),
parentBackendEntry.getOperationalAttributes());
@@ -521,7 +521,7 @@
assertFalse(parentBackend.entryExists(parentBaseDN));
Entry e = createEntry(parentBaseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -536,7 +536,7 @@
grandchildBaseDN);
addOperation =
- conn.processAdd(grandchildBackendEntry.getDN(),
+ conn.processAdd(grandchildBackendEntry.getName(),
grandchildBackendEntry.getObjectClasses(),
grandchildBackendEntry.getUserAttributes(),
grandchildBackendEntry.getOperationalAttributes());
@@ -554,7 +554,7 @@
// Verify that we can't create the grandchild base entry because its parent
// doesn't exist.
e = createEntry(grandchildBaseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.NO_SUCH_OBJECT);
@@ -568,7 +568,7 @@
childBaseDN);
addOperation =
- conn.processAdd(childBackendEntry.getDN(),
+ conn.processAdd(childBackendEntry.getName(),
childBackendEntry.getObjectClasses(),
childBackendEntry.getUserAttributes(),
childBackendEntry.getOperationalAttributes());
@@ -587,7 +587,7 @@
assertEquals(grandchildBackend.getParentBackend(), childBackend);
e = createEntry(childBaseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -595,7 +595,7 @@
// Now we can create the grandchild base entry.
e = createEntry(grandchildBaseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -616,7 +616,7 @@
Attributes.create("ds-cfg-enabled",
"false")));
ModifyOperation modifyOperation =
- conn.processModify(childBackendEntry.getDN(), mods);
+ conn.processModify(childBackendEntry.getName(), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -633,7 +633,7 @@
mods = new ArrayList<Modification>();
mods.add(new Modification(ModificationType.REPLACE,
Attributes.create("ds-cfg-enabled", "true")));
- modifyOperation = conn.processModify(childBackendEntry.getDN(), mods);
+ modifyOperation = conn.processModify(childBackendEntry.getName(), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -667,7 +667,7 @@
// Add the child entry back into the server to get things back to the way
// they were before we disabled the backend.
e = createEntry(childBaseDN);
- addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -685,18 +685,18 @@
// Get rid of the entries in the proper order.
DeleteOperation deleteOperation =
- conn.processDelete(grandchildBackendEntry.getDN());
+ conn.processDelete(grandchildBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(grandchildBackendID));
assertTrue(childBackend.getSubordinateBackends().length == 0);
assertTrue(parentBackend.getSubordinateBackends().length == 1);
- deleteOperation = conn.processDelete(childBackendEntry.getDN());
+ deleteOperation = conn.processDelete(childBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(childBackendID));
assertTrue(parentBackend.getSubordinateBackends().length == 0);
- deleteOperation = conn.processDelete(parentBackendEntry.getDN());
+ deleteOperation = conn.processDelete(parentBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(parentBackendID));
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
index cef5c5e..1722425 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
@@ -1716,7 +1716,7 @@
// new InternalClientConnection(new AuthenticationInfo());
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
index 62bcdac..a0f0fe9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
@@ -95,12 +95,12 @@
"allow(proxy) userdn=\"ldap:///uid=proxy.user,o=test\";)"
);
AddOperation addOperation =
- connection.processAdd(entry.getDN(),
+ connection.processAdd(entry.getName(),
entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(entry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(entry.getName()));
// Add a user capable of using the proxied authorization control.
TestCaseUtils.addEntry(
@@ -134,7 +134,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"))
};
}
@@ -211,7 +211,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -236,7 +236,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawala"));
compareOperation.run();
@@ -306,7 +306,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"description", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -330,7 +330,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"NotAnAttribute",
ByteString.valueOf("rogasawara"));
@@ -353,7 +353,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"name",
ByteString.valueOf("Ogasawara"));
@@ -373,7 +373,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"sn",
ByteString.valueOf("Ogasawara"));
@@ -393,7 +393,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"sn;lang-ja",
ByteString.valueOf("Ogasawara"));
@@ -413,7 +413,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"givenName;lAnG-En",
ByteString.valueOf("Rodney"));
@@ -441,7 +441,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
controls,
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -471,7 +471,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
controls,
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -498,7 +498,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
controls,
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -527,7 +527,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
controls,
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -554,7 +554,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
controls,
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -581,7 +581,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
controls,
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -609,7 +609,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
controls,
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -637,7 +637,7 @@
conn, InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
controls,
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
compareOperation.run();
@@ -680,7 +680,7 @@
// operation has completed.
TestCaseUtils.quiesceServer();
- Lock writeLock = LockManager.lockWrite(entry.getDN());
+ Lock writeLock = LockManager.lockWrite(entry.getName());
assertNotNull(writeLock);
try
@@ -692,7 +692,7 @@
CompareRequestProtocolOp compareRequest =
new CompareRequestProtocolOp(
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
"uid", ByteString.valueOf("rogasawara"));
message = new LDAPMessage(2, compareRequest);
w.writeMessage(message);
@@ -714,7 +714,7 @@
assertEquals(ldapStatistics.getCompareResponses(), compareResponses+1);
} finally
{
- LockManager.unlock(entry.getDN(), writeLock);
+ LockManager.unlock(entry.getName(), writeLock);
}
} finally
{
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
index 8a8a3c3..04281bb 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
@@ -248,7 +248,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
index f42e502..e8e8b2f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
@@ -819,7 +819,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(), entry
+ conn.processAdd(entry.getName(), entry.getObjectClasses(), entry
.getUserAttributes(), entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
index 07aee21..7cee911 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
@@ -75,12 +75,12 @@
{
Entry suffixEntry = StaticUtils.createEntry(suffixDN);
AddOperation addOperation =
- connection.processAdd(suffixEntry.getDN(),
+ connection.processAdd(suffixEntry.getName(),
suffixEntry.getObjectClasses(),
suffixEntry.getUserAttributes(),
suffixEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(suffixEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(suffixEntry.getName()));
}
// Add a search base entry.
@@ -89,12 +89,12 @@
{
Entry baseEntry = StaticUtils.createEntry(baseDN);
AddOperation addOperation =
- connection.processAdd(baseEntry.getDN(),
+ connection.processAdd(baseEntry.getName(),
baseEntry.getObjectClasses(),
baseEntry.getUserAttributes(),
baseEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(baseEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(baseEntry.getName()));
}
// Add a test ldapsubentry.
@@ -102,12 +102,12 @@
"dn: cn=subentry," + BASE,
"objectclass: ldapsubentry");
AddOperation addOperation =
- connection.processAdd(ldapSubentry.getDN(),
+ connection.processAdd(ldapSubentry.getName(),
ldapSubentry.getObjectClasses(),
ldapSubentry.getUserAttributes(),
ldapSubentry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(ldapSubentry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(ldapSubentry.getName()));
// Add a test entry.
testEntry = TestCaseUtils.makeEntry(
@@ -150,12 +150,12 @@
Entry duplicateEntry = testEntry.duplicate(false);
addOperation =
- connection.processAdd(duplicateEntry.getDN(),
+ connection.processAdd(duplicateEntry.getName(),
duplicateEntry.getObjectClasses(),
duplicateEntry.getUserAttributes(),
duplicateEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(testEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(testEntry.getName()));
// Add a test referral entry.
Entry referralEntry = TestCaseUtils.makeEntry(
@@ -165,12 +165,12 @@
"ref: ldap://hostb/OU=People,O=MNN,C=US",
"ref: ldap://hostc/OU=People,O=MNN,C=US");
addOperation =
- connection.processAdd(referralEntry.getDN(),
+ connection.processAdd(referralEntry.getName(),
referralEntry.getObjectClasses(),
referralEntry.getUserAttributes(),
referralEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(referralEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(referralEntry.getName()));
Entry level1Entry = TestCaseUtils.makeEntry(
"dn: ou=level1," + BASE,
@@ -178,12 +178,12 @@
"objectclass: organizationalunit",
"ou: level1");
addOperation =
- connection.processAdd(level1Entry.getDN(),
+ connection.processAdd(level1Entry.getName(),
level1Entry.getObjectClasses(),
level1Entry.getUserAttributes(),
level1Entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(level1Entry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(level1Entry.getName()));
Entry level2Entry = TestCaseUtils.makeEntry(
"dn: ou=level2,ou=level1," + BASE,
@@ -191,12 +191,12 @@
"objectclass: organizationalunit",
"ou: level2");
addOperation =
- connection.processAdd(level2Entry.getDN(),
+ connection.processAdd(level2Entry.getName(),
level2Entry.getObjectClasses(),
level2Entry.getUserAttributes(),
level2Entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(level2Entry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(level2Entry.getName()));
Entry referral2Entry = TestCaseUtils.makeEntry(
"dn: ou=level3,ou=level2,ou=level1," + BASE,
@@ -206,12 +206,12 @@
"ref: ldap://hostc/OU=People,O=MNN,C=US",
"ref: ldap://hostd/OU=People,O=MNN,C=US");
addOperation =
- connection.processAdd(referral2Entry.getDN(),
+ connection.processAdd(referral2Entry.getName(),
referral2Entry.getObjectClasses(),
referral2Entry.getUserAttributes(),
referral2Entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(referral2Entry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(referral2Entry.getName()));
}
@@ -1296,7 +1296,7 @@
assertEquals(entries.size(), 1);
Entry entry = entries.getFirst();
- assertEquals(entry.getDN(), userDN);
+ assertEquals(entry.getName(), userDN);
// Check real attributes.
List<String> messages = new LinkedList<String>();
@@ -1498,7 +1498,7 @@
assertEquals(entries.size(), 1);
Entry entry = entries.getFirst();
- assertEquals(entry.getDN(), userDN);
+ assertEquals(entry.getName(), userDN);
// Check all expected attributes are present and have
// the user requested name.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
index 6863918..6b69ca2 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
@@ -71,16 +71,16 @@
@AfterClass
public void cleanUp() throws Exception
{
- TestCaseUtils.deleteEntry(collectiveSubentry.getDN());
- TestCaseUtils.deleteEntry(ldapSubentry.getDN());
- TestCaseUtils.deleteEntry(legacyLdapSubentry.getDN());
+ TestCaseUtils.deleteEntry(collectiveSubentry.getName());
+ TestCaseUtils.deleteEntry(ldapSubentry.getName());
+ TestCaseUtils.deleteEntry(legacyLdapSubentry.getName());
SubentryManager manager = DirectoryServer.getSubentryManager();
assertNotNull(manager);
- List<SubEntry> subentryList = manager.getSubentries(testEntry.getDN());
+ List<SubEntry> subentryList = manager.getSubentries(testEntry.getName());
assertNotNull(subentryList);
assertTrue(subentryList.isEmpty());
- subentryList = manager.getCollectiveSubentries(testEntry.getDN());
+ subentryList = manager.getCollectiveSubentries(testEntry.getName());
assertNotNull(subentryList);
assertTrue(subentryList.isEmpty());
@@ -98,11 +98,11 @@
{
SubentryManager manager = DirectoryServer.getSubentryManager();
assertNotNull(manager);
- List<SubEntry> subentryList = manager.getSubentries(testEntry.getDN());
+ List<SubEntry> subentryList = manager.getSubentries(testEntry.getName());
assertNotNull(subentryList);
assertEquals(subentryList.size(), 2);
- assertEquals(subentryList.get(0).getDN(), ldapSubentry.getDN());
- assertEquals(subentryList.get(1).getDN(), legacyLdapSubentry.getDN());
+ assertEquals(subentryList.get(0).getDN(), ldapSubentry.getName());
+ assertEquals(subentryList.get(1).getDN(), legacyLdapSubentry.getName());
subentryList.clear();
subentryList = manager.getSubentries(testEntry);
assertNotNull(subentryList);
@@ -110,22 +110,22 @@
assertEquals(subentryList.get(0).getEntry(), ldapSubentry);
assertEquals(subentryList.get(1).getEntry(), legacyLdapSubentry);
subentryList.clear();
- subentryList = manager.getCollectiveSubentries(testEntry.getDN());
+ subentryList = manager.getCollectiveSubentries(testEntry.getName());
assertNotNull(subentryList);
assertEquals(subentryList.size(), 1);
- assertEquals(subentryList.get(0).getDN(), collectiveSubentry.getDN());
+ assertEquals(subentryList.get(0).getDN(), collectiveSubentry.getName());
subentryList.clear();
subentryList = manager.getCollectiveSubentries(testEntry);
assertNotNull(subentryList);
assertEquals(subentryList.size(), 1);
assertEquals(subentryList.get(0).getEntry(), collectiveSubentry);
subentryList.clear();
- subentryList = manager.getSubentries(legacyLdapSubentry.getDN().parent());
+ subentryList = manager.getSubentries(legacyLdapSubentry.getName().parent());
assertNotNull(subentryList);
assertEquals(subentryList.size(), 1);
assertEquals(subentryList.get(0).getEntry(), legacyLdapSubentry);
subentryList.clear();
- subentryList = manager.getSubentries(legacyLdapSubentry.getDN().parent().parent());
+ subentryList = manager.getSubentries(legacyLdapSubentry.getName().parent().parent());
assertNotNull(subentryList);
assertEquals(subentryList.size(), 0);
}
@@ -143,10 +143,10 @@
mods.add(new LDAPModification(ModificationType.REPLACE, attr));
ModifyOperation modifyOperation =
conn.processModify(ByteString.valueOf(
- collectiveSubentry.getDN().toNormalizedString()), mods);
+ collectiveSubentry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
- Entry entry = DirectoryServer.getEntry(testEntry.getDN());
+ Entry entry = DirectoryServer.getEntry(testEntry.getName());
AttributeType attrType = DirectoryServer.getAttributeType(
"c-l");
assertTrue(entry.hasAttribute(attrType));
@@ -269,13 +269,13 @@
"subtreeSpecification: {base \"ou=Test SubEntry Manager\"}",
"cn: Inherited From DN Collective Subentry");
AddOperation addOperation =
- connection.processAdd(collectiveDNInheritedSubentry.getDN(),
+ connection.processAdd(collectiveDNInheritedSubentry.getName(),
collectiveDNInheritedSubentry.getObjectClasses(),
collectiveDNInheritedSubentry.getUserAttributes(),
collectiveDNInheritedSubentry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
assertNotNull(DirectoryServer.getEntry(
- collectiveDNInheritedSubentry.getDN()));
+ collectiveDNInheritedSubentry.getName()));
// Add test inherited from RDN collective subentry.
Entry collectiveRDNInheritedSubentry = TestCaseUtils.makeEntry(
@@ -291,16 +291,16 @@
"subtreeSpecification: {base \"ou=Test SubEntry Manager\"}",
"cn: Inherited From RDN Collective Subentry");
addOperation =
- connection.processAdd(collectiveRDNInheritedSubentry.getDN(),
+ connection.processAdd(collectiveRDNInheritedSubentry.getName(),
collectiveRDNInheritedSubentry.getObjectClasses(),
collectiveRDNInheritedSubentry.getUserAttributes(),
collectiveRDNInheritedSubentry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
assertNotNull(DirectoryServer.getEntry(
- collectiveRDNInheritedSubentry.getDN()));
+ collectiveRDNInheritedSubentry.getName()));
// Test Inherited Collective Attributes on test entry.
- Entry entry = DirectoryServer.getEntry(testEntry.getDN());
+ Entry entry = DirectoryServer.getEntry(testEntry.getName());
AttributeType attrType = DirectoryServer.getAttributeType(
"postaladdress");
assertTrue(entry.hasAttribute(attrType));
@@ -316,8 +316,8 @@
"+1 999 999 9999")));
// Cleanup.
- TestCaseUtils.deleteEntry(collectiveRDNInheritedSubentry.getDN());
- TestCaseUtils.deleteEntry(collectiveDNInheritedSubentry.getDN());
+ TestCaseUtils.deleteEntry(collectiveRDNInheritedSubentry.getName());
+ TestCaseUtils.deleteEntry(collectiveDNInheritedSubentry.getName());
}
@Test
@@ -334,7 +334,7 @@
mods.add(new LDAPModification(ModificationType.REPLACE, attr));
ModifyOperation modifyOperation =
conn.processModify(ByteString.valueOf(
- testEntry.getDN().toNormalizedString()), mods);
+ testEntry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
// real-overrides-virtual.
@@ -346,10 +346,10 @@
mods.add(new LDAPModification(ModificationType.REPLACE, attr));
modifyOperation =
conn.processModify(ByteString.valueOf(
- collectiveSubentry.getDN().toNormalizedString()), mods);
+ collectiveSubentry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
- Entry entry = DirectoryServer.getEntry(testEntry.getDN());
+ Entry entry = DirectoryServer.getEntry(testEntry.getName());
AttributeType attrType = DirectoryServer.getAttributeType(
"preferredlanguage");
assertTrue(entry.hasAttribute(attrType));
@@ -367,10 +367,10 @@
mods.add(new LDAPModification(ModificationType.REPLACE, attr));
modifyOperation =
conn.processModify(ByteString.valueOf(
- collectiveSubentry.getDN().toNormalizedString()), mods);
+ collectiveSubentry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
- entry = DirectoryServer.getEntry(testEntry.getDN());
+ entry = DirectoryServer.getEntry(testEntry.getName());
attrType = DirectoryServer.getAttributeType(
"preferredlanguage");
assertTrue(entry.hasAttribute(attrType));
@@ -388,10 +388,10 @@
mods.add(new LDAPModification(ModificationType.REPLACE, attr));
modifyOperation =
conn.processModify(ByteString.valueOf(
- collectiveSubentry.getDN().toNormalizedString()), mods);
+ collectiveSubentry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
- entry = DirectoryServer.getEntry(testEntry.getDN());
+ entry = DirectoryServer.getEntry(testEntry.getName());
attrType = DirectoryServer.getAttributeType(
"preferredlanguage");
assertTrue(entry.hasAttribute(attrType));
@@ -409,7 +409,7 @@
mods.add(new LDAPModification(ModificationType.DELETE, attr));
modifyOperation =
conn.processModify(ByteString.valueOf(
- testEntry.getDN().toNormalizedString()), mods);
+ testEntry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -426,7 +426,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
new ArrayList<Control>(),
- ByteString.valueOf(testEntry.getDN().toString()),
+ ByteString.valueOf(testEntry.getName().toString()),
SearchScope.BASE_OBJECT,
DereferencePolicy.NEVER_DEREF_ALIASES,
Integer.MAX_VALUE,
@@ -442,7 +442,7 @@
"collectiveattributesubentries");
assertTrue(searchOperation.getSearchEntries().getFirst().hasValue(
attrType, null, AttributeValues.create(attrType,
- collectiveSubentry.getDN().toNormalizedString())));
+ collectiveSubentry.getName().toNormalizedString())));
}
@Test
@@ -459,7 +459,7 @@
mods.add(new LDAPModification(ModificationType.REPLACE, attr));
ModifyOperation modifyOperation =
conn.processModify(ByteString.valueOf(
- collectiveSubentry.getDN().toNormalizedString()), mods);
+ collectiveSubentry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
values = new ArrayList<ByteString>();
values.add(ByteString.valueOf("c-l"));
@@ -468,10 +468,10 @@
mods.add(new LDAPModification(ModificationType.REPLACE, attr));
modifyOperation =
conn.processModify(ByteString.valueOf(
- testEntry.getDN().toNormalizedString()), mods);
+ testEntry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
- Entry entry = DirectoryServer.getEntry(testEntry.getDN());
+ Entry entry = DirectoryServer.getEntry(testEntry.getName());
AttributeType attrType = DirectoryServer.getAttributeType(
"c-l");
assertFalse(entry.hasAttribute(attrType));
@@ -488,10 +488,10 @@
mods.add(new LDAPModification(ModificationType.REPLACE, attr));
modifyOperation =
conn.processModify(ByteString.valueOf(
- testEntry.getDN().toNormalizedString()), mods);
+ testEntry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
- entry = DirectoryServer.getEntry(testEntry.getDN());
+ entry = DirectoryServer.getEntry(testEntry.getName());
attrType = DirectoryServer.getAttributeType(
"preferredlanguage");
assertFalse(entry.hasAttribute(attrType));
@@ -508,10 +508,10 @@
mods.add(new LDAPModification(ModificationType.REPLACE, attr));
modifyOperation =
conn.processModify(ByteString.valueOf(
- testEntry.getDN().toNormalizedString()), mods);
+ testEntry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
- entry = DirectoryServer.getEntry(testEntry.getDN());
+ entry = DirectoryServer.getEntry(testEntry.getName());
attrType = DirectoryServer.getAttributeType(
"preferredlanguage");
assertFalse(entry.hasAttribute(attrType));
@@ -527,7 +527,7 @@
mods.add(new LDAPModification(ModificationType.DELETE, attr));
modifyOperation =
conn.processModify(ByteString.valueOf(
- testEntry.getDN().toNormalizedString()), mods);
+ testEntry.getName().toNormalizedString()), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -618,14 +618,14 @@
{
// This one should have been added during test setup so just
// do a quick check here to make sure it is available there.
- assertNotNull(DirectoryServer.getEntry(ldapSubentry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(ldapSubentry.getName()));
// RFC3672 Spec test subentry.
List<SubEntry> rfc3672SubList =
DirectoryServer.getSubentryManager().getSubentries();
for (SubEntry subentry : rfc3672SubList)
{
- if (subentry.getDN().equals(ldapSubentry.getDN()))
+ if (subentry.getDN().equals(ldapSubentry.getName()))
{
SubtreeSpecification spec = subentry.getSubTreeSpecification();
assertNull(spec.getRefinements());
@@ -643,18 +643,18 @@
"subtreeSpecification: {base \"ou=Test SubEntry Manager\", specificationFilter \"(objectClass=*)\"}",
"cn: Subentry");
AddOperation addOperation =
- connection.processAdd(relativeSubentry.getDN(),
+ connection.processAdd(relativeSubentry.getName(),
relativeSubentry.getObjectClasses(),
relativeSubentry.getUserAttributes(),
relativeSubentry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(relativeSubentry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(relativeSubentry.getName()));
List<SubEntry> relativeSubList =
DirectoryServer.getSubentryManager().getSubentries();
for (SubEntry subentry : relativeSubList)
{
- if (subentry.getDN().equals(relativeSubentry.getDN()))
+ if (subentry.getDN().equals(relativeSubentry.getName()))
{
SubtreeSpecification spec = subentry.getSubTreeSpecification();
assertTrue(spec.getRefinements() instanceof SubtreeSpecification.FilterRefinement);
@@ -662,7 +662,7 @@
}
// Remove Relative Spec test subentry.
- TestCaseUtils.deleteEntry(relativeSubentry.getDN());
+ TestCaseUtils.deleteEntry(relativeSubentry.getName());
}
private void addTestEntries() throws Exception
@@ -676,12 +676,12 @@
{
Entry suffixEntry = StaticUtils.createEntry(suffixDN);
AddOperation addOperation =
- connection.processAdd(suffixEntry.getDN(),
+ connection.processAdd(suffixEntry.getName(),
suffixEntry.getObjectClasses(),
suffixEntry.getUserAttributes(),
suffixEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(suffixEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(suffixEntry.getName()));
}
// Add base entry.
@@ -690,12 +690,12 @@
{
Entry baseEntry = StaticUtils.createEntry(baseDN);
AddOperation addOperation =
- connection.processAdd(baseEntry.getDN(),
+ connection.processAdd(baseEntry.getName(),
baseEntry.getObjectClasses(),
baseEntry.getUserAttributes(),
baseEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(baseEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(baseEntry.getName()));
}
// Add role entry.
@@ -708,12 +708,12 @@
"cn: Sales"
);
AddOperation addOperation =
- connection.processAdd(roleEntry.getDN(),
+ connection.processAdd(roleEntry.getName(),
roleEntry.getObjectClasses(),
roleEntry.getUserAttributes(),
roleEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(roleEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(roleEntry.getName()));
// Add test entry.
testEntry = TestCaseUtils.makeEntry(
@@ -732,12 +732,12 @@
"title: Sales"
);
addOperation =
- connection.processAdd(testEntry.getDN(),
+ connection.processAdd(testEntry.getName(),
testEntry.getObjectClasses(),
testEntry.getUserAttributes(),
testEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(testEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(testEntry.getName()));
// Add test subentry.
ldapSubentry = TestCaseUtils.makeEntry(
@@ -747,12 +747,12 @@
"subtreeSpecification: {base \"ou=Test SubEntry Manager\"}",
"cn: Subentry");
addOperation =
- connection.processAdd(ldapSubentry.getDN(),
+ connection.processAdd(ldapSubentry.getName(),
ldapSubentry.getObjectClasses(),
ldapSubentry.getUserAttributes(),
ldapSubentry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(ldapSubentry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(ldapSubentry.getName()));
// Add test legacy subentry.
legacyLdapSubentry = TestCaseUtils.makeEntry(
@@ -761,12 +761,12 @@
"objectclass: ldapSubentry",
"cn: Legacy Subentry");
addOperation =
- connection.processAdd(legacyLdapSubentry.getDN(),
+ connection.processAdd(legacyLdapSubentry.getName(),
legacyLdapSubentry.getObjectClasses(),
legacyLdapSubentry.getUserAttributes(),
legacyLdapSubentry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(legacyLdapSubentry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(legacyLdapSubentry.getName()));
// Add test collective subentry.
collectiveSubentry = TestCaseUtils.makeEntry(
@@ -780,11 +780,11 @@
"subtreeSpecification: {base \"ou=Test SubEntry Manager\"}",
"cn: Collective Subentry");
addOperation =
- connection.processAdd(collectiveSubentry.getDN(),
+ connection.processAdd(collectiveSubentry.getName(),
collectiveSubentry.getObjectClasses(),
collectiveSubentry.getUserAttributes(),
collectiveSubentry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(collectiveSubentry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(collectiveSubentry.getName()));
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java
index 1a83dbc..d59dc30 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java
@@ -72,12 +72,12 @@
{
Entry suffixEntry = StaticUtils.createEntry(suffixDN);
AddOperation addOperation =
- connection.processAdd(suffixEntry.getDN(),
+ connection.processAdd(suffixEntry.getName(),
suffixEntry.getObjectClasses(),
suffixEntry.getUserAttributes(),
suffixEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(suffixEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(suffixEntry.getName()));
}
// Add base entry.
@@ -86,12 +86,12 @@
{
Entry baseEntry = StaticUtils.createEntry(baseDN);
AddOperation addOperation =
- connection.processAdd(baseEntry.getDN(),
+ connection.processAdd(baseEntry.getName(),
baseEntry.getObjectClasses(),
baseEntry.getUserAttributes(),
baseEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(baseEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(baseEntry.getName()));
}
// Add test entry.
@@ -110,12 +110,12 @@
"title: Sales, Director"
);
AddOperation addOperation =
- connection.processAdd(testEntry.getDN(),
+ connection.processAdd(testEntry.getName(),
testEntry.getObjectClasses(),
testEntry.getUserAttributes(),
testEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(testEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(testEntry.getName()));
}
@AfterClass
@@ -220,12 +220,12 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- connection.processAdd(e.getDN(),
+ connection.processAdd(e.getName(),
e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertTrue(addOperation.getResultCode() != ResultCode.SUCCESS);
- assertNull(DirectoryServer.getEntry(e.getDN()));
+ assertNull(DirectoryServer.getEntry(e.getName()));
}
/**
@@ -269,12 +269,12 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- connection.processAdd(policyEntry.getDN(),
+ connection.processAdd(policyEntry.getName(),
policyEntry.getObjectClasses(),
policyEntry.getUserAttributes(),
policyEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(policyEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(policyEntry.getName()));
PasswordPolicy policy = (PasswordPolicy) DirectoryServer.getAuthenticationPolicy(
DN.valueOf("cn=Temp Policy," + SUFFIX));
@@ -311,7 +311,7 @@
// Make sure this policy is gone and default
// policy is in effect instead.
- TestCaseUtils.deleteEntry(policyEntry.getDN());
+ TestCaseUtils.deleteEntry(policyEntry.getName());
statePolicy = AuthenticationPolicy.forUser(testEntry, false);
assertNotNull(statePolicy);
assertEquals(defaultPolicy, statePolicy);
@@ -366,12 +366,12 @@
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- connection.processAdd(policyEntry.getDN(),
+ connection.processAdd(policyEntry.getName(),
policyEntry.getObjectClasses(),
policyEntry.getUserAttributes(),
policyEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(policyEntry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(policyEntry.getName()));
// Make sure just added policy is in effect.
testEntry = DirectoryServer.getEntry(DN.valueOf(
@@ -385,7 +385,7 @@
// Remove subentry policy and make sure
// default policy is in effect again.
- TestCaseUtils.deleteEntry(policyEntry.getDN());
+ TestCaseUtils.deleteEntry(policyEntry.getName());
testEntry = DirectoryServer.getEntry(DN.valueOf(
"uid=rogasawara," + BASE));
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
index 423e067..0011c8e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
@@ -120,28 +120,28 @@
);
AddOperation addOperation =
- connection.processAdd(exampleCom.getDN(),
+ connection.processAdd(exampleCom.getName(),
exampleCom.getObjectClasses(),
exampleCom.getUserAttributes(),
exampleCom.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(exampleCom.getDN()));
+ assertNotNull(DirectoryServer.getEntry(exampleCom.getName()));
addOperation =
- connection.processAdd(people.getDN(),
+ connection.processAdd(people.getName(),
people.getObjectClasses(),
people.getUserAttributes(),
people.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(people.getDN()));
+ assertNotNull(DirectoryServer.getEntry(people.getName()));
addOperation =
- connection.processAdd(entry.getDN(),
+ connection.processAdd(entry.getName(),
entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(DirectoryServer.getEntry(entry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(entry.getName()));
// Add a user capable of using the proxied authorization control.
TestCaseUtils.addEntry(
@@ -300,7 +300,7 @@
final Entry newEntry = DirectoryServer.getEntry(DN.valueOf(entryDN));
assertNotNull(newEntry);
- final RDN rdn = newEntry.getDN().rdn();
+ final RDN rdn = newEntry.getName().rdn();
for (int i = 0; i < rdn.getNumValues(); i++)
{
AttributeType attribute = rdn.getAttributeType(i);
@@ -383,7 +383,7 @@
"uid=user.0,ou=People,dc=example,dc=com"));
assertNotNull(newEntry);
- assertEquals(newEntry.getDN().toString(),
+ assertEquals(newEntry.getName().toString(),
"uid=USER.0,ou=People,dc=example,dc=com");
AttributeType at = DirectoryServer.getAttributeType("uid");
@@ -394,7 +394,7 @@
// Because deleteOldRDN is true, the values from RDN and the entry have to be identical
ByteString valueFromEntry = attrList.get(0).iterator().next().getValue();
- ByteString valueFromRDN = newEntry.getDN().rdn().getAttributeValue(at).getValue();
+ ByteString valueFromRDN = newEntry.getName().rdn().getAttributeValue(at).getValue();
assertEquals(valueFromEntry,valueFromRDN);
examineCompletedOperation(modifyDNOperation);
@@ -448,7 +448,7 @@
"uid=userid.0+cn=test,ou=People,dc=example,dc=com"));
assertNotNull(newEntry);
- assertEquals(newEntry.getDN().toString(),
+ assertEquals(newEntry.getName().toString(),
"uid=UserID.0+cn=Test,ou=People,dc=example,dc=com");
AttributeType at = DirectoryServer.getAttributeType("uid");
@@ -459,7 +459,7 @@
// Even though the value of the RDN changed, the representation of the entry's value should be preserved
ByteString valueFromEntry = attrList.get(0).iterator().next().getValue();
- ByteString valueFromRDN = newEntry.getDN().rdn().getAttributeValue(at).getValue();
+ ByteString valueFromRDN = newEntry.getName().rdn().getAttributeValue(at).getValue();
assertEquals(valueFromEntry,ByteString.valueOf("userid.0"));
examineCompletedOperation(modifyDNOperation);
@@ -498,7 +498,7 @@
"uid=userid.0+sn=jensen,ou=People,dc=example,dc=com"));
assertNotNull(newEntry);
- assertEquals(newEntry.getDN().toString(),
+ assertEquals(newEntry.getName().toString(),
"uid=userid.0+sn=JENSEN,ou=People,dc=example,dc=com");
AttributeType at = DirectoryServer.getAttributeType("sn");
@@ -510,7 +510,7 @@
// Even though the representation of the sn value differs in the RDN,
// the representation of the entry's value should be preserved
ByteString valueFromEntry = attrList.get(0).iterator().next().getValue();
- ByteString valueFromRDN = newEntry.getDN().rdn().getAttributeValue(at).getValue();
+ ByteString valueFromRDN = newEntry.getName().rdn().getAttributeValue(at).getValue();
assertEquals(valueFromEntry,ByteString.valueOf("Jensen"));
examineCompletedOperation(modifyDNOperation);
@@ -1020,7 +1020,7 @@
InvocationCounterPlugin.resetAllCounters();
ModifyDNRequestProtocolOp modifyRequest =
new ModifyDNRequestProtocolOp(
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
ByteString.valueOf("uid=user.test0"), false);
LDAPMessage message = new LDAPMessage(2, modifyRequest,
ShortCircuitPlugin.createShortCircuitControlList(80, "PreOperation"));
@@ -1069,7 +1069,7 @@
assertTrue(DirectoryServer.getWorkQueue().waitUntilIdle(10000));
- Lock writeLock = LockManager.lockWrite(entry.getDN());
+ Lock writeLock = LockManager.lockWrite(entry.getName());
assertNotNull(writeLock);
try
@@ -1081,7 +1081,7 @@
ModifyDNRequestProtocolOp modifyRequest =
new ModifyDNRequestProtocolOp(
- ByteString.valueOf(entry.getDN().toString()),
+ ByteString.valueOf(entry.getName().toString()),
ByteString.valueOf("uid=user.test0"), false);
message = new LDAPMessage(2, modifyRequest);
w.writeMessage(message);
@@ -1103,7 +1103,7 @@
// modifyDNResponses+1);
} finally
{
- LockManager.unlock(entry.getDN(), writeLock);
+ LockManager.unlock(entry.getName(), writeLock);
}
} finally
{
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
index 951e02b..38244ed 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
@@ -372,7 +372,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
null,
- entry.getDN(),
+ entry.getName(),
entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
index 41a340a..6f60d0c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
@@ -886,7 +886,7 @@
Entry userEntry = DirectoryServer.getEntry(
DN.valueOf("cn=Directory Manager, cn=Root DNs, cn=config"));
ClientConnection connection2 = new InternalClientConnection(
- new AuthenticationInfo(userEntry, userEntry.getDN(), true));
+ new AuthenticationInfo(userEntry, userEntry.getName(), true));
ng = NetworkGroup.findMatchingNetworkGroup(connection2);
assertEquals(ng, networkGroup2);
@@ -936,7 +936,7 @@
Entry userEntry = DirectoryServer.getEntry(
DN.valueOf("cn=Directory Manager, cn=Root DNs, cn=config"));
ClientConnection connection2 = new InternalClientConnection(
- new AuthenticationInfo(userEntry, userEntry.getDN(), true));
+ new AuthenticationInfo(userEntry, userEntry.getName(), true));
ng = NetworkGroup.findMatchingNetworkGroup(connection2);
if (match) {
assertEquals(ng, networkGroup);
@@ -1131,7 +1131,7 @@
"o: " + namingAttribute);
AddOperation addOperation = connection.processAdd(
- e.getDN(),
+ e.getName(),
e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
index 5f8e85f..ba150e4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
@@ -399,7 +399,7 @@
String compromisedTime = TimeThread.getGeneralizedTime();
for (Entry e : searchOp.getSearchEntries()) {
TestCaseUtils.applyModifications(true,
- "dn: " + e.getDN().toNormalizedString(),
+ "dn: " + e.getName().toNormalizedString(),
"changetype: modify",
"replace: " + ConfigConstants.ATTR_CRYPTO_KEY_COMPROMISED_TIME,
ConfigConstants.ATTR_CRYPTO_KEY_COMPROMISED_TIME + ": "
@@ -430,7 +430,7 @@
// using a compromised key can no longer be decrypted.
for (Entry e : searchOp.getSearchEntries()) {
TestCaseUtils.applyModifications(true,
- "dn: " + e.getDN().toNormalizedString(), "changetype: delete");
+ "dn: " + e.getName().toNormalizedString(), "changetype: delete");
}
Thread.sleep(1000); // Clearing the cache is asynchronous.
try {
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
index 1386f1a..7bbc3d6 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
@@ -213,7 +213,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -263,7 +263,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -316,7 +316,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -366,7 +366,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -416,7 +416,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -464,7 +464,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -512,7 +512,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -560,7 +560,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -608,7 +608,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
index 73f256e..d2ec6dc 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -295,7 +295,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -550,7 +550,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java
index 8f5ce8c..8293efc 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java
@@ -111,15 +111,15 @@
TestCaseUtils.initializeTestBackend(false);
Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
- assertFalse(cache.containsEntry(testEntriesList.get(0).getDN()),
- "Not expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertFalse(cache.containsEntry(testEntriesList.get(0).getName()),
+ "Not expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
cache.putEntry(testEntriesList.get(0), b, 1);
- assertTrue(cache.containsEntry(testEntriesList.get(0).getDN()),
- "Expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertTrue(cache.containsEntry(testEntriesList.get(0).getName()),
+ "Expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -145,15 +145,15 @@
TestCaseUtils.initializeTestBackend(false);
Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
- assertNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Not expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Not expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
cache.putEntry(testEntriesList.get(0), b, 1);
- assertNotNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNotNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -179,15 +179,15 @@
TestCaseUtils.initializeTestBackend(false);
Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
- assertNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Not expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Not expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
cache.putEntry(testEntriesList.get(0), b, 1);
- assertNotNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNotNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -246,15 +246,15 @@
TestCaseUtils.initializeTestBackend(false);
Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
- assertEquals(cache.getEntryID(testEntriesList.get(0).getDN()), -1,
- "Not expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertEquals(cache.getEntryID(testEntriesList.get(0).getName()), -1,
+ "Not expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
cache.putEntry(testEntriesList.get(0), b, 1);
- assertEquals(cache.getEntryID(testEntriesList.get(0).getDN()), 1,
- "Expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertEquals(cache.getEntryID(testEntriesList.get(0).getName()), 1,
+ "Expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -281,8 +281,8 @@
cache.putEntry(testEntriesList.get(0), b, 1);
- assertNotNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNotNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -313,17 +313,17 @@
Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
assertTrue(cache.putEntryIfAbsent(testEntriesList.get(0), b, 1),
- "Not expected to find " + testEntriesList.get(0).getDN().toString() +
+ "Not expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
assertFalse(cache.putEntryIfAbsent(testEntriesList.get(0), b, 1),
- "Expected to find " + testEntriesList.get(0).getDN().toString() +
+ "Expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
- assertNotNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNotNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -353,12 +353,12 @@
TestCaseUtils.initializeTestBackend(false);
Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
- cache.removeEntry(testEntriesList.get(0).getDN());
+ cache.removeEntry(testEntriesList.get(0).getName());
cache.putEntry(testEntriesList.get(0), b, 1);
- cache.removeEntry(testEntriesList.get(0).getDN());
+ cache.removeEntry(testEntriesList.get(0).getName());
- assertNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Not expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Not expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -392,8 +392,8 @@
cache.putEntry(testEntriesList.get(0), b, 1);
cache.clear();
- assertNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Not expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Not expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -434,8 +434,8 @@
b.getBackendID() + " in the cache. Cache contents:" +
ServerConstants.EOL + cache.toVerboseString());
- assertNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Not expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Not expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -468,14 +468,14 @@
cache.putEntry(testEntriesList.get(0), b, 1);
Entry testEntry = testEntriesList.get(1);
- testEntry.getDN();
+ testEntry.getName();
testEntry.setDN(DN.valueOf(
- testEntry.getDN().rdn() + ",cn=config"));
+ testEntry.getName().rdn() + ",cn=config"));
cache.putEntry(testEntry, c, 1);
cache.clearSubtree(DN.valueOf("o=test"));
- assertNull(cache.getEntry(testEntriesList.get(0).getDN()),
- "Not expected to find " + testEntriesList.get(0).getDN().toString() +
+ assertNull(cache.getEntry(testEntriesList.get(0).getName()),
+ "Not expected to find " + testEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -484,8 +484,8 @@
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
- assertNotNull(cache.getEntry(testEntry.getDN()),
- "Expected to find " + testEntry.getDN().toString() +
+ assertNotNull(cache.getEntry(testEntry.getName()),
+ "Expected to find " + testEntry.getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -529,8 +529,8 @@
for(int loops = 0; loops < CONCURRENCYLOOPS; loops++) {
for(int i = 0; i < NUMTESTENTRIES; i++) {
cache.putEntry(testEntriesList.get(i), b, i);
- cache.getEntry(testEntriesList.get(i).getDN());
- cache.removeEntry(testEntriesList.get(i).getDN());
+ cache.getEntry(testEntriesList.get(i).getName());
+ cache.removeEntry(testEntriesList.get(i).getName());
cache.putEntryIfAbsent(testEntriesList.get(i), b, i);
cache.getEntry(b, i);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
index 16fcb10..0b4ec63 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
@@ -461,21 +461,21 @@
// Ensure all test entries are available via default cache.
for (int i = 0; i < NUMTESTENTRIES; i++) {
assertNotNull(super.cache.getEntry(
- testSoftRefEntriesList.get(0).getDN()),
+ testSoftRefEntriesList.get(0).getName()),
"Expected to find " +
- testSoftRefEntriesList.get(0).getDN().toString() +
+ testSoftRefEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" +
ServerConstants.EOL + cache.toVerboseString());
assertNotNull(super.cache.getEntry(
- testFIFOEntriesList.get(0).getDN()),
+ testFIFOEntriesList.get(0).getName()),
"Expected to find " +
- testFIFOEntriesList.get(0).getDN().toString() +
+ testFIFOEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" +
ServerConstants.EOL + cache.toVerboseString());
assertNotNull(super.cache.getEntry(
- testFSEntriesList.get(0).getDN()),
+ testFSEntriesList.get(0).getName()),
"Expected to find " +
- testFSEntriesList.get(0).getDN().toString() +
+ testFSEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" +
ServerConstants.EOL + cache.toVerboseString());
}
@@ -483,21 +483,21 @@
// Ensure all test entries landed on their levels.
for (int i = 0; i < NUMTESTENTRIES; i++) {
assertNotNull(softRefCache.getEntry(
- testSoftRefEntriesList.get(0).getDN()),
+ testSoftRefEntriesList.get(0).getName()),
"Expected to find " +
- testSoftRefEntriesList.get(0).getDN().toString() +
+ testSoftRefEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" +
ServerConstants.EOL + cache.toVerboseString());
assertNotNull(fifoCache.getEntry(
- testFIFOEntriesList.get(0).getDN()),
+ testFIFOEntriesList.get(0).getName()),
"Expected to find " +
- testFIFOEntriesList.get(0).getDN().toString() +
+ testFIFOEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" +
ServerConstants.EOL + cache.toVerboseString());
assertNotNull(fsCache.getEntry(
- testFSEntriesList.get(0).getDN()),
+ testFSEntriesList.get(0).getName()),
"Expected to find " +
- testFSEntriesList.get(0).getDN().toString() +
+ testFSEntriesList.get(0).getName().toString() +
" in the cache. Cache contents:" +
ServerConstants.EOL + cache.toVerboseString());
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
index 957ca53..dcd920a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
@@ -231,7 +231,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -282,7 +282,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -333,7 +333,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -384,7 +384,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -433,7 +433,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -482,7 +482,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -531,7 +531,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -580,7 +580,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -629,7 +629,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -843,7 +843,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -863,7 +863,7 @@
assertEquals(LDAPSearch.mainSearch(args, false, null, System.err), 0);
- DeleteOperation deleteOperation = conn.processDelete(e.getDN());
+ DeleteOperation deleteOperation = conn.processDelete(e.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index d8bda9b..803d647 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -169,7 +169,7 @@
AddOperation addOperation = conn.processAdd(e);
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- e = DirectoryServer.getEntry(e.getDN());
+ e = DirectoryServer.getEntry(e.getName());
assertNotNull(e);
assertTrue(e.hasAttribute(entryUUIDType));
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
index 4b34069..5073110 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
@@ -331,7 +331,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -341,7 +341,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("test");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mapper.finalizeIdentityMapper();
@@ -397,7 +397,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -407,7 +407,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("test");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mapper.finalizeIdentityMapper();
@@ -464,7 +464,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -527,7 +527,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -590,7 +590,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -607,7 +607,7 @@
"cn: Test",
"userPassword: password");
addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -675,7 +675,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -685,7 +685,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("foo");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=foo,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=foo,o=test"));
mapper.finalizeIdentityMapper();
@@ -741,7 +741,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -751,7 +751,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("bar");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=foo,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=foo,o=test"));
mapper.finalizeIdentityMapper();
@@ -807,7 +807,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -857,7 +857,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -867,7 +867,7 @@
// does not.
Entry mappedEntry = mapper.getEntryForID("test");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mappedEntry = mapper.getEntryForID("test user");
assertNull(mappedEntry);
@@ -892,7 +892,7 @@
mappedEntry = mapper.getEntryForID("test user");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
// Change the configuration back to the way it was.
@@ -905,7 +905,7 @@
// Verify that the original matching pattern is back.
mappedEntry = mapper.getEntryForID("test");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mappedEntry = mapper.getEntryForID("test user");
assertNull(mappedEntry);
@@ -946,7 +946,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -955,7 +955,7 @@
// Verify that we can retrieve the user.
Entry mappedEntry = mapper.getEntryForID("test");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
// Create a modification to set the map base DN to "dc=example,dc=com".
@@ -986,7 +986,7 @@
// Verify that we can retrieve the user again.
mappedEntry = mapper.getEntryForID("test");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
// Change the configuration back to its original setting.
@@ -999,7 +999,7 @@
// Verify that we can still retrieve the user.
mappedEntry = mapper.getEntryForID("test");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
index dc5e139..af8362b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
@@ -206,7 +206,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -262,7 +262,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -384,7 +384,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -466,7 +466,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -536,7 +536,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -601,7 +601,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -688,7 +688,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java
index dd22808..d831e9e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java
@@ -305,8 +305,8 @@
// cache are no longer there after handleLowMemory.
for(int i = 0; i < super.NUMTESTENTRIES; i++ ) {
assertFalse(super.cache.containsEntry(
- super.testEntriesList.get(i).getDN()), "Not expected to find " +
- super.testEntriesList.get(i).getDN().toString() + " in the " +
+ super.testEntriesList.get(i).getName()), "Not expected to find " +
+ super.testEntriesList.get(i).getName().toString() + " in the " +
"cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
}
@@ -374,8 +374,8 @@
// Make sure first NUMTESTENTRIES - MAXENTRIES got rotated.
for(int i = 0; i < (super.NUMTESTENTRIES - super.MAXENTRIES); i++ ) {
assertFalse(super.cache.containsEntry(
- super.testEntriesList.get(i).getDN()), "Not expected to find " +
- super.testEntriesList.get(i).getDN().toString() + " in the " +
+ super.testEntriesList.get(i).getName()), "Not expected to find " +
+ super.testEntriesList.get(i).getName().toString() + " in the " +
"cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
}
@@ -386,8 +386,8 @@
i++)
{
assertTrue(super.cache.containsEntry(
- super.testEntriesList.get(i).getDN()), "Expected to find " +
- super.testEntriesList.get(i).getDN().toString() + " in the " +
+ super.testEntriesList.get(i).getName()), "Expected to find " +
+ super.testEntriesList.get(i).getName().toString() + " in the " +
"cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
index 606d756..7ddd206 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
@@ -525,8 +525,8 @@
// Make sure first NUMTESTENTRIES - MAXENTRIES got rotated.
for(int i = 0; i < (super.NUMTESTENTRIES - super.MAXENTRIES); i++ ) {
assertFalse(super.cache.containsEntry(
- super.testEntriesList.get(i).getDN()), "Not expected to find " +
- super.testEntriesList.get(i).getDN().toString() + " in the " +
+ super.testEntriesList.get(i).getName()), "Not expected to find " +
+ super.testEntriesList.get(i).getName().toString() + " in the " +
"cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
}
@@ -537,8 +537,8 @@
i++)
{
assertTrue(super.cache.containsEntry(
- super.testEntriesList.get(i).getDN()), "Expected to find " +
- super.testEntriesList.get(i).getDN().toString() + " in the " +
+ super.testEntriesList.get(i).getName()), "Expected to find " +
+ super.testEntriesList.get(i).getName().toString() + " in the " +
"cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
}
@@ -566,25 +566,25 @@
// Sacrifice one cache entry to support rotation.
for(int j = 0; j < (super.MAXENTRIES - 1); j++) {
// Generate access.
- super.cache.getEntry(super.testEntriesList.get(j).getDN());
+ super.cache.getEntry(super.testEntriesList.get(j).getName());
}
}
// Make sure MAXENTRIES - 1 are still in the cache.
for(int i = 0; i < (super.MAXENTRIES - 1); i++) {
assertTrue(super.cache.containsEntry(
- super.testEntriesList.get(i).getDN()),
+ super.testEntriesList.get(i).getName()),
"Expected to find " +
- super.testEntriesList.get(i).getDN().toString() + " in the " +
+ super.testEntriesList.get(i).getName().toString() + " in the " +
"cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
}
// Plus the last cache entry added.
assertTrue(super.cache.containsEntry(
- super.testEntriesList.get(super.NUMTESTENTRIES - 1).getDN()),
+ super.testEntriesList.get(super.NUMTESTENTRIES - 1).getName()),
"Expected to find " +
- super.testEntriesList.get(super.NUMTESTENTRIES - 1).getDN().toString() +
+ super.testEntriesList.get(super.NUMTESTENTRIES - 1).getName().toString() +
" in the cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
@@ -593,9 +593,9 @@
i < (super.NUMTESTENTRIES - 1);
i++) {
assertFalse(super.cache.containsEntry(
- super.testEntriesList.get(i).getDN()),
+ super.testEntriesList.get(i).getName()),
"Not expected to find " +
- super.testEntriesList.get(i).getDN().toString() + " in the " +
+ super.testEntriesList.get(i).getName().toString() + " in the " +
"cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
}
@@ -641,9 +641,9 @@
// Check that this cache is persistent indeed.
for(int i = 0; i < super.NUMTESTENTRIES; i++) {
assertTrue(super.cache.containsEntry(
- super.testEntriesList.get(i).getDN()),
+ super.testEntriesList.get(i).getName()),
"Expected to find " +
- super.testEntriesList.get(i).getDN().toString() + " in the " +
+ super.testEntriesList.get(i).getName().toString() + " in the " +
"cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
}
@@ -706,9 +706,9 @@
// Check that this cache is persistent indeed.
for(int i = 0; i < super.NUMTESTENTRIES; i++) {
assertFalse(super.cache.containsEntry(
- super.testEntriesList.get(i).getDN()),
+ super.testEntriesList.get(i).getName()),
"Not expected to find " +
- super.testEntriesList.get(i).getDN().toString() + " in the " +
+ super.testEntriesList.get(i).getName().toString() + " in the " +
"cache. Cache contents:" + ServerConstants.EOL +
cache.toVerboseString());
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
index cfd9b87..760b720 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
@@ -1262,7 +1262,7 @@
boolean matchFound = false;
for (Entry e : searchOperation.getSearchEntries())
{
- if (e.getDN().equals(userEntry.getDN()))
+ if (e.getName().equals(userEntry.getName()))
{
if (matchFound)
{
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
index 9db0328..61c8297 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2012 profiq, s.r.o.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -66,7 +67,7 @@
"sn: User",
"userPassword: password",
"createTimestamp: 20120315163235Z");
-
+
expired = TestCaseUtils.makeEntry("dn: uid=tuser," + TestCaseUtils.TEST_ROOT_DN_STRING,
"objectClass: top",
"objectClass: person",
@@ -99,7 +100,7 @@
"pwdMaxAge: 2592000", // 30 days
"subtreeSpecification: {minimum 1, specificationFilter \"(objectclass=*)\"}");
-
+
long expirationTime = getTimeValueFromAttribute("ds-pwp-password-expiration-time");
long createTime = getTimeValueFromAttribute("pwdchangedtime");
assertEquals(expirationTime, createTime + 2592000000L);
@@ -143,7 +144,7 @@
public void testPwPolicyExpiring() throws Exception
{
TestCaseUtils.addEntry(notExpired);
-
+
TestCaseUtils.addEntry("dn: cn=Subentry Password Policy," + TestCaseUtils.TEST_ROOT_DN_STRING,
"objectClass: top",
"objectClass: subentry",
@@ -168,7 +169,7 @@
public void testPwPolicyExpired() throws Exception
{
TestCaseUtils.addEntry(expired);
-
+
TestCaseUtils.addEntry("dn: cn=Subentry Password Policy," + TestCaseUtils.TEST_ROOT_DN_STRING,
"objectClass: top",
"objectClass: subentry",
@@ -209,7 +210,7 @@
// Process the search request
InternalSearchOperation search =
- conn.processSearch(notExpired.getDN().toString(),
+ conn.processSearch(notExpired.getName().toString(),
SearchScope.BASE_OBJECT,
DereferencePolicy.DEREF_ALWAYS,
0,
@@ -239,7 +240,7 @@
AttributeValue val = it.next();
conn.disconnect(DisconnectReason.UNBIND, true, Message.EMPTY);
-
+
return
GeneralizedTimeSyntax.decodeGeneralizedTimeValue(val.getValue());
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
index d848cdc..cc66087 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
@@ -358,7 +358,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -380,7 +380,7 @@
// Perform an internal bind to verify the password was actually changed.
conn = new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
- conn.processSimpleBind(userEntry.getDN(),
+ conn.processSimpleBind(userEntry.getName(),
ByteString.valueOf("newPassword"));
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -423,7 +423,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -444,7 +444,7 @@
// Perform an internal bind to verify the password was actually changed.
conn = new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
- conn.processSimpleBind(userEntry.getDN(),
+ conn.processSimpleBind(userEntry.getName(),
ByteString.valueOf("newPassword"));
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -487,7 +487,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -543,7 +543,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -565,7 +565,7 @@
// Perform an internal bind to verify the password was actually changed.
conn = new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
- conn.processSimpleBind(userEntry.getDN(),
+ conn.processSimpleBind(userEntry.getName(),
ByteString.valueOf("newPassword"));
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -608,7 +608,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -630,7 +630,7 @@
// Perform an internal bind to verify the password was actually changed.
conn = new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
- conn.processSimpleBind(userEntry.getDN(),
+ conn.processSimpleBind(userEntry.getName(),
ByteString.valueOf("newPassword"));
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -673,7 +673,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -695,7 +695,7 @@
// Perform an internal bind to verify the password was actually changed.
conn = new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
- conn.processSimpleBind(userEntry.getDN(),
+ conn.processSimpleBind(userEntry.getName(),
ByteString.valueOf("newPassword"));
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -738,7 +738,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -760,7 +760,7 @@
// Perform an internal bind to verify the password was actually changed.
conn = new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
- conn.processSimpleBind(userEntry.getDN(),
+ conn.processSimpleBind(userEntry.getName(),
ByteString.valueOf("newPassword"));
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -803,7 +803,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -824,7 +824,7 @@
// Perform an internal bind to verify the password was actually changed.
conn = new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
- conn.processSimpleBind(userEntry.getDN(),
+ conn.processSimpleBind(userEntry.getName(),
ByteString.valueOf("newPassword"));
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -867,7 +867,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -888,7 +888,7 @@
// Perform an internal bind to verify the password was actually changed.
conn = new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
- conn.processSimpleBind(userEntry.getDN(),
+ conn.processSimpleBind(userEntry.getName(),
ByteString.valueOf("newPassword"));
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -931,7 +931,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -953,7 +953,7 @@
// Perform an internal bind to verify the password was actually changed.
conn = new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
- conn.processSimpleBind(userEntry.getDN(),
+ conn.processSimpleBind(userEntry.getName(),
ByteString.valueOf("newPassword"));
assertEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1178,7 +1178,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1232,7 +1232,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1302,7 +1302,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1364,7 +1364,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1492,7 +1492,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1560,7 +1560,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1629,7 +1629,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1698,7 +1698,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1766,7 +1766,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1834,7 +1834,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1903,7 +1903,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1970,7 +1970,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2039,7 +2039,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2063,7 +2063,7 @@
mods.add(new Modification(ModificationType.REPLACE,
Attributes.create("pwdchangedtime",
"20050101000000.000Z")));
- modifyOperation = conn.processModify(userEntry.getDN(), mods);
+ modifyOperation = conn.processModify(userEntry.getName(), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2121,7 +2121,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2148,7 +2148,7 @@
mods.add(new Modification(ModificationType.REPLACE,
Attributes.create("pwdchangedtime",
"20050101000000.000Z")));
- modifyOperation = conn.processModify(userEntry.getDN(), mods);
+ modifyOperation = conn.processModify(userEntry.getName(), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2209,7 +2209,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2279,7 +2279,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2348,7 +2348,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2418,7 +2418,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2500,7 +2500,7 @@
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2575,7 +2575,7 @@
AddOperation addOperation =
- conn.processAdd(userEntry.getDN(), userEntry.getObjectClasses(),
+ conn.processAdd(userEntry.getName(), userEntry.getObjectClasses(),
userEntry.getUserAttributes(),
userEntry.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
index c3adb1d..5487b47 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -163,7 +163,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -212,7 +212,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -262,7 +262,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -312,7 +312,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -321,7 +321,7 @@
ByteStringBuilder saslCredBytes = new ByteStringBuilder();
saslCredBytes.append((byte)0);
saslCredBytes.append("dn:");
- saslCredBytes.append(e.getDN().toString());
+ saslCredBytes.append(e.getName().toString());
saslCredBytes.append((byte)0);
saslCredBytes.append(password);
InternalClientConnection anonymousConn =
@@ -363,7 +363,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -371,10 +371,10 @@
ByteStringBuilder saslCredBytes = new ByteStringBuilder();
saslCredBytes.append("dn:");
- saslCredBytes.append(e.getDN().toString());
+ saslCredBytes.append(e.getName().toString());
saslCredBytes.append((byte)0);
saslCredBytes.append("dn:");
- saslCredBytes.append(e.getDN().toString());
+ saslCredBytes.append(e.getName().toString());
saslCredBytes.append((byte)0);
saslCredBytes.append(password);
InternalClientConnection anonymousConn =
@@ -500,7 +500,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java
index a03ee52..5e57c7f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -200,8 +201,8 @@
// Check that all test entries are preloaded.
for(int i = 0; i < NUMTESTENTRIES; i++ ) {
assertNotNull(DirectoryServer.getEntryCache().getEntry(
- testEntriesList.get(i).getDN()), "Expected to find " +
- testEntriesList.get(i).getDN().toString() +
+ testEntriesList.get(i).getName()), "Expected to find " +
+ testEntriesList.get(i).getName().toString() +
" in the cache. Cache contents:" +
ServerConstants.EOL + toVerboseString());
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
index cfdafc3..77b6a0d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
@@ -223,7 +223,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("test@example.com");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mapper.finalizeIdentityMapper();
}
@@ -288,7 +288,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("test@example.com");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mapper.finalizeIdentityMapper();
}
@@ -353,7 +353,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("test@example.com");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mapper.finalizeIdentityMapper();
}
@@ -483,7 +483,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("test@example.com");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mapper.finalizeIdentityMapper();
}
@@ -547,7 +547,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("test");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mapper.finalizeIdentityMapper();
}
@@ -609,7 +609,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("test@example.com");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test,o=test"));
mapper.finalizeIdentityMapper();
}
@@ -672,7 +672,7 @@
// successfully.
Entry mappedEntry = mapper.getEntryForID("test");
assertNotNull(mappedEntry);
- assertEquals(mappedEntry.getDN(), DN.valueOf("uid=test@example.com,o=test"));
+ assertEquals(mappedEntry.getName(), DN.valueOf("uid=test@example.com,o=test"));
mapper.finalizeIdentityMapper();
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
index 13524ab..7716743 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -198,7 +199,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -254,7 +255,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
index 1bb17cd..6631a82 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -900,7 +900,7 @@
SearchFilter.createFilterFromString("(objectClass=*)"));
for (Entry e : searchOperation.getSearchEntries())
{
- conn.processDelete(e.getDN());
+ conn.processDelete(e.getName());
}
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
index 8421d3f..078ce2f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
@@ -140,7 +140,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOp = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOp = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOp.getResultCode(), ResultCode.SUCCESS);
@@ -243,7 +243,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOp = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOp = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOp.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
index 100da0a..736c791 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
@@ -165,7 +165,7 @@
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
searchOperation =
- conn.processSearch(sre.getDN(), SearchScope.BASE_OBJECT, filter);
+ conn.processSearch(sre.getName(), SearchScope.BASE_OBJECT, filter);
assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index 8442d68..138f76c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -379,11 +379,11 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- e = DirectoryConfig.getEntry(e.getDN());
+ e = DirectoryConfig.getEntry(e.getName());
assertNotNull(e);
assertNotNull(e.getAttribute("entryuuid"));
}
@@ -411,11 +411,11 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- e = DirectoryConfig.getEntry(e.getDN());
+ e = DirectoryConfig.getEntry(e.getName());
assertNotNull(e);
assertNotNull(e.getAttribute("entryuuid"));
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
index f7b5b13..5ab12bf 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
@@ -331,11 +331,11 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- e = DirectoryConfig.getEntry(e.getDN());
+ e = DirectoryConfig.getEntry(e.getName());
assertNotNull(e);
assertNotNull(e.getAttribute("creatorsname"));
assertNotNull(e.getAttribute("createtimestamp"));
@@ -391,13 +391,13 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
ModifyDNOperation modifyDNOperation =
- conn.processModifyDN(e.getDN(), RDN.decode("cn=test2"), false);
+ conn.processModifyDN(e.getName(), RDN.decode("cn=test2"), false);
assertEquals(modifyDNOperation.getResultCode(), ResultCode.SUCCESS);
e = DirectoryConfig.getEntry(DN.valueOf("cn=test2,o=test"));
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java
index e10632f..011399f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java
@@ -234,7 +234,7 @@
mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
"userPassword", "password")));
- ModifyOperation modOp = conn.processModify(testEntry.getDN(), mods);
+ ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
@@ -249,7 +249,7 @@
private void assertThatPasswordsAreEqualTo(Entry testEntry,
String ntPassword, String lmPassword) throws DirectoryException
{
- Entry entry = DirectoryServer.getEntry(testEntry.getDN());
+ Entry entry = DirectoryServer.getEntry(testEntry.getName());
assertNotNull(entry);
List<Attribute> sambaAttribute = entry.getAttribute("sambantpassword");
@@ -311,7 +311,7 @@
mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
"userPassword", "password")));
- ModifyOperation modOp = conn.processModify(testEntry.getDN(), mods);
+ ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
@@ -358,13 +358,13 @@
mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
"userPassword", "password1")));
- ModifyOperation modOp = conn.processModify(testEntry.getDN(), mods);
+ ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
// Verification of the result
- Entry entry = DirectoryServer.getEntry(testEntry.getDN());
+ Entry entry = DirectoryServer.getEntry(testEntry.getName());
assertNotNull(entry);
List<Attribute> sambaAttribute = entry.getAttribute("sambantpassword");
@@ -413,7 +413,7 @@
mods.add(new Modification(ModificationType.ADD, Attributes.create(
"userPassword", "password3")));
- ModifyOperation modOp = conn.processModify(testEntry.getDN(), mods);
+ ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
@@ -579,7 +579,7 @@
// Verification of the result
- Entry entry = DirectoryServer.getEntry(testEntry.getDN());
+ Entry entry = DirectoryServer.getEntry(testEntry.getName());
assertNotNull(entry);
List<Attribute> sambaAttribute = entry.getAttribute("sambantpassword");
@@ -716,7 +716,7 @@
mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
"userPassword", "password")));
- ModifyOperation modOp = conn.processModify(testEntry.getDN(), mods);
+ ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
@@ -829,7 +829,7 @@
// Verification of the result
- Entry entry = DirectoryServer.getEntry(testEntry.getDN());
+ Entry entry = DirectoryServer.getEntry(testEntry.getName());
assertNotNull(entry);
Attribute sambaPwdLastSetAttr =
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
index 7cbf343..f8dc26a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
@@ -342,7 +342,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -453,7 +453,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -486,7 +486,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -520,7 +520,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -552,7 +552,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -602,7 +602,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -641,7 +641,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -677,7 +677,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -710,7 +710,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -745,7 +745,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -778,7 +778,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(e.getDN(), e.getObjectClasses(),
+ AddOperation addOperation = conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
index d8438b8..bec0f7d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
@@ -308,7 +308,7 @@
AddOperationBasis addOp = new AddOperationBasis(connection,
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(), null,
- newJmxConnectionJmx.getDN(), newJmxConnectionJmx
+ newJmxConnectionJmx.getName(), newJmxConnectionJmx
.getObjectClasses(), newJmxConnectionJmx
.getUserAttributes(), newJmxConnectionJmx
.getOperationalAttributes());
@@ -326,13 +326,13 @@
assertNotNull(jmxc);
// Disable the "new" connector
- toggleEnableJmxConnector(connector, newJmxConnectionJmx.getDN(), false);
+ toggleEnableJmxConnector(connector, newJmxConnectionJmx.getName(), false);
Thread.sleep(100);
OpendsJmxConnector jmxcDisabled = connect("cn=Privileged User,o=test",
"password", serverJmxPort);
assertNull(jmxcDisabled);
- toggleEnableJmxConnector(connector, newJmxConnectionJmx.getDN(), true);
+ toggleEnableJmxConnector(connector, newJmxConnectionJmx.getName(), true);
Thread.sleep(100);
jmxcDisabled = connect("cn=Privileged User,o=test", "password", serverJmxPort);
assertNotNull(jmxcDisabled);
@@ -343,7 +343,7 @@
DeleteOperationBasis delOp = new DeleteOperationBasis(connection,
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(), null,
- newJmxConnectionJmx.getDN());
+ newJmxConnectionJmx.getName());
delOp.run();
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
index 9610322..5f2cf37 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
@@ -570,14 +570,14 @@
"userPassword: password");
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
if (hasPrivilege)
{
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- DeleteOperation deleteOperation = conn.processDelete(entry.getDN());
+ DeleteOperation deleteOperation = conn.processDelete(entry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
else
@@ -764,7 +764,7 @@
}
else
{
- identifier = authNEntry.getDN().toString();
+ identifier = authNEntry.getName().toString();
identifier = identifier.replace(',', '-');
identifier = identifier.replace(' ', '-');
identifier = identifier.replace('=', '-');
@@ -798,7 +798,7 @@
"ds-task-schema-file-name: 05-" + identifier + ".ldif");
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
@@ -806,7 +806,7 @@
{
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -852,7 +852,7 @@
"ds-task-backup-all: TRUE");
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
@@ -860,7 +860,7 @@
{
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -902,7 +902,7 @@
"ds-backup-directory-path: bak" + File.separator + "userRoot");
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
@@ -910,7 +910,7 @@
{
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -955,7 +955,7 @@
"ds-task-export-ldif-file: " + tempFilePath);
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
@@ -963,7 +963,7 @@
{
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
@@ -1012,7 +1012,7 @@
"ds-task-import-ldif-file: " + path);
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
@@ -1020,7 +1020,7 @@
{
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -1058,7 +1058,7 @@
"ds-task-rebuild-index: cn");
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
@@ -1066,7 +1066,7 @@
{
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -1121,7 +1121,7 @@
// with a root connection so we can do other things with it.
AddOperationBasis addOperation =
new AddOperationBasis(conn, conn
- .nextOperationID(), conn.nextMessageID(), controls, e.getDN(), e
+ .nextOperationID(), conn.nextMessageID(), controls, e.getName(), e
.getObjectClasses(), e.getUserAttributes(), e
.getOperationalAttributes());
addOperation.run();
@@ -1144,7 +1144,7 @@
Attributes.create("description", "foo")));
ModifyOperationBasis modifyOperation = new ModifyOperationBasis(conn,
- conn.nextOperationID(), conn.nextMessageID(), controls, e.getDN(),
+ conn.nextOperationID(), conn.nextMessageID(), controls, e.getName(),
mods);
modifyOperation.run();
@@ -1162,7 +1162,7 @@
// Try to rename the entry.
ModifyDNOperationBasis modifyDNOperation =
new ModifyDNOperationBasis(conn, conn.nextOperationID(),
- conn.nextMessageID(), controls, e.getDN(),
+ conn.nextMessageID(), controls, e.getName(),
RDN.decode("cn=Proxy V1 Test"), true, null);
modifyDNOperation.run();
@@ -1176,7 +1176,7 @@
{
assertEquals(modifyDNOperation.getResultCode(),
ResultCode.AUTHORIZATION_DENIED);
- newEntryDN = e.getDN();
+ newEntryDN = e.getName();
}
@@ -1318,7 +1318,7 @@
DN authDN = conn.getAuthenticationInfo().getAuthenticationDN();
AddOperationBasis addOperation =
new AddOperationBasis(conn, conn
- .nextOperationID(), conn.nextMessageID(), controls, e.getDN(), e
+ .nextOperationID(), conn.nextMessageID(), controls, e.getName(), e
.getObjectClasses(), e.getUserAttributes(), e
.getOperationalAttributes());
addOperation.run();
@@ -1344,7 +1344,7 @@
ModifyOperationBasis modifyOperation =
new ModifyOperationBasis(conn,
- conn.nextOperationID(), conn.nextMessageID(), controls, e.getDN(),
+ conn.nextOperationID(), conn.nextMessageID(), controls, e.getName(),
mods);
modifyOperation.run();
@@ -1364,7 +1364,7 @@
// Try to rename the entry.
ModifyDNOperationBasis modifyDNOperation =
new ModifyDNOperationBasis(conn, conn.nextOperationID(),
- conn.nextMessageID(), controls, e.getDN(),
+ conn.nextMessageID(), controls, e.getName(),
RDN.decode("cn=Proxy V2 Test"), true, null);
modifyDNOperation.run();
@@ -1380,7 +1380,7 @@
assertEquals(modifyDNOperation.getResultCode(),
ResultCode.AUTHORIZATION_DENIED,
"Unexpected moddn success for user " + authDN);
- newEntryDN = e.getDN();
+ newEntryDN = e.getName();
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
index 4431875..a077ed8 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
@@ -228,7 +229,7 @@
ASN1Writer writer = ASN1.getWriter(builder);
writer.writeStartSequence(OP_TYPE_SEARCH_RESULT_ENTRY);
writer.writeBoolean(true);
- writer.writeOctetString(entry.getDN().toString());
+ writer.writeOctetString(entry.getName().toString());
writer.writeStartSequence();
for(Attribute attr : entry.getAttributes())
@@ -267,7 +268,7 @@
ByteStringBuilder builder = new ByteStringBuilder();
ASN1Writer writer = ASN1.getWriter(builder);
writer.writeStartSequence(OP_TYPE_SEARCH_RESULT_ENTRY);
- writer.writeOctetString(entry.getDN().toString());
+ writer.writeOctetString(entry.getName().toString());
writer.writeOctetString("cn");
writer.writeEndSequence();
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index 57bb7cb..89183f2 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -418,10 +418,10 @@
DN.valueOf("cn=external changelog," + synchroServerStringDN));
if (ecle!=null)
{
- DirectoryServer.getConfigHandler().deleteEntry(ecle.getDN(), null);
+ DirectoryServer.getConfigHandler().deleteEntry(ecle.getName(), null);
}
DirectoryServer.getConfigHandler().deleteEntry(synchroServerDN, null);
- assertNull(DirectoryServer.getConfigEntry(synchroServerEntry.getDN()),
+ assertNull(DirectoryServer.getConfigEntry(synchroServerEntry.getName()),
"Unable to delete the synchronized domain");
synchroServerEntry = null;
@@ -546,7 +546,7 @@
// Create and publish an update message to add an entry.
return new AddMsg(gen.newCSN(),
- personWithUUIDEntry.getDN(),
+ personWithUUIDEntry.getName(),
user1entryUUID,
null,
personWithUUIDEntry.getObjectClassAttribute(),
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 9ff523e..a23ff96 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -283,7 +283,7 @@
do
{
InternalSearchOperation searchOperation = connection.processSearch(
- taskEntry.getDN(), SearchScope.BASE_OBJECT, filter);
+ taskEntry.getName(), SearchScope.BASE_OBJECT, filter);
Entry resultEntry = searchOperation.getSearchEntries().getFirst();
String completionTime = resultEntry.getAttributeValue(
@@ -332,7 +332,7 @@
log("addEntry: Failed" + addOp.getResultCode());
}
- entriesToCleanup.add(entry.getDN());
+ entriesToCleanup.add(entry.getName());
}
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
index c9ebf2b..82049cc 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
@@ -108,9 +108,9 @@
// Configure replication domain
DirectoryServer.getConfigHandler().addEntry(repDomainEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(repDomainEntry.getDN()),
+ assertNotNull(DirectoryServer.getConfigEntry(repDomainEntry.getName()),
"Unable to add the synchronized server");
- configEntriesToCleanup.add(repDomainEntry.getDN());
+ configEntriesToCleanup.add(repDomainEntry.getName());
ReplicationBroker broker = openReplicationSession(baseDN, 12,
WINDOW_SIZE, replServerPort, 1000);
@@ -130,7 +130,7 @@
Entry tmp = personEntry.duplicate(false);
AddOperation addOp = connection.processAdd(tmp);
assertEquals(addOp.getResultCode(), ResultCode.SUCCESS);
- assertTrue(DirectoryServer.entryExists(personEntry.getDN()),
+ assertTrue(DirectoryServer.entryExists(personEntry.getName()),
"The Add Entry operation failed");
// Check if the client has received the MSG
@@ -142,7 +142,7 @@
assertTrue(OperationType.ADD.compareTo(receivedOp.getOperationType()) == 0,
"The received Replication message is not an ADD msg");
- assertEquals(addMsg.getDN(), personEntry.getDN(),
+ assertEquals(addMsg.getDN(), personEntry.getName(),
"The received ADD Replication message is not for the excepted DN");
// send (2 * window + replicationServer queue) modify operations
@@ -176,7 +176,7 @@
finally {
broker.stop();
// Clean domain
- DN dn = repDomainEntry.getDN();
+ DN dn = repDomainEntry.getName();
try
{
DeleteOperation op = connection.processDelete(dn);
@@ -286,7 +286,7 @@
List<Modification> mods = generatemods("telephonenumber", "01 02 45");
ModifyOperation modOp =
- connection.processModify(personEntry.getDN(), mods);
+ connection.processModify(personEntry.getName(), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
index 7d49788..e9c4528 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
@@ -135,7 +135,7 @@
{
Entry entry = TestCaseUtils.entryFromLdifString(entryString);
AddOperation addOp = connection.processAdd(entry);
- entriesToCleanup.add(entry.getDN());
+ entriesToCleanup.add(entry.getName());
return addOp.getResultCode();
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 74f0d20..a899433 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -475,8 +475,8 @@
if (configEntry != null)
{
DirectoryServer.getConfigHandler().addEntry(configEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(configEntry.getDN()), errorMessage);
- configEntriesToCleanup.add(configEntry.getDN());
+ assertNotNull(DirectoryServer.getConfigEntry(configEntry.getName()), errorMessage);
+ configEntriesToCleanup.add(configEntry.getName());
}
}
@@ -644,7 +644,7 @@
do
{
InternalSearchOperation searchOperation =
- connection.processSearch(taskEntry.getDN(),
+ connection.processSearch(taskEntry.getName(),
SearchScope.BASE_OBJECT,
filter);
if (searchOperation.getSearchEntries().isEmpty())
@@ -727,9 +727,9 @@
}
// Entry will be removed at the end of the test
- entriesToCleanup.add(taskEntry.getDN());
+ entriesToCleanup.add(taskEntry.getName());
- TRACER.debugInfo("AddedTask/" + taskEntry.getDN());
+ TRACER.debugInfo("AddedTask/" + taskEntry.getName());
}
protected void waitTaskState(Entry taskEntry, TaskState expectedTaskState,
@@ -743,7 +743,7 @@
do
{
InternalSearchOperation searchOperation =
- connection.processSearch(taskEntry.getDN(), SearchScope.BASE_OBJECT, filter);
+ connection.processSearch(taskEntry.getName(), SearchScope.BASE_OBJECT, filter);
resultEntry = searchOperation.getSearchEntries().getFirst();
// Check that the task state is as expected.
@@ -806,12 +806,12 @@
AddOperation addOp = connection.processAdd(entry);
if (addOp.getResultCode() != ResultCode.SUCCESS)
{
- TRACER.debugInfo("Failed to add entry " + entry.getDN()
+ TRACER.debugInfo("Failed to add entry " + entry.getName()
+ "Result code = : " + addOp.getResultCode());
}
else
{
- TRACER.debugInfo(entry.getDN() + " added " + addOp.getResultCode());
+ TRACER.debugInfo(entry.getName() + " added " + addOp.getResultCode());
}
}
}
@@ -864,7 +864,7 @@
{
if (entry != null)
{
- deleteEntry(entry.getDN());
+ deleteEntry(entry.getName());
}
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
index bf6ee1f..f4efb40 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
@@ -98,7 +98,7 @@
// Create an Entry (add operation) that will be later used in the test.
Entry tmp = personEntry.duplicate(false);
AddOperation addOp = connection.processAdd(tmp);
- assertTrue(DirectoryServer.entryExists(personEntry.getDN()),
+ assertTrue(DirectoryServer.entryExists(personEntry.getName()),
"The Add Entry operation failed");
if (ResultCode.SUCCESS == addOp.getResultCode())
{
@@ -110,7 +110,7 @@
Operation receivedOp = addMsg.createOperation(connection);
assertEquals(receivedOp.getOperationType(), OperationType.ADD,
"The received replication message is not an ADD msg");
- assertEquals(addMsg.getDN(), personEntry.getDN(),
+ assertEquals(addMsg.getDN(), personEntry.getName(),
"The received ADD replication message is not for the excepted DN");
}
@@ -236,7 +236,7 @@
List<Modification> mods = generatemods("telephonenumber", "01 02 45");
ModifyOperation modOp =
- connection.processModify(personEntry.getDN(), mods);
+ connection.processModify(personEntry.getName(), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
index 193a526..32b8441 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -246,7 +246,7 @@
{
AddOperation addOp = connection.processAdd(entry);
assertEquals(addOp.getResultCode(), ResultCode.SUCCESS);
- assertNotNull(getEntry(entry.getDN(), 1000, true));
+ assertNotNull(getEntry(entry.getName(), 1000, true));
return OperationContext.getCSN(addOp);
}
@@ -284,29 +284,29 @@
CSNGenerator gen = new CSNGenerator(serverId, 0);
// Disable the directory server receive status.
- setReceiveStatus(synchroServerEntry.getDN(), false);
+ setReceiveStatus(synchroServerEntry.getName(), false);
// Create and publish an update message to add an entry.
broker.publish(addMsg(gen, personWithUUIDEntry, user1entryUUID, baseUUID));
- assertNull(getEntry(personWithUUIDEntry.getDN(), 1000, true),
+ assertNull(getEntry(personWithUUIDEntry.getName(), 1000, true),
"The replication message was replayed while it should not have been: "
+ "the server receive status was disabled");
// Enable the directory server receive status.
- setReceiveStatus(synchroServerEntry.getDN(), true);
+ setReceiveStatus(synchroServerEntry.getName(), true);
broker.publish(addMsg(gen, personWithUUIDEntry, user1entryUUID, baseUUID));
- assertNotNull(getEntry(personWithUUIDEntry.getDN(), 10000, true),
+ assertNotNull(getEntry(personWithUUIDEntry.getName(), 10000, true),
"The replication message was not replayed while it should have been: "
+ "the server receive status was reenabled");
// Delete the entries to clean the database.
broker.publish(
- new DeleteMsg(personWithUUIDEntry.getDN(), gen.newCSN(), user1entryUUID));
+ new DeleteMsg(personWithUUIDEntry.getName(), gen.newCSN(), user1entryUUID));
- assertNull(getEntry(personWithUUIDEntry.getDN(), 10000, false),
+ assertNull(getEntry(personWithUUIDEntry.getName(), 10000, false),
"The DELETE replication message was not replayed");
}
finally
@@ -317,7 +317,7 @@
private AddMsg addMsg(CSNGenerator gen, Entry entry, String uniqueId, String parentId)
{
- return new AddMsg(gen.newCSN(), entry.getDN(), uniqueId, parentId,
+ return new AddMsg(gen.newCSN(), entry.getName(), uniqueId, parentId,
entry.getObjectClassAttribute(), entry.getAttributes(),
new ArrayList<Attribute>());
}
@@ -348,17 +348,17 @@
// Create and publish an update message to add an entry.
broker.publish(addMsg(gen, personWithUUIDEntry, user1entryUUID, baseUUID));
- assertNotNull(getEntry(personWithUUIDEntry.getDN(), 30000, true),
+ assertNotNull(getEntry(personWithUUIDEntry.getName(), 30000, true),
"The ADD replication message was not replayed");
// Send a first modify operation message.
List<Modification> mods = generatemods("telephonenumber", "01 02 45");
ModifyMsg modMsg = new ModifyMsg(gen.newCSN(),
- personWithUUIDEntry.getDN(), mods, user1entryUUID);
+ personWithUUIDEntry.getName(), mods, user1entryUUID);
broker.publish(modMsg);
// Check that the modify has been replayed.
- boolean found = checkEntryHasAttribute(personWithUUIDEntry.getDN(),
+ boolean found = checkEntryHasAttribute(personWithUUIDEntry.getName(),
"telephonenumber", "01 02 45", 10000, true);
assertTrue(found, "The first modification was not replayed.");
@@ -370,18 +370,18 @@
// Send a second modify operation message.
mods = generatemods("description", "Description was changed");
modMsg = new ModifyMsg(gen.newCSN(),
- personWithUUIDEntry.getDN(), mods, user1entryUUID);
+ personWithUUIDEntry.getName(), mods, user1entryUUID);
broker.publish(modMsg);
// Check that the modify has been replayed.
- found = checkEntryHasAttribute(personWithUUIDEntry.getDN(),
+ found = checkEntryHasAttribute(personWithUUIDEntry.getName(),
"description", "Description was changed", 10000, true);
assertTrue(found, "The second modification was not replayed.");
// Delete the entries to clean the database.
broker.publish(
- new DeleteMsg(personWithUUIDEntry.getDN(), gen.newCSN(), user1entryUUID));
- assertNull(getEntry(personWithUUIDEntry.getDN(), 10000, false),
+ new DeleteMsg(personWithUUIDEntry.getName(), gen.newCSN(), user1entryUUID));
+ assertNull(getEntry(personWithUUIDEntry.getName(), 10000, false),
"The DELETE replication message was not replayed");
}
finally
@@ -568,7 +568,7 @@
broker.publish(addMsg(gen, personWithUUIDEntry, user1entryUUID, baseUUID));
// Check that the entry has been created in the local DS.
- assertNotNull(getEntry(personWithUUIDEntry.getDN(), 10000, true),
+ assertNotNull(getEntry(personWithUUIDEntry.getName(), 10000, true),
"The send ADD replication message was not applied");
// send a modify operation with the correct unique ID but another DN
@@ -580,7 +580,7 @@
broker.publish(modMsg);
// check that the modify has been applied as if the entry had been renamed.
- boolean found = checkEntryHasAttribute(personWithUUIDEntry.getDN(),
+ boolean found = checkEntryHasAttribute(personWithUUIDEntry.getName(),
"telephonenumber", "01 02 45", 10000, true);
assertTrue(found, "The modification has not been correctly replayed.");
assertEquals(getMonitorDelta(), 1);
@@ -596,14 +596,14 @@
// with a new value
mods = generatemods("uid", "AnotherUid");
modMsg = new ModifyMsg(gen.newCSN(),
- personWithUUIDEntry.getDN(), mods, user1entryUUID);
+ personWithUUIDEntry.getName(), mods, user1entryUUID);
updateMonitorCount(baseDN, resolvedMonitorAttr);
alertCount = DummyAlertHandler.getAlertCount();
broker.publish(modMsg);
// check that the modify has been applied.
- found = checkEntryHasAttribute(personWithUUIDEntry.getDN(),
+ found = checkEntryHasAttribute(personWithUUIDEntry.getName(),
"uid", "AnotherUid", 10000, true);
assertTrue(found, "The modification has not been correctly replayed.");
assertEquals(getMonitorDelta(), 1);
@@ -622,7 +622,7 @@
broker.publish(addMsg(gen, personWithUUIDEntry, user1entryUUID, baseUUID));
// Check that the entry has been created in the local DS.
- assertNotNull(getEntry(personWithUUIDEntry.getDN(), 10000, true),
+ assertNotNull(getEntry(personWithUUIDEntry.getName(), 10000, true),
"The ADD replication message was not applied");
// send a modify operation with a wrong unique ID but the same DN
@@ -635,7 +635,7 @@
// check that the modify has not been applied
Thread.sleep(2000);
- found = checkEntryHasAttribute(personWithUUIDEntry.getDN(),
+ found = checkEntryHasAttribute(personWithUUIDEntry.getName(),
"telephonenumber", "02 01 03 05", 10000, false);
assertFalse(found,
"The modification has been replayed while it should not.");
@@ -658,7 +658,7 @@
broker.publish(new DeleteMsg(delDN, gen.newCSN(), user1entryUUID));
// check that the delete operation has been applied
- assertNull(getEntry(personWithUUIDEntry.getDN(), 10000, false),
+ assertNull(getEntry(personWithUUIDEntry.getName(), 10000, false),
"The DELETE replication message was not replayed");
assertEquals(getMonitorDelta(), 1);
assertConflictAutomaticallyResolved(alertCount);
@@ -672,7 +672,7 @@
broker.publish(addMsg(gen, personWithUUIDEntry, user1entryUUID, baseUUID));
// Check that the entry has been created in the local DS.
- assertNotNull(getEntry(personWithUUIDEntry.getDN(), 10000, true),
+ assertNotNull(getEntry(personWithUUIDEntry.getName(), 10000, true),
"The ADD replication message was not applied");
// create an entry with the same DN and another unique ID
@@ -690,13 +690,13 @@
// delete the entries to clean the database.
broker.publish(
- new DeleteMsg(personWithUUIDEntry.getDN(), gen.newCSN(), user1entryUUID));
+ new DeleteMsg(personWithUUIDEntry.getName(), gen.newCSN(), user1entryUUID));
broker.publish(
- new DeleteMsg(personWithSecondUniqueID.getDN(), gen.newCSN(), user1entrysecondUUID));
+ new DeleteMsg(personWithSecondUniqueID.getName(), gen.newCSN(), user1entrysecondUUID));
- assertNull(getEntry(personWithUUIDEntry.getDN(), 10000, false),
+ assertNull(getEntry(personWithUUIDEntry.getName(), 10000, false),
"The DELETE replication message was not replayed");
- assertNull(getEntry(personWithSecondUniqueID.getDN(), 10000, false),
+ assertNull(getEntry(personWithSecondUniqueID.getName(), 10000, false),
"The DELETE replication message was not replayed");
/*
* Check that and added entry is correctly added below it's
@@ -1130,25 +1130,25 @@
// Create an Entry (add operation)
Entry tmp = personEntry.duplicate(false);
AddOperation addOp = connection.processAdd(tmp);
- assertTrue(DirectoryServer.entryExists(personEntry.getDN()),
+ assertTrue(DirectoryServer.entryExists(personEntry.getName()),
"The Add Entry operation failed");
assertEquals(addOp.getResultCode(), ResultCode.SUCCESS);
- assertClientReceivesExpectedMsg(broker, AddMsg.class, personEntry.getDN());
+ assertClientReceivesExpectedMsg(broker, AddMsg.class, personEntry.getName());
// Modify the entry
List<Modification> mods = generatemods("telephonenumber", "01 02 45");
- connection.processModify(personEntry.getDN(), mods);
- assertClientReceivesExpectedMsg(broker, ModifyMsg.class, personEntry.getDN());
+ connection.processModify(personEntry.getName(), mods);
+ assertClientReceivesExpectedMsg(broker, ModifyMsg.class, personEntry.getName());
// Modify the entry DN
DN newDN = DN.valueOf("uid= new person," + baseDN);
- connection.processModifyDN(personEntry.getDN(),
+ connection.processModifyDN(personEntry.getName(),
RDN.decode("uid=new person"), true, baseDN);
assertTrue(DirectoryServer.entryExists(newDN),
"The MOD_DN operation didn't create the new person entry");
- assertFalse(DirectoryServer.entryExists(personEntry.getDN()),
+ assertFalse(DirectoryServer.entryExists(personEntry.getName()),
"The MOD_DN operation didn't delete the old person entry");
- assertClientReceivesExpectedMsg(broker, ModifyDNMsg.class, personEntry.getDN());
+ assertClientReceivesExpectedMsg(broker, ModifyDNMsg.class, personEntry.getName());
// Delete the entry
connection.processDelete(newDN);
@@ -1169,38 +1169,38 @@
/*
* Check that the entry has been created in the local DS.
*/
- Entry resultEntry = getEntry(personWithUUIDEntry.getDN(), 10000, true);
+ Entry resultEntry = getEntry(personWithUUIDEntry.getName(), 10000, true);
assertNotNull(resultEntry,
- "The send ADD replication message was not applied for "+personWithUUIDEntry.getDN().toString());
+ "The send ADD replication message was not applied for "+personWithUUIDEntry.getName().toString());
/*
* Test the reception of Modify Msg
*/
- ModifyMsg modMsg = new ModifyMsg(gen.newCSN(), personWithUUIDEntry.getDN(),
+ ModifyMsg modMsg = new ModifyMsg(gen.newCSN(), personWithUUIDEntry.getName(),
mods, user1entryUUID);
modMsg.setAssured(assured);
broker.publish(modMsg);
- boolean found = checkEntryHasAttribute(personWithUUIDEntry.getDN(),
+ boolean found = checkEntryHasAttribute(personWithUUIDEntry.getName(),
"telephonenumber", "01 02 45", 10000, true);
assertTrue(found, "The modification has not been correctly replayed.");
// Test that replication is able to add attribute that do
// not exist in the schema.
List<Modification> invalidMods = generatemods("badattribute", "value");
- modMsg = new ModifyMsg(gen.newCSN(), personWithUUIDEntry.getDN(),
+ modMsg = new ModifyMsg(gen.newCSN(), personWithUUIDEntry.getName(),
invalidMods, user1entryUUID);
modMsg.setAssured(assured);
broker.publish(modMsg);
found = checkEntryHasAttribute(
- personWithUUIDEntry.getDN(), "badattribute", "value", 10000, true);
+ personWithUUIDEntry.getName(), "badattribute", "value", 10000, true);
assertTrue(found, "The modification has not been correctly replayed.");
/*
* Test the Reception of Modify Dn Msg
*/
- ModifyDNMsg moddnMsg = new ModifyDNMsg(personWithUUIDEntry.getDN(),
+ ModifyDNMsg moddnMsg = new ModifyDNMsg(personWithUUIDEntry.getName(),
gen.newCSN(),
user1entryUUID, null,
true, null, "uid= new person");
@@ -1318,7 +1318,7 @@
long initialCount = getMonitorAttrValue(baseDN, "replayed-updates");
// Get the UUID of the test entry.
- Entry resultEntry = getEntry(tmp.getDN(), 1, true);
+ Entry resultEntry = getEntry(tmp.getName(), 1, true);
AttributeType uuidType = DirectoryServer.getAttributeType("entryuuid");
String uuid = resultEntry.getAttributeValue(uuidType, DirectoryStringSyntax.DECODER);
@@ -1328,7 +1328,7 @@
try
{
// Publish a delete message for this test entry.
- DeleteMsg delMsg = new DeleteMsg(tmp.getDN(), gen.newCSN(), uuid);
+ DeleteMsg delMsg = new DeleteMsg(tmp.getName(), gen.newCSN(), uuid);
broker.publish(delMsg);
// Wait for the operation to be replayed.
@@ -1406,12 +1406,12 @@
broker.publish(addMsg);
// Check that the entry has not been created in the directory server.
- assertNotNull(getEntry(user3Entry.getDN(), 1000, true),
+ assertNotNull(getEntry(user3Entry.getName(), 1000, true),
"The entry has not been created");
// Modify the entry
List<Modification> mods = generatemods("telephonenumber", "01 02 45");
- connection.processModify(user3Entry.getDN(), mods);
+ connection.processModify(user3Entry.getName(), mods);
// See if the client has received the msg
ReplicationMsg msg = broker.receive();
@@ -1423,10 +1423,10 @@
// Delete the entries to clean the database.
broker.publish(
- new DeleteMsg(user3Entry.getDN(), gen.newCSN(), user3UUID));
+ new DeleteMsg(user3Entry.getName(), gen.newCSN(), user3UUID));
// Check that the delete operation has been applied.
- assertNull(getEntry(user3Entry.getDN(), 10000, false),
+ assertNull(getEntry(user3Entry.getName(), 10000, false),
"The DELETE replication message was not replayed");
}
finally
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
index 434c835..4f1a6c8 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
@@ -173,10 +173,10 @@
*/
private void addEntry(Entry entry) throws Exception
{
- debugInfo("AddEntry " + entry.getDN());
+ debugInfo("AddEntry " + entry.getName());
AddOperation addOp = connection.processAdd(entry);
waitOpResult(addOp, ResultCode.SUCCESS);
- assertNotNull(getEntry(entry.getDN(), 1000, true));
+ assertNotNull(getEntry(entry.getName(), 1000, true));
}
/**
@@ -231,7 +231,7 @@
// Add the config entry to create the replicated domain
DirectoryServer.getConfigHandler().addEntry(domainCfgEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(domainCfgEntry.getDN()),
+ assertNotNull(DirectoryServer.getConfigEntry(domainCfgEntry.getName()),
"Unable to add the domain config entry: " + configEntryLdif);
return domainCfgEntry;
@@ -259,7 +259,7 @@
// Add the config entry to create the replicated domain
DirectoryServer.getConfigHandler().addEntry(domainCfgEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(domainCfgEntry.getDN()),
+ assertNotNull(DirectoryServer.getConfigEntry(domainCfgEntry.getName()),
"Unable to add the domain config entry: " + configEntryLdif);
return domainCfgEntry;
@@ -587,7 +587,7 @@
{
{
AddMsg addMsg =
- new AddMsg(gen.newCSN(), entry.getDN(), UUID.randomUUID().toString(),
+ new AddMsg(gen.newCSN(), entry.getName(), UUID.randomUUID().toString(),
parentUid,
entry.getObjectClassAttribute(),
entry.getAttributes(), null );
@@ -1161,7 +1161,7 @@
fail("Should only go here for RS with same group id as DS");
// Ack received, replay has occurred
- assertNotNull(DirectoryServer.getEntry(entry.getDN()));
+ assertNotNull(DirectoryServer.getEntry(entry.getName()));
// Check that DS replied an ack without errors anyway
assertFalse(ackMsg.hasTimeout());
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
index 7c5293b..bc13f0f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
@@ -519,7 +519,7 @@
// Add the config entry to create the replicated domain
DirectoryServer.getConfigHandler().addEntry(fractionalDomainCfgEntry, null);
- assertNotNull(DirectoryServer.getConfigEntry(fractionalDomainCfgEntry.getDN()),
+ assertNotNull(DirectoryServer.getConfigEntry(fractionalDomainCfgEntry.getName()),
"Unable to add the domain config entry: " + configEntryLdif);
}
}
@@ -706,7 +706,7 @@
// Create an update message to add an entry.
AddMsg addMsg = new AddMsg(gen.newCSN(),
- entry.getDN(),
+ entry.getName(),
ENTRY_UUID,
null,
entry.getObjectClassAttribute(),
@@ -760,7 +760,7 @@
private void addEntry(Entry entry) throws Exception
{
connection.processAdd(entry);
- assertNotNull(getEntry(entry.getDN(), 1000, true));
+ assertNotNull(getEntry(entry.getName(), 1000, true));
}
/**
@@ -1357,7 +1357,7 @@
// Create an update message to add an entry.
AddMsg addMsg = new AddMsg(gen.newCSN(),
- entry.getDN(),
+ entry.getName(),
ENTRY_UUID,
null,
entry.getObjectClassAttribute(),
@@ -1369,9 +1369,9 @@
* check that entry has been created and has attribute values from RDN
* only
*/
- Entry newEntry = getEntry(entry.getDN(), TIMEOUT, true);
+ Entry newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
- assertEquals(entry.getDN(), newEntry.getDN());
+ assertEquals(entry.getName(), newEntry.getName());
ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
@@ -1393,7 +1393,7 @@
// Create an update message to add an entry.
addMsg = new AddMsg(gen.newCSN(),
- entry.getDN(),
+ entry.getName(),
ENTRY_UUID2,
null,
entry.getObjectClassAttribute(),
@@ -1405,9 +1405,9 @@
* check that entry has been created and has attribute values from RDN
* only
*/
- newEntry = getEntry(entry.getDN(), TIMEOUT, true);
+ newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
- assertEquals(entry.getDN(), newEntry.getDN());
+ assertEquals(entry.getName(), newEntry.getName());
objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
@@ -1453,7 +1453,7 @@
// Create an update message to add an entry.
AddMsg addMsg = new AddMsg(gen.newCSN(),
- entry.getDN(),
+ entry.getName(),
ENTRY_UUID,
null,
entry.getObjectClassAttribute(),
@@ -1465,9 +1465,9 @@
* check that entry has been created and has attribute values from RDN
* only
*/
- Entry newEntry = getEntry(entry.getDN(), TIMEOUT, true);
+ Entry newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
- assertEquals(entry.getDN(), newEntry.getDN());
+ assertEquals(entry.getName(), newEntry.getName());
ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
@@ -1491,7 +1491,7 @@
// Create an update message to add an entry.
addMsg = new AddMsg(gen.newCSN(),
- entry.getDN(),
+ entry.getName(),
ENTRY_UUID2,
null,
entry.getObjectClassAttribute(),
@@ -1503,9 +1503,9 @@
* check that entry has been created and has attribute values from RDN
* only
*/
- newEntry = getEntry(entry.getDN(), TIMEOUT, true);
+ newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
- assertEquals(entry.getDN(), newEntry.getDN());
+ assertEquals(entry.getName(), newEntry.getName());
objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
@@ -1550,7 +1550,7 @@
// Create an update message to add an entry.
AddMsg addMsg = new AddMsg(gen.newCSN(),
- entry.getDN(),
+ entry.getName(),
ENTRY_UUID,
null,
entry.getObjectClassAttribute(),
@@ -1559,9 +1559,9 @@
replicationDomain.publish(addMsg);
// check that entry has been created and has attribute values from RDN
- Entry newEntry = getEntry(entry.getDN(), TIMEOUT, true);
+ Entry newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
- assertEquals(entry.getDN(), newEntry.getDN());
+ assertEquals(entry.getName(), newEntry.getName());
ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
@@ -1587,7 +1587,7 @@
*/
newEntry = getEntry(newEntryDn, TIMEOUT, true);
assertNotNull(newEntry);
- assertEquals(newEntryDn, newEntry.getDN());
+ assertEquals(newEntryDn, newEntry.getName());
objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
@@ -1631,7 +1631,7 @@
// Create an update message to add an entry.
AddMsg addMsg = new AddMsg(gen.newCSN(),
- entry.getDN(),
+ entry.getName(),
ENTRY_UUID,
null,
entry.getObjectClassAttribute(),
@@ -1640,9 +1640,9 @@
replicationDomain.publish(addMsg);
// check that entry has been created and has attribute values from RDN
- Entry newEntry = getEntry(entry.getDN(), TIMEOUT, true);
+ Entry newEntry = getEntry(entry.getName(), TIMEOUT, true);
assertNotNull(newEntry);
- assertEquals(entry.getDN(), newEntry.getDN());
+ assertEquals(entry.getName(), newEntry.getName());
ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
@@ -1668,7 +1668,7 @@
*/
newEntry = getEntry(newEntryDn, TIMEOUT, true);
assertNotNull(newEntry);
- assertEquals(newEntryDn, newEntry.getDN());
+ assertEquals(newEntryDn, newEntry.getName());
objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
index de71a1b..cc5c92e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
@@ -426,7 +426,7 @@
}
Entry newEntry = DirectoryServer.getEntry(dn2);
- assertEquals(entry.getDN(), newEntry.getDN());
+ assertEquals(entry.getName(), newEntry.getName());
}
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
index f264185..a9a104d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
@@ -1331,7 +1331,7 @@
CSN t = new CSN(date, 0, 0);
ModifyOperationBasis modOpBasis =
- new ModifyOperationBasis(aConnection, 1, 1, null, entry.getDN(), mods);
+ new ModifyOperationBasis(aConnection, 1, 1, null, entry.getName(), mods);
LocalBackendModifyOperation modOp = new LocalBackendModifyOperation(modOpBasis);
ModifyContext ctx = new ModifyContext(t, "uniqueId");
modOp.setAttachment(SYNCHROCONTEXT, ctx);
@@ -1354,7 +1354,7 @@
mods.add(mod);
ModifyOperationBasis modOpBasis =
- new ModifyOperationBasis(aConnection, 1, 1, null, entry.getDN(), mods);
+ new ModifyOperationBasis(aConnection, 1, 1, null, entry.getName(), mods);
LocalBackendModifyOperation modOp = new LocalBackendModifyOperation(modOpBasis);
ModifyContext ctx = new ModifyContext(t, "uniqueId");
modOp.setAttachment(SYNCHROCONTEXT, ctx);
@@ -1364,7 +1364,7 @@
{
AddOperationBasis addOpBasis =
new AddOperationBasis(aConnection, 1, 1, null, entry
- .getDN(), entry.getObjectClasses(), entry.getUserAttributes(),
+ .getName(), entry.getObjectClasses(), entry.getUserAttributes(),
entry.getOperationalAttributes());
LocalBackendAddOperation addOp = new LocalBackendAddOperation(addOpBasis);
testHistorical(addOp);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java
index 2c20e6c..5535f59 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java
@@ -108,14 +108,14 @@
+ "userPassword: password\n" + "initials: AA\n");
TestCaseUtils.addEntry(entry);
- String entryUUID = getEntryUUID(entry.getDN());
+ String entryUUID = getEntryUUID(entry.getName());
// generate two consecutive CSN that will be used in backward order
CSN csn1 = gen.newCSN();
CSN csn2 = gen.newCSN();
ModifyDNMsg modDnMsg = new ModifyDNMsg(
- entry.getDN(), csn2,
+ entry.getName(), csn2,
entryUUID, parentUUID, false,
TEST_ROOT_DN_STRING,
"uid=simultaneous2");
@@ -129,7 +129,7 @@
// This MODIFY DN uses an older DN and should therefore be cancelled
// at replay time.
modDnMsg = new ModifyDNMsg(
- entry.getDN(), csn1,
+ entry.getName(), csn1,
entryUUID, parentUUID, false,
TEST_ROOT_DN_STRING,
"uid=simulatneouswrong");
@@ -142,7 +142,7 @@
domain.replay(queue.take().getUpdateMessage(), SHUTDOWN);
// Expect the conflict resolution
- assertFalse(DirectoryServer.entryExists(entry.getDN()),
+ assertFalse(DirectoryServer.entryExists(entry.getName()),
"The modDN conflict was not resolved as expected.");
}
finally
@@ -204,7 +204,7 @@
// Now try to add the same entry with same DN but a different
// unique ID though the replication
AddMsg addMsg = new AddMsg(csn1,
- entry.getDN(),
+ entry.getName(),
"c9cb8c3c-615a-4122-865d-50323aaaed48", parentUUID,
entry.getObjectClasses(), entry.getUserAttributes(),
null);
@@ -216,13 +216,13 @@
domain.replay(queue.take().getUpdateMessage(), SHUTDOWN);
// Now delete the first entry that was added at the beginning
- TestCaseUtils.deleteEntry(entry.getDN());
+ TestCaseUtils.deleteEntry(entry.getName());
// Expect the conflict resolution : the second entry should now
// have been renamed with the original DN.
- Entry resultEntry = DirectoryServer.getEntry(entry.getDN());
+ Entry resultEntry = DirectoryServer.getEntry(entry.getName());
assertNotNull(resultEntry, "The conflict was not cleared");
- assertEquals(getEntryUUID(resultEntry.getDN()),
+ assertEquals(getEntryUUID(resultEntry.getName()),
"c9cb8c3c-615a-4122-865d-50323aaaed48",
"The wrong entry has been renamed");
assertNull(resultEntry.getAttribute(LDAPReplicationDomain.DS_SYNC_CONFLICT));
@@ -288,7 +288,7 @@
// Now try to add the same entry with same DN but a different
// unique ID though the replication
AddMsg addMsg = new AddMsg(csn1,
- entry.getDN(),
+ entry.getName(),
"c9cb8c3c-615a-4122-865d-50323aaaed48", parentUUID,
entry.getObjectClasses(), entry.getUserAttributes(),
null);
@@ -304,14 +304,14 @@
InternalClientConnection.getRootConnection();
ModifyDNOperation modDNOperation =
- conn.processModifyDN(entry.getDN(), RDN.decode("cn=foo"), false);
+ conn.processModifyDN(entry.getName(), RDN.decode("cn=foo"), false);
assertEquals(modDNOperation.getResultCode(), ResultCode.SUCCESS);
// Expect the conflict resolution : the second entry should now
// have been renamed with the original DN.
- Entry resultEntry = DirectoryServer.getEntry(entry.getDN());
+ Entry resultEntry = DirectoryServer.getEntry(entry.getName());
assertNotNull(resultEntry, "The conflict was not cleared");
- assertEquals(getEntryUUID(resultEntry.getDN()),
+ assertEquals(getEntryUUID(resultEntry.getName()),
"c9cb8c3c-615a-4122-865d-50323aaaed48",
"The wrong entry has been renamed");
assertNull(resultEntry.getAttribute(LDAPReplicationDomain.DS_SYNC_CONFLICT));
@@ -392,10 +392,10 @@
TestCaseUtils.addEntry(parentEntry);
TestCaseUtils.addEntry(childEntry);
- String parentUUID = getEntryUUID(parentEntry.getDN());
+ String parentUUID = getEntryUUID(parentEntry.getName());
CSN csn2 = gen.newCSN();
- DeleteMsg delMsg = new DeleteMsg(parentEntry.getDN(), csn2, parentUUID);
+ DeleteMsg delMsg = new DeleteMsg(parentEntry.getName(), csn2, parentUUID);
delMsg.setSubtreeDelete(true);
// Put the message in the replay queue
@@ -404,9 +404,9 @@
domain.replay(queue.take().getUpdateMessage(), SHUTDOWN);
// Expect the subtree to be deleted and no conflict entry created
- assertFalse(DirectoryServer.entryExists(parentEntry.getDN()),
+ assertFalse(DirectoryServer.entryExists(parentEntry.getName()),
"DEL subtree on parent was not processed as expected.");
- assertFalse(DirectoryServer.entryExists(parentEntry.getDN()),
+ assertFalse(DirectoryServer.entryExists(parentEntry.getName()),
"DEL subtree on parent was not processed as expected.");
}
finally
@@ -461,16 +461,16 @@
TestCaseUtils.addEntry(parentEntry);
TestCaseUtils.addEntry(childEntry);
- assertTrue(DirectoryServer.entryExists(parentEntry.getDN()),
+ assertTrue(DirectoryServer.entryExists(parentEntry.getName()),
"Parent entry expected to exist.");
- assertTrue(DirectoryServer.entryExists(childEntry.getDN()),
+ assertTrue(DirectoryServer.entryExists(childEntry.getName()),
"Child entry expected to be exist.");
- String parentUUID = getEntryUUID(parentEntry.getDN());
- String childUUID = getEntryUUID(childEntry.getDN());
+ String parentUUID = getEntryUUID(parentEntry.getName());
+ String childUUID = getEntryUUID(childEntry.getName());
CSN csn2 = gen.newCSN();
- DeleteMsg delMsg = new DeleteMsg(parentEntry.getDN(), csn2, parentUUID);
+ DeleteMsg delMsg = new DeleteMsg(parentEntry.getName(), csn2, parentUUID);
// NOT SUBTREE
// Put the message in the replay queue
@@ -479,8 +479,8 @@
domain.replay(queue.take().getUpdateMessage(), SHUTDOWN);
// Expect the parent entry to be deleted
- assertTrue(!DirectoryServer.entryExists(parentEntry.getDN()),
- "Parent entry expected to be deleted : " + parentEntry.getDN());
+ assertTrue(!DirectoryServer.entryExists(parentEntry.getName()),
+ "Parent entry expected to be deleted : " + parentEntry.getName());
// Expect the child entry to be moved as conflict entry under the root
// entry of the suffix
@@ -540,7 +540,7 @@
TestCaseUtils.addEntry(parentEntry);
- String parentUUID = getEntryUUID(parentEntry.getDN());
+ String parentUUID = getEntryUUID(parentEntry.getName());
TestCaseUtils.deleteEntry(parentEntry);
CSN csn1 = gen.newCSN();
@@ -549,7 +549,7 @@
String childUUID = "44444444-4444-4444-4444-444444444444";
AddMsg addMsg = new AddMsg(
csn1,
- childEntry.getDN(),
+ childEntry.getName(),
childUUID,
parentUUID,
childEntry.getObjectClassAttribute(),
@@ -562,7 +562,7 @@
domain.replay(queue.take().getUpdateMessage(), SHUTDOWN);
// Expect the parent entry to be deleted
- assertFalse(DirectoryServer.entryExists(parentEntry.getDN()),
+ assertFalse(DirectoryServer.entryExists(parentEntry.getName()),
"Parent entry exists ");
// Expect the child entry to be moved as conflict entry under the root
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
index 7ccc657..cbe60b4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
@@ -1101,7 +1101,7 @@
// Create an update message to add an entry.
return new AddMsg(gen.newCSN(),
- personWithUUIDEntry.getDN(),
+ personWithUUIDEntry.getName(),
userEntryUUID,
null,
personWithUUIDEntry.getObjectClassAttribute(),
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
index 0c2358e..3c0b85c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
@@ -572,7 +572,7 @@
private void addEntry(Entry entry) throws Exception
{
waitOpResult(connection.processAdd(entry), ResultCode.SUCCESS);
- assertNotNull(getEntry(entry.getDN(), 1000, true));
+ assertNotNull(getEntry(entry.getName(), 1000, true));
}
private void ECLOnPrivateBackend() throws Exception
@@ -1159,7 +1159,7 @@
private void checkDn(CSN csn, SearchResultEntry resultEntry)
{
- String actualDN = resultEntry.getDN().toNormalizedString();
+ String actualDN = resultEntry.getName().toNormalizedString();
String expectedDN =
"replicationcsn=" + csn + "," + TEST_ROOT_DN_STRING + ",cn=changelog";
assertThat(actualDN).isEqualToIgnoringCase(expectedDN);
@@ -2164,7 +2164,7 @@
Entry entry = TestCaseUtils.entryFromLdifString(lentry);
AddMsg addMsg = new AddMsg(
csns[1],
- entry.getDN(),
+ entry.getName(),
user1entryUUID,
baseUUID,
entry.getObjectClassAttribute(),
@@ -2276,7 +2276,7 @@
private void assertDNEquals(SearchResultEntry resultEntry, long changeNumber)
{
- String actualDN = resultEntry.getDN().toNormalizedString();
+ String actualDN = resultEntry.getName().toNormalizedString();
String expectedDN = "changenumber=" + changeNumber + ",cn=changelog";
assertThat(actualDN).isEqualToIgnoringCase(expectedDN);
}
@@ -2297,7 +2297,7 @@
// check the entry has the right content
SearchResultEntry resultEntry = searchOp.getSearchEntries().get(0);
- assertTrue("changenumber=6,cn=changelog".equalsIgnoreCase(resultEntry.getDN().toNormalizedString()));
+ assertTrue("changenumber=6,cn=changelog".equalsIgnoreCase(resultEntry.getName().toNormalizedString()));
checkValue(resultEntry, "replicationcsn", csn.toString());
checkValue(resultEntry, "replicaidentifier", String.valueOf(SERVER_ID_1));
checkValue(resultEntry, "changetype", "add");
@@ -2703,12 +2703,12 @@
// mod 'sn' of fiona (o=test2) with 'sn' configured as ecl-incl-att
final ModifyOperation modOp1 = connection.processModify(
- uentry1.getDN(), createMods("sn", "newsn"));
+ uentry1.getName(), createMods("sn", "newsn"));
waitOpResult(modOp1, ResultCode.SUCCESS);
// mod 'telephonenumber' of robert (o=test3)
final ModifyOperation modOp2 = connection.processModify(
- uentry2.getDN(), createMods("telephonenumber", "555555"));
+ uentry2.getName(), createMods("telephonenumber", "555555"));
waitOpResult(modOp2, ResultCode.SUCCESS);
// moddn robert (o=test3) to robert2 (o=test3)
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
index 4c2de1e..cdf768e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
@@ -286,7 +286,7 @@
// Create and publish an update message to add an entry.
return new AddMsg(csn,
- personWithUUIDEntry.getDN(),
+ personWithUUIDEntry.getName(),
user1entryUUID,
baseUUID,
personWithUUIDEntry.getObjectClassAttribute(),
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
index 325eb22..8ac376c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
@@ -487,7 +487,7 @@
ArrayList<DN> returnedDNOrder = new ArrayList<DN>();
for (Entry e : internalSearch.getSearchEntries())
{
- returnedDNOrder.add(e.getDN());
+ returnedDNOrder.add(e.getName());
}
assertEquals(returnedDNOrder, expectedDNOrder);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
index 6ee4f8d..e52128e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
@@ -348,7 +348,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(entry.getDN(),
+ AddOperation addOperation = conn.processAdd(entry.getName(),
entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
@@ -451,7 +451,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- AddOperation addOperation = conn.processAdd(entry.getDN(),
+ AddOperation addOperation = conn.processAdd(entry.getName(),
entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
@@ -588,7 +588,7 @@
SearchResultEntry e = entries.get(0);
//An entry must be returned.
assertNotNull(e);
- assertTrue(e.getDN().equals(DN.valueOf("cn=test1,o=test")));
+ assertTrue(e.getName().equals(DN.valueOf("cn=test1,o=test")));
}
finally
{
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
index 37ce7f5..8b29547 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
@@ -515,8 +515,8 @@
boolean found = false;
for(SearchResultEntry entry: entries)
{
- System.out.println("dn from the current entry is " + entry.getDN());
- if(entry.getDN().equals(dn))
+ System.out.println("dn from the current entry is " + entry.getName());
+ if(entry.getName().equals(dn))
{
found = true;
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
index 43a2880..cfda3c9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
@@ -81,7 +81,7 @@
// Add the task.
AddOperation addOperation =
- connection.processAdd(taskEntry.getDN(),
+ connection.processAdd(taskEntry.getName(),
taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
@@ -99,7 +99,7 @@
do
{
InternalSearchOperation searchOperation =
- connection.processSearch(taskEntry.getDN(),
+ connection.processSearch(taskEntry.getName(),
SearchScope.BASE_OBJECT,
filter);
try
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
index b21f622..708362b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.tasks;
@@ -413,7 +413,7 @@
// Add the task.
AddOperation addOperation =
- connection.processAdd(taskEntry.getDN(),
+ connection.processAdd(taskEntry.getName(),
taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
index f08191c..d56e0fe 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -731,7 +732,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -803,7 +804,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -951,7 +952,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1015,7 +1016,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1252,7 +1253,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1314,7 +1315,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1391,7 +1392,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1453,7 +1454,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1767,7 +1768,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2240,7 +2241,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2309,7 +2310,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2381,7 +2382,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2442,7 +2443,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2518,7 +2519,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2582,7 +2583,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2662,7 +2663,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -3306,7 +3307,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -3376,7 +3377,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -3766,7 +3767,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -3824,7 +3825,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -3966,7 +3967,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -4061,7 +4062,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -4123,7 +4124,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -4183,7 +4184,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -4249,7 +4250,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
index cde5aa6..545ce24 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
@@ -907,7 +907,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -980,7 +980,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1055,7 +1055,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1111,7 +1111,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1187,7 +1187,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1255,7 +1255,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1321,7 +1321,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
index 426fca0..986f38a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -605,7 +606,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -732,7 +733,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -788,7 +789,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -835,7 +836,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
index e891031..7e93bef 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -554,7 +555,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -608,7 +609,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -663,7 +664,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -718,7 +719,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -775,7 +776,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -825,7 +826,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1212,7 +1213,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1260,7 +1261,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1395,7 +1396,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1528,7 +1529,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1665,7 +1666,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(),
+ conn.processAdd(e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
index ce046c1..9c0855f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -636,7 +636,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -691,7 +691,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -747,7 +747,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -803,7 +803,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -861,7 +861,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -912,7 +912,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1481,7 +1481,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
AddOperation addOperation =
- conn.processAdd(e.getDN(), e.getObjectClasses(), e.getUserAttributes(),
+ conn.processAdd(e.getName(), e.getObjectClasses(), e.getUserAttributes(),
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
index f0d6893..e7b37e2 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
@@ -466,12 +466,12 @@
"userPassword: password");
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertPrivilege(addOperation.getResultCode(), hasPrivilege);
- DN dnToRemove = entry.getDN();
+ DN dnToRemove = entry.getName();
if (!hasPrivilege)
{
dnToRemove = DN.valueOf("cn=Telex Number,cn=Syntaxes,cn=config");
@@ -594,12 +594,12 @@
"subtreeSpecification: {}");
AddOperation addOperation =
- conn.processAdd(entry.getDN(), entry.getObjectClasses(),
+ conn.processAdd(entry.getName(), entry.getObjectClasses(),
entry.getUserAttributes(),
entry.getOperationalAttributes());
assertPrivilege(addOperation.getResultCode(), hasPrivilege);
- DN dnToRemove = entry.getDN();
+ DN dnToRemove = entry.getName();
if (!hasPrivilege)
{
dnToRemove = DN.valueOf("cn=Subentry Target,o=test");
@@ -718,13 +718,13 @@
userDN = "";
userPassword = "";
}
- else if (authNEntry.getDN().toString().equalsIgnoreCase(INTERNAL_ROOT_DN))
+ else if (authNEntry.getName().toString().equalsIgnoreCase(INTERNAL_ROOT_DN))
{
return;
}
else
{
- userDN = authNEntry.getDN().toString();
+ userDN = authNEntry.getName().toString();
userPassword = "password";
}
@@ -793,13 +793,13 @@
userDN = "";
userPassword = "";
}
- else if (authNEntry.getDN().toString().equalsIgnoreCase(INTERNAL_ROOT_DN))
+ else if (authNEntry.getName().toString().equalsIgnoreCase(INTERNAL_ROOT_DN))
{
return;
}
else
{
- userDN = authNEntry.getDN().toString();
+ userDN = authNEntry.getName().toString();
userPassword = "password";
}
@@ -921,7 +921,7 @@
}
else
{
- identifier = authNEntry.getDN().toString();
+ identifier = authNEntry.getName().toString();
identifier = identifier.replace(',', '-');
identifier = identifier.replace(' ', '-');
identifier = identifier.replace('=', '-');
@@ -955,14 +955,14 @@
"ds-task-schema-file-name: 05-" + identifier + ".ldif");
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
assertPrivilege(addOperation.getResultCode(), hasPrivilege);
if (hasPrivilege)
{
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -1003,14 +1003,14 @@
"ds-task-backup-all: TRUE");
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
assertPrivilege(addOperation.getResultCode(), hasPrivilege);
if (hasPrivilege)
{
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -1047,14 +1047,14 @@
"ds-backup-directory-path: bak" + File.separator + "userRoot");
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
assertPrivilege(addOperation.getResultCode(), hasPrivilege);
if (hasPrivilege)
{
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -1094,14 +1094,14 @@
"ds-task-export-ldif-file: " + tempFilePath);
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
assertPrivilege(addOperation.getResultCode(), hasPrivilege);
if (hasPrivilege)
{
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
@@ -1145,14 +1145,14 @@
"ds-task-import-ldif-file: " + path);
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
assertPrivilege(addOperation.getResultCode(), hasPrivilege);
if (hasPrivilege)
{
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -1185,14 +1185,14 @@
"ds-task-rebuild-index: cn");
AddOperation addOperation =
- conn.processAdd(taskEntry.getDN(), taskEntry.getObjectClasses(),
+ conn.processAdd(taskEntry.getName(), taskEntry.getObjectClasses(),
taskEntry.getUserAttributes(),
taskEntry.getOperationalAttributes());
assertPrivilege(addOperation.getResultCode(), hasPrivilege);
if (hasPrivilege)
{
- Task task = getCompletedTask(taskEntry.getDN());
+ Task task = getCompletedTask(taskEntry.getName());
assertNotNull(task);
assertTrue(TaskState.isSuccessful(task.getTaskState()));
}
@@ -1240,7 +1240,7 @@
// Try to add the entry. If this fails with the proxy control, then add it
// with a root connection so we can do other things with it.
AddOperation addOperation = new AddOperationBasis(conn, nextOperationID(), nextMessageID(),
- controls, e.getDN(), e.getObjectClasses(),
+ controls, e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
addOperation.run();
assertProxyPrivilege(addOperation.getResultCode(), hasProxyPrivilege);
@@ -1257,19 +1257,19 @@
Attributes.create("description", "foo")));
ModifyOperation modifyOperation = new ModifyOperationBasis(conn, nextOperationID(), nextMessageID(),
- controls, e.getDN(), mods);
+ controls, e.getName(), mods);
modifyOperation.run();
assertProxyPrivilege(modifyOperation.getResultCode(), hasProxyPrivilege);
// Try to rename the entry.
ModifyDNOperation modifyDNOperation = new ModifyDNOperationBasis(conn, nextOperationID(),
- nextMessageID(), controls, e.getDN(),
+ nextMessageID(), controls, e.getName(),
RDN.decode("cn=Proxy V1 Test"), true, null);
modifyDNOperation.run();
assertProxyPrivilege(modifyOperation.getResultCode(), hasProxyPrivilege);
- DN newEntryDN = e.getDN();
+ DN newEntryDN = e.getName();
if (hasProxyPrivilege)
{
newEntryDN = modifyDNOperation.getNewDN();
@@ -1392,7 +1392,7 @@
// with a root connection so we can do other things with it.
AddOperation addOperation =
new AddOperationBasis(conn, nextOperationID(), nextMessageID(),
- controls, e.getDN(), e.getObjectClasses(),
+ controls, e.getName(), e.getObjectClasses(),
e.getUserAttributes(), e.getOperationalAttributes());
addOperation.run();
assertProxyPrivilege(addOperation.getResultCode(), hasProxyPrivilege);
@@ -1410,19 +1410,19 @@
ModifyOperation modifyOperation =
new ModifyOperationBasis(conn, nextOperationID(), nextMessageID(),
- controls, e.getDN(), mods);
+ controls, e.getName(), mods);
modifyOperation.run();
assertProxyPrivilege(modifyOperation.getResultCode(), hasProxyPrivilege);
// Try to rename the entry.
ModifyDNOperation modifyDNOperation = new ModifyDNOperationBasis(conn, nextOperationID(),
- nextMessageID(), controls, e.getDN(),
+ nextMessageID(), controls, e.getName(),
RDN.decode("cn=Proxy V2 Test"), true, null);
modifyDNOperation.run();
assertProxyPrivilege(modifyDNOperation.getResultCode(), hasProxyPrivilege);
- DN newEntryDN = e.getDN();
+ DN newEntryDN = e.getName();
if (hasProxyPrivilege)
{
newEntryDN = modifyDNOperation.getNewDN();
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
index d7b1b8e..66216a0 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
@@ -321,7 +321,7 @@
Entry entry = reader.readEntry();
Assert.assertNotNull(entry);
- Assert.assertEquals(entry.getDN(), DN
+ Assert.assertEquals(entry.getName(), DN
.valueOf("cn=john, dc=foo, dc=com"));
Assert.assertTrue(entry.hasObjectClass(OC_TOP));
Assert.assertTrue(entry.hasObjectClass(OC_PERSON));
@@ -415,7 +415,7 @@
Assert.assertNotNull(entry);
- Assert.assertEquals(entry.getDN(), DN
+ Assert.assertEquals(entry.getName(), DN
.valueOf("cn=anne, dc=foo, dc=com"));
Assert.assertTrue(entry.hasObjectClass(OC_TOP));
Assert.assertTrue(entry.hasObjectClass(OC_PERSON));
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
index b936528..14459bb 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
@@ -353,7 +353,7 @@
Entry readEntry = reader.readEntry();
reader.close();
- Assert.assertEquals(readEntry.getDN(), entry.getDN());
+ Assert.assertEquals(readEntry.getName(), entry.getName());
}
/**
@@ -380,7 +380,7 @@
reader.close();
Assert.assertTrue(add instanceof AddChangeRecordEntry);
- Assert.assertEquals(add.getDN(), entry.getDN());
+ Assert.assertEquals(add.getDN(), entry.getName());
}
/**
@@ -438,7 +438,7 @@
ldifWriter.writeDeleteChangeRecord(entry, false);
String[] expectedLDIF = new String[] {
- "dn: " + entry.getDN(),
+ "dn: " + entry.getName(),
"changetype: delete"
};
--
Gitblit v1.10.0