From c1e621ed00ff0a0110f2752a23b794d92fc7aeaf Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 18 Feb 2014 11:01:30 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 1
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DN2URI.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java | 3
opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java | 22
opendj3-server-dev/src/server/org/opends/server/controls/PersistentSearchControl.java | 3
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/api/AccessControlHandler.java | 5
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/types/ConfigChangeResult.java | 11
opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/CancelExtendedOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java | 12
opendj3-server-dev/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java | 3
opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java | 1
opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java | 6
opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 5
opendj3-server-dev/src/server/org/opends/server/types/operation/InProgressOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/types/SynchronizationProviderResult.java | 41 +
opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/core/WorkflowImpl.java | 1
opendj3-server-dev/src/server/org/opends/server/types/CancelResult.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java | 3
opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 51 +-
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java | 1
opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/types/Entry.java | 3
opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationBasis.java | 7
opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.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/extensions/UniqueCharactersPasswordValidator.java | 1
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java | 10
opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortResponseControl.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiringControl.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java | 1
opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java | 2
opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java | 2
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java | 1
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java | 2
opendj3-server-dev/src/server/org/opends/server/core/WorkflowResultCode.java | 14
opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java | 2
opendj3-server-dev/src/server/org/opends/server/types/AbstractOperation.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java | 7
opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java | 23
opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java | 8
opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableResponseControl.java | 3
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java | 4
opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java | 2
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java | 6
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java | 1
opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 1
opendj3-server-dev/src/server/org/opends/server/types/Schema.java | 1
opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogPublisher.java | 4
opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java | 9
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java | 16
opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java | 1
opendj3-server-dev/src/server/org/opends/server/core/AddOperationBasis.java | 7
opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationBasis.java | 18
opendj3-server-dev/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java | 3
opendj3-server-dev/src/server/org/opends/server/tasks/EnterLockdownModeTask.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java | 1
opendj3-server-dev/src/server/org/opends/server/types/RDN.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java | 9
opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java | 1
opendj3-server-dev/src/server/org/opends/server/tasks/ShutdownTask.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java | 1
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java | 3
opendj3-server-dev/src/server/org/opends/server/core/BindOperationBasis.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java | 8
opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java | 1
opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/ExternalChangelogRequestControl.java | 6
opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java | 19
opendj3-server-dev/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/PagedResultsControl.java | 7
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java | 1
opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/SubentriesControl.java | 3
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupPlugin.java | 2
opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java | 2
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java | 7
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/types/CommonSchemaElements.java | 18
opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java | 2
opendj3-server-dev/src/server/org/opends/server/core/OperationWrapper.java | 1
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java | 1
opendj3-server-dev/src/server/org/opends/server/core/CompareOperationBasis.java | 7
opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/SubtreeDeleteControl.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java | 3
opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendCompareOperation.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java | 1
opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java | 1
opendj3-server-dev/src/server/org/opends/server/types/SubEntry.java | 16
opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java | 28
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java | 2
opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java | 2
opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationBasis.java | 7
opendj3-server-dev/src/server/org/opends/server/core/UnbindOperationBasis.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/tasks/LeaveLockdownModeTask.java | 1
opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java | 11
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java | 4
opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java | 6
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/EntryChangeNotificationControl.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java | 40 +
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java | 3
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java | 1
opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java | 2
opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java | 16
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java | 3
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java | 2
opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java | 1
opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java | 1
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java | 1
opendj3-server-dev/src/server/org/opends/server/types/DirectoryException.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiredControl.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/VLVResponseControl.java | 3
opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java | 1
opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java | 3
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyFactory.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java | 2
opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java | 3
opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java | 2
opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableRequestControl.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesControl.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/core/WorkflowConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java | 3
opendj3-server-dev/src/server/org/opends/server/types/DN.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/types/Operation.java | 1
opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java | 3
opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java | 24
opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java | 1
opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java | 5
opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java | 2
opendj3-server-dev/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java | 5
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/core/BaseDnRegistry.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java | 2
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/VLVRequestControl.java | 4
opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java | 7
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java | 7
opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java | 1
opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationBasis.java | 7
opendj3-server-dev/src/server/org/opends/server/core/PersistentSearch.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java | 3
opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java | 4
opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/api/plugin/PluginResult.java | 2
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java | 15
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/common/MultiDomainServerState.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/core/AbandonOperationBasis.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/task/RecurringTask.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java | 2
468 files changed, 784 insertions(+), 522 deletions(-)
diff --git a/opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java b/opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java
index 03b8a99..bc4ec39 100644
--- a/opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java
+++ b/opendj3-server-dev/resource/admin/example-plugin/ExamplePlugin.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package com.example.opends;
@@ -36,7 +37,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.InitializationException;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java b/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
index 176255c..e5b73c2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/AdministrationConnector.java
@@ -56,7 +56,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.CertificateManager;
import org.opends.server.util.SetupUtils;
import org.opends.server.admin.std.server.TrustManagerProviderCfg;
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 288f250..16eafa2 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
@@ -48,7 +48,7 @@
import org.opends.server.types.LDAPException;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchResultEntry;
import org.forgerock.opendj.ldap.SearchScope;
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
index 236beeb..ba22b3e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -61,7 +61,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* Aggregation property definition.
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
index b4bda9a..7522db6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
@@ -50,7 +50,7 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
index aa2043b..f8d5018 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
@@ -59,7 +59,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
index ccc6094..fb4d6c2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
@@ -51,7 +51,7 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java b/opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java
index 133959d..e72d4cf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/server/DelayedConfigAddListener.java
@@ -37,7 +37,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AccessControlHandler.java b/opendj3-server-dev/src/server/org/opends/server/api/AccessControlHandler.java
index 3027477..bdff21c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AccessControlHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AccessControlHandler.java
@@ -33,7 +33,10 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
-import org.opends.server.workflowelement.localbackend.*;
+import org.opends.server.workflowelement.localbackend.LocalBackendAddOperation;
+import org.opends.server.workflowelement.localbackend.LocalBackendCompareOperation;
+import org.opends.server.workflowelement.localbackend.LocalBackendDeleteOperation;
+import org.opends.server.workflowelement.localbackend.LocalBackendModifyOperation;
/**
* This class defines the set of methods and structures that must be
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 6db9ff7..8767a00 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
@@ -39,6 +39,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.TimeThread;
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 ebd0732..10004ab 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
@@ -38,6 +38,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/plugin/PluginResult.java b/opendj3-server-dev/src/server/org/opends/server/api/plugin/PluginResult.java
index de9cfcf..710d3c7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/plugin/PluginResult.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/plugin/PluginResult.java
@@ -27,7 +27,7 @@
package org.opends.server.api.plugin;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.DN;
import org.opends.server.types.DisconnectReason;
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 5a31dca..7a47d96 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
@@ -46,6 +46,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.workflowelement.localbackend.*;
import static org.opends.messages.AccessControlMessages.*;
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 5e21827..fc60f52 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
@@ -43,6 +43,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.*;
import org.opends.server.workflowelement.localbackend.LocalBackendSearchOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
index 731a78a..4f8c9b1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
@@ -29,6 +29,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.messages.AccessControlMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
index b412d23..83178cb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
@@ -29,6 +29,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.core.DirectoryServer;
import org.opends.server.api.EqualityMatchingRule;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
index f78e632..c06ab4a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java
@@ -49,6 +49,7 @@
import org.opends.server.schema.BooleanSyntax;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
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 087fc6f..8a78736 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
@@ -44,6 +44,7 @@
import org.opends.server.controls.SubtreeDeleteControl;
import org.opends.server.core.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;
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 51746f1..98e7864 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
@@ -62,7 +62,7 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.LDIFImportResult;
import org.opends.server.types.RestoreConfig;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.util.LDIFException;
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 f118c74..b513bfb 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
@@ -42,6 +42,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.LDIFWriter;
import org.opends.server.util.TimeThread;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java
index 4a95ef3..a5bbcb7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java
@@ -59,7 +59,7 @@
import org.opends.server.types.LDIFImportResult;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.RestoreConfig;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;
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 3c34295..1615eb9 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
@@ -61,6 +61,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.core.WorkflowTopologyNode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.LDIFWriter;
import static org.opends.messages.BackendMessages.*;
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 da4c51a..2e52322 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
@@ -86,6 +86,7 @@
import org.opends.server.schema.NameFormSyntax;
import org.opends.server.schema.ObjectClassSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
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 b642ee7..9d2412d 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
@@ -71,6 +71,7 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.FilePermission;
import org.opends.server.util.CertificateManager;
import org.opends.server.util.SetupUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 196f147..a08d809 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -39,6 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import com.sleepycat.je.*;
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 679edf8..5f1deac 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
@@ -55,6 +55,7 @@
import org.opends.server.core.*;
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.RuntimeInformation;
import com.sleepycat.je.DatabaseException;
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 e1a579f..31a47da 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
@@ -36,6 +36,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import com.sleepycat.je.*;
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 047d262..7cc4e61 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
@@ -51,6 +51,7 @@
import org.opends.server.core.*;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
@@ -956,7 +957,7 @@
{
searchOperation.addResponseControl(
new ServerSideSortResponseControl(
- de.getResultCode().getIntValue(), null));
+ de.getResultCode().intValue(), null));
if (sortRequest.isCritical())
{
@@ -1063,7 +1064,7 @@
{
searchOperation.addResponseControl(
new ServerSideSortResponseControl(
- de.getResultCode().getIntValue(), null));
+ de.getResultCode().intValue(), null));
if (sortRequest.isCritical())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
index 90b9eb9..993d467 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java
@@ -39,6 +39,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import com.sleepycat.je.LockMode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
index fbf48e0..1267b8d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -37,7 +37,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.FilePermission;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.api.Backend;
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
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 32b56aa..40f2f0c 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
@@ -48,6 +48,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import com.sleepycat.je.*;
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 90d37e3..05727f8 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
@@ -48,6 +48,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.Platform;
import org.opends.server.util.StaticUtils;
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 e0ef517..2a3d530 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
@@ -46,7 +46,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
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 1380600..da5eb35 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
@@ -54,6 +54,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
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 f1b094c..57bbcae 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
@@ -47,6 +47,7 @@
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
index 981e507..5c89ba0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
@@ -64,6 +64,7 @@
import org.opends.server.protocols.jmx.JmxClientConnection;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableRequestControl.java
index e183428..4878a59 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableRequestControl.java
@@ -33,7 +33,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -50,7 +50,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private static final class Decoder
implements ControlDecoder<AccountUsableRequestControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableResponseControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableResponseControl.java
index bb58d3e..8862cd8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableResponseControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableResponseControl.java
@@ -32,6 +32,7 @@
import org.forgerock.opendj.io.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
@@ -62,7 +63,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<AccountUsableResponseControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
index fd71bfa..31d31a6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
@@ -31,6 +31,7 @@
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -48,7 +49,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<AuthorizationIdentityResponseControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/EntryChangeNotificationControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
index 43ee4ed..e9e32ca 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
@@ -32,6 +32,7 @@
import org.forgerock.opendj.io.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
@@ -49,7 +50,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<EntryChangeNotificationControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java
index 57b1417..b82e7de 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java
@@ -40,7 +40,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
@@ -58,7 +58,7 @@
private String cookie;
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<EntryChangelogNotificationControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/ExternalChangelogRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/ExternalChangelogRequestControl.java
index 3b7036d..f926cc7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/ExternalChangelogRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/ExternalChangelogRequestControl.java
@@ -25,6 +25,7 @@
* Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.controls;
+
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.getExceptionMessage;
@@ -39,10 +40,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
-
-
-
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class implements the control used to browse the external changelog.
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java
index eca79d9..e1f23cf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java
@@ -35,6 +35,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
index 7bda100..cdbda2e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
@@ -31,6 +31,7 @@
import org.forgerock.opendj.io.*;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -49,7 +50,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<LDAPAssertionRequestControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
index 0d48727..0bbf9e7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
@@ -40,6 +40,7 @@
import static org.opends.server.plugins.LDAPADListPlugin.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -56,7 +57,7 @@
public class LDAPPostReadRequestControl extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder implements
ControlDecoder<LDAPPostReadRequestControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
index 149197b..01776ad 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
@@ -32,6 +32,7 @@
import org.opends.server.protocols.ldap.*;
import org.opends.server.protocols.ldap.LDAPReader;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
@@ -49,7 +50,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<LDAPPostReadResponseControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
index d2aa818..57a1600 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
@@ -39,6 +39,7 @@
import static org.opends.server.plugins.LDAPADListPlugin.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
@@ -56,7 +57,7 @@
public class LDAPPreReadRequestControl extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder implements
ControlDecoder<LDAPPreReadRequestControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
index 6ca6c2f..9faeb37 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
@@ -32,6 +32,7 @@
import org.opends.server.protocols.ldap.SearchResultEntryProtocolOp;
import org.opends.server.protocols.ldap.LDAPReader;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
@@ -49,7 +50,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<LDAPPreReadResponseControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesControl.java
index 887b68b..f9a76d5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesControl.java
@@ -34,6 +34,7 @@
import org.forgerock.opendj.io.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
@@ -52,7 +53,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<MatchedValuesControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/PagedResultsControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/PagedResultsControl.java
index 6aaf6db..60ab2fa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/PagedResultsControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/PagedResultsControl.java
@@ -25,6 +25,7 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -33,6 +34,7 @@
import org.forgerock.opendj.io.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import java.io.IOException;
@@ -43,18 +45,19 @@
* The searchControlValue is an OCTET STRING wrapping the BER-encoded
* version of the following SEQUENCE:
*
+ * <pre>
* realSearchControlValue ::= SEQUENCE {
* size INTEGER (0..maxInt),
* -- requested page size from client
* -- result set size estimate from server
* cookie OCTET STRING
* }
- *
+ * </pre>
*/
public class PagedResultsControl extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<PagedResultsControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiredControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiredControl.java
index 9d877dd..c4046b7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiredControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiredControl.java
@@ -33,7 +33,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -50,7 +50,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<PasswordExpiredControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiringControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiringControl.java
index c8c31f3..c7187e9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiringControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiringControl.java
@@ -31,6 +31,7 @@
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
@@ -50,7 +51,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<PasswordExpiringControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
index c965b11..bfa9e60 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
@@ -33,7 +33,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -49,7 +49,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<PasswordPolicyRequestControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
index aebb5cd..5d3c0f0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
@@ -34,6 +34,7 @@
import org.forgerock.opendj.io.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -50,7 +51,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<PasswordPolicyResponseControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/PersistentSearchControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/PersistentSearchControl.java
index cd2a8c5..57831b0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/PersistentSearchControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/PersistentSearchControl.java
@@ -34,6 +34,7 @@
import org.forgerock.opendj.io.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -50,7 +51,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<PersistentSearchControl>
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 2200683..7ef0d4f 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
@@ -38,6 +38,7 @@
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -56,7 +57,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<ProxiedAuthV1Control>
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 3875b23..47bff50 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
@@ -39,6 +39,7 @@
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java
index 161726a..4014859 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java
@@ -38,6 +38,7 @@
import org.forgerock.opendj.io.*;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -76,7 +77,7 @@
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<ServerSideSortRequestControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortResponseControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortResponseControl.java
index 30ef818..4ade3e4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortResponseControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortResponseControl.java
@@ -34,7 +34,7 @@
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -76,7 +76,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<ServerSideSortResponseControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/SubentriesControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/SubentriesControl.java
index 1c8e07e..07ce0db 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/SubentriesControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/SubentriesControl.java
@@ -32,6 +32,7 @@
import org.forgerock.opendj.io.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -46,7 +47,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private static final class Decoder
implements ControlDecoder<SubentriesControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/SubtreeDeleteControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/SubtreeDeleteControl.java
index 2949d4d..5fff713 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/SubtreeDeleteControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/SubtreeDeleteControl.java
@@ -38,7 +38,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/VLVRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/VLVRequestControl.java
index 5722698..6a8a24c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/VLVRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/VLVRequestControl.java
@@ -34,7 +34,7 @@
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -63,7 +63,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<VLVRequestControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/VLVResponseControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/VLVResponseControl.java
index fa94025..bc5c3ad 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/VLVResponseControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/VLVResponseControl.java
@@ -32,6 +32,7 @@
import org.forgerock.opendj.io.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -68,7 +69,7 @@
extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<VLVResponseControl>
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AbandonOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/AbandonOperationBasis.java
index a40409a..9a38576 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AbandonOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AbandonOperationBasis.java
@@ -35,6 +35,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationAbandonOperation;
import org.opends.server.types.operation.PreParseAbandonOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
index 33b1cd9..0d38a5a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -47,7 +47,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index f26e06b..393dc92 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -50,7 +50,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class defines a utility that will be used to manage the set of account
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AddOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/AddOperationBasis.java
index d581156..ae87297 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AddOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AddOperationBasis.java
@@ -43,6 +43,7 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseAddOperation;
import org.opends.server.types.operation.PreParseAddOperation;
@@ -681,8 +682,8 @@
{
logger.traceException(coe);
- setResultCode(ResultCode.CANCELED);
- cancelResult = new CancelResult(ResultCode.CANCELED, null);
+ setResultCode(ResultCode.CANCELLED);
+ cancelResult = new CancelResult(ResultCode.CANCELLED, null);
appendErrorMessage(coe.getCancelRequest().getCancelReason());
}
@@ -695,7 +696,7 @@
logAddResponse(this);
if(cancelRequest == null || cancelResult == null ||
- cancelResult.getResultCode() != ResultCode.CANCELED ||
+ cancelResult.getResultCode() != ResultCode.CANCELLED ||
cancelRequest.notifyOriginalRequestor() ||
DirectoryServer.notifyAbandonedOperations())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
index f3a891f..f339af3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AlertHandlerConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
index 5f861aa..d895d3c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -49,7 +49,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
index e771cb9..3f554ad 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java
@@ -44,6 +44,7 @@
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/BaseDnRegistry.java b/opendj3-server-dev/src/server/org/opends/server/core/BaseDnRegistry.java
index 0ea7fc5..94798d3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/BaseDnRegistry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/BaseDnRegistry.java
@@ -29,7 +29,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.api.Backend;
import static org.forgerock.util.Reject.ifNull;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/BindOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/BindOperationBasis.java
index bcb316e..98ff5f9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/BindOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/BindOperationBasis.java
@@ -38,6 +38,7 @@
import org.opends.server.core.networkgroups.NetworkGroup;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PreParseBindOperation;
import org.opends.server.workflowelement.localbackend.LocalBackendBindOperation;
@@ -734,7 +735,7 @@
// This shouldn't happen for bind operations. Just cancel anyways
logger.traceException(coe);
- setResultCode(ResultCode.CANCELED);
+ setResultCode(ResultCode.CANCELLED);
appendErrorMessage(cancelRequest.getCancelReason());
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
index 010a4f8..9ef5057 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/CertificateMapperConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/CompareOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/CompareOperationBasis.java
index 7065ad1..457da63 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/CompareOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/CompareOperationBasis.java
@@ -40,6 +40,7 @@
import org.opends.server.core.networkgroups.NetworkGroup;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseCompareOperation;
import org.opends.server.types.operation.PreParseCompareOperation;
@@ -485,8 +486,8 @@
{
logger.traceException(coe);
- setResultCode(ResultCode.CANCELED);
- cancelResult = new CancelResult(ResultCode.CANCELED, null);
+ setResultCode(ResultCode.CANCELLED);
+ cancelResult = new CancelResult(ResultCode.CANCELLED, null);
appendErrorMessage(coe.getCancelRequest().getCancelReason());
}
@@ -499,7 +500,7 @@
logCompareResponse(this);
if(cancelRequest == null || cancelResult == null ||
- cancelResult.getResultCode() != ResultCode.CANCELED ||
+ cancelResult.getResultCode() != ResultCode.CANCELLED ||
cancelRequest.notifyOriginalRequestor() ||
DirectoryServer.notifyAbandonedOperations())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
index 2abe7d3..0fe7691 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -57,7 +57,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java
index 2931f77..0ca27ed 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java
@@ -38,6 +38,7 @@
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationBasis.java
index 4b3574b..cc0eb55 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationBasis.java
@@ -36,6 +36,7 @@
import org.opends.server.core.networkgroups.NetworkGroup;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseDeleteOperation;
import org.opends.server.types.operation.PreParseDeleteOperation;
@@ -327,8 +328,8 @@
{
logger.traceException(coe);
- setResultCode(ResultCode.CANCELED);
- cancelResult = new CancelResult(ResultCode.CANCELED, null);
+ setResultCode(ResultCode.CANCELLED);
+ cancelResult = new CancelResult(ResultCode.CANCELLED, null);
appendErrorMessage(coe.getCancelRequest().getCancelReason());
}
@@ -341,7 +342,7 @@
logDeleteResponse(this);
if(cancelRequest == null || cancelResult == null ||
- cancelResult.getResultCode() != ResultCode.CANCELED ||
+ cancelResult.getResultCode() != ResultCode.CANCELLED ||
cancelRequest.notifyOriginalRequestor() ||
DirectoryServer.notifyAbandonedOperations())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
index d147227..f154530 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -42,6 +42,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeUsage;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.forgerock.util.Reject;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
index 5fe590f..1f671a8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -51,7 +51,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationBasis.java
index 6810bdd..71751f2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationBasis.java
@@ -39,6 +39,7 @@
import org.opends.server.api.plugin.PluginResult;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostOperationExtendedOperation;
import org.opends.server.types.operation.PostResponseExtendedOperation;
@@ -422,8 +423,8 @@
{
logger.traceException(coe);
- setResultCode(ResultCode.CANCELED);
- cancelResult = new CancelResult(ResultCode.CANCELED, null);
+ setResultCode(ResultCode.CANCELLED);
+ cancelResult = new CancelResult(ResultCode.CANCELLED, null);
appendErrorMessage(coe.getCancelRequest().getCancelReason());
}
@@ -437,7 +438,7 @@
// Send the response to the client.
if(cancelRequest == null || cancelResult == null ||
- cancelResult.getResultCode() != ResultCode.CANCELED ||
+ cancelResult.getResultCode() != ResultCode.CANCELLED ||
cancelRequest.notifyOriginalRequestor() ||
DirectoryServer.notifyAbandonedOperations())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
index b6c1998..b77f96c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java
index 816303c..fde666f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ExtensionConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
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 0fb2b0e..8af3a8e 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
@@ -56,6 +56,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.*;
import org.opends.server.workflowelement.localbackend.LocalBackendSearchOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
index 02a4bc6..55c110a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
index 5d460d2..624f2ae 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
index d196ea0..7d8d02d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
@@ -37,7 +37,7 @@
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.loggers.RetentionPolicy;
import org.opends.server.config.ConfigException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java
index 488bee6..45ca251 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/LogRotationPolicyConfigManager.java
@@ -38,7 +38,7 @@
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.config.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
index bcc4631..94939da 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
@@ -51,7 +51,7 @@
import org.opends.server.loggers.HTTPAccessLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
index c11048f..4ab2fc0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java
@@ -56,7 +56,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.types.MatchingRuleUse;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationBasis.java
index d108054..17387df 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationBasis.java
@@ -26,20 +26,22 @@
*/
package org.opends.server.core;
-import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.AccessLogger.*;
import java.util.ArrayList;
import java.util.List;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.networkgroups.NetworkGroup;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseModifyDNOperation;
import org.opends.server.types.operation.PreParseModifyDNOperation;
-import org.opends.server.workflowelement.localbackend.*;
+import org.opends.server.workflowelement.localbackend.LocalBackendModifyDNOperation;
+
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.server.loggers.AccessLogger.*;
/**
* This class defines an operation that may be used to alter the DN of an entry
@@ -545,8 +547,8 @@
{
logger.traceException(coe);
- setResultCode(ResultCode.CANCELED);
- cancelResult = new CancelResult(ResultCode.CANCELED, null);
+ setResultCode(ResultCode.CANCELLED);
+ cancelResult = new CancelResult(ResultCode.CANCELLED, null);
appendErrorMessage(coe.getCancelRequest().getCancelReason());
}
@@ -559,7 +561,7 @@
logModifyDNResponse(this);
if(cancelRequest == null || cancelResult == null ||
- cancelResult.getResultCode() != ResultCode.CANCELED ||
+ cancelResult.getResultCode() != ResultCode.CANCELLED ||
cancelRequest.notifyOriginalRequestor() ||
DirectoryServer.notifyAbandonedOperations())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationBasis.java
index 396715d..fcb6d71 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationBasis.java
@@ -39,6 +39,7 @@
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseModifyOperation;
import org.opends.server.types.operation.PreParseModifyOperation;
@@ -441,8 +442,8 @@
{
logger.traceException(coe);
- setResultCode(ResultCode.CANCELED);
- cancelResult = new CancelResult(ResultCode.CANCELED, null);
+ setResultCode(ResultCode.CANCELLED);
+ cancelResult = new CancelResult(ResultCode.CANCELLED, null);
appendErrorMessage(coe.getCancelRequest().getCancelReason());
}
@@ -455,7 +456,7 @@
logModifyResponse(this);
if(cancelRequest == null || cancelResult == null ||
- cancelResult.getResultCode() != ResultCode.CANCELED ||
+ cancelResult.getResultCode() != ResultCode.CANCELLED ||
cancelRequest.notifyOriginalRequestor() ||
DirectoryServer.notifyAbandonedOperations())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java
index 5b0e8b4..b8de2c5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/MonitorConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/OperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/OperationWrapper.java
index 8f3891b..5ce7c77 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/OperationWrapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/OperationWrapper.java
@@ -34,6 +34,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.controls.ControlDecoder;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This abstract class is a generic operation wrapper intended to be subclassed
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
index 0bbfd45..2532e0b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
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 94c4cac..b17fcc2 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
@@ -51,6 +51,7 @@
import org.opends.server.config.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
index 3dea277..d3448d7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
@@ -48,6 +48,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
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 f19757f..1aee923 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
@@ -45,6 +45,7 @@
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index 5535507..3562e34 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -50,7 +50,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class defines a utility that will be used to manage the set of password
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
index ecd3526..365e31d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
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 65982dd..7659eba 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
@@ -41,7 +41,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
@@ -217,7 +217,7 @@
}
}
- return new CancelResult(ResultCode.CANCELED, null);
+ return new CancelResult(ResultCode.CANCELLED, null);
}
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 af7ef74..e0e2997 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
@@ -50,6 +50,7 @@
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.*;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java
index b638c05..429f55d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/RootDNConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java b/opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java
index 86708cf..df5f805 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/RootDseWorkflowTopology.java
@@ -31,6 +31,7 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.core.networkgroups.NetworkGroupNamingContexts;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class implements the workflow node that handles the root DSE entry.
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java b/opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java
index 0291d0b..b32a5e6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/RootPrivilegeChangeListener.java
@@ -38,7 +38,7 @@
import org.opends.server.admin.std.server.RootDNCfg;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
index 2df9f8a..a6b5064 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SASLConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java
index bdadeef..9f08bac 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java
@@ -40,6 +40,7 @@
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostResponseSearchOperation;
import org.opends.server.types.operation.PreParseSearchOperation;
import org.opends.server.types.operation.SearchEntrySearchOperation;
@@ -1284,8 +1285,8 @@
{
logger.traceException(coe);
- setResultCode(ResultCode.CANCELED);
- cancelResult = new CancelResult(ResultCode.CANCELED, null);
+ setResultCode(ResultCode.CANCELLED);
+ cancelResult = new CancelResult(ResultCode.CANCELLED, null);
appendErrorMessage(coe.getCancelRequest().getCancelReason());
}
@@ -1295,7 +1296,7 @@
setProcessingStopTime();
if(cancelRequest == null || cancelResult == null ||
- cancelResult.getResultCode() != ResultCode.CANCELED)
+ cancelResult.getResultCode() != ResultCode.CANCELLED)
{
// If everything is successful to this point and it is not a persistent
// search, then send the search result done message to the client.
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 301c2bc..8d04be0 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
@@ -46,6 +46,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationAddOperation;
import org.opends.server.types.operation.PostOperationDeleteOperation;
import org.opends.server.types.operation.PostOperationModifyDNOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java b/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
index 9c2cd5d..d8e1701 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
@@ -44,6 +44,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
index d623def..74a8a99 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -52,7 +52,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
index ed2641d..d4698aa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/UnbindOperationBasis.java b/opendj3-server-dev/src/server/org/opends/server/core/UnbindOperationBasis.java
index e023167..bcabe26 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/UnbindOperationBasis.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/UnbindOperationBasis.java
@@ -34,6 +34,7 @@
import org.opends.server.api.ClientConnection;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationUnbindOperation;
import org.opends.server.types.operation.PreParseUnbindOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
index c8f1ccd..05094fe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -46,6 +46,7 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java
index 7d854ed..7ae6091 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/WorkQueueConfigManager.java
@@ -27,8 +27,6 @@
package org.opends.server.core;
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
@@ -43,14 +41,11 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
-
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a utility that will be used to manage the Directory Server
* work queue.
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/WorkflowConfigManager.java
index 9434efb..07e0c5c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/WorkflowConfigManager.java
@@ -46,7 +46,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.workflowelement.WorkflowElement;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowImpl.java b/opendj3-server-dev/src/server/org/opends/server/core/WorkflowImpl.java
index 1b737a7..a9c718d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/WorkflowImpl.java
@@ -37,6 +37,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.admin.std.server.WorkflowCfg;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.workflowelement.WorkflowElement;
import org.opends.server.workflowelement.ObservableWorkflowElementState;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowResultCode.java b/opendj3-server-dev/src/server/org/opends/server/core/WorkflowResultCode.java
index 65785a2..e5fa8f7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/WorkflowResultCode.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/WorkflowResultCode.java
@@ -25,12 +25,10 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-
-
-import org.opends.server.types.ResultCode;
-
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class implements the workflow result code. The workflow result code
@@ -134,14 +132,14 @@
{
// Elaborate the new result code (see table in the description header).
- switch (newResultCode)
+ switch (newResultCode.asEnum())
{
case SUCCESS:
//
// Received SUCCESS
// ----------------
//
- switch (resultCode)
+ switch (resultCode.asEnum())
{
case NO_SUCH_OBJECT:
resultCode = ResultCode.SUCCESS;
@@ -169,7 +167,7 @@
// Received REFERRAL
// -----------------
//
- switch (resultCode)
+ switch (resultCode.asEnum())
{
case REFERRAL:
resultCode = ResultCode.SUCCESS;
@@ -191,7 +189,7 @@
// Received other result codes
// ---------------------------
//
- switch (resultCode)
+ switch (resultCode.asEnum())
{
case REFERRAL:
resultCode = newResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
index a26fc71..b6524fb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java
@@ -70,7 +70,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreParseOperation;
import org.opends.server.workflowelement.WorkflowElement;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java
index 71d2656..e73d432 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java
@@ -45,7 +45,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class defines a utility that will be used to manage the
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupPlugin.java b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupPlugin.java
index f7901fa..f312141 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupPlugin.java
@@ -45,7 +45,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DisconnectReason;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreParseAddOperation;
import org.opends.server.types.operation.PreParseBindOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
index c6cfb69..01984f0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
@@ -43,7 +43,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.OperationType;
import org.opends.server.types.RawFilter;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreParseAddOperation;
import org.opends.server.types.operation.PreParseCompareOperation;
import org.opends.server.types.operation.PreParseDeleteOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyFactory.java b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyFactory.java
index 010eb9d..0157ca9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyFactory.java
@@ -45,7 +45,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.InitializationException;
import org.opends.server.types.RawFilter;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreParseOperation;
import org.opends.server.types.operation.PreParseSearchOperation;
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 bd145ce..cd4f9f1 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
@@ -77,6 +77,7 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.Base64;
import org.opends.server.util.SelectableCertificateKeyManager;
import org.opends.server.util.ServerConstants;
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 112d364..fb7921a 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
@@ -43,6 +43,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostResponseAddOperation;
import org.opends.server.types.operation.PostResponseDeleteOperation;
import org.opends.server.types.operation.PostResponseModifyOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
index cac2722..c89f6c1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
@@ -41,6 +41,7 @@
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java
index 9a1ed66..5b5f888 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java
@@ -35,6 +35,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
index 64c1a2d..d6f8710 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
@@ -35,6 +35,7 @@
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
index 755b9fc..ee7463a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java
@@ -38,6 +38,7 @@
import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
index fca6b3e..29599e5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
@@ -34,6 +34,7 @@
import org.opends.server.config.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
index 90fbee0..1b6b3cb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
@@ -35,6 +35,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
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 563d54e..2e53cf6 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
@@ -47,6 +47,7 @@
import org.opends.server.core.PasswordPolicyState;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/CancelExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/extensions/CancelExtendedOperation.java
index 9c7c518..75df132 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/CancelExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/CancelExtendedOperation.java
@@ -36,6 +36,7 @@
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -126,7 +127,7 @@
// Update the result of the extended operation and return.
ResultCode resultCode = cancelResult.getResultCode();
- operation.setResultCode(resultCode == ResultCode.CANCELED
+ operation.setResultCode(resultCode == ResultCode.CANCELLED
? ResultCode.SUCCESS : resultCode);
operation.appendErrorMessage(cancelResult.getResponseMessage());
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
index 902845a..3aaea17 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
@@ -41,6 +41,7 @@
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
index 8d10d6d..77c743e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
@@ -33,6 +33,7 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
index ed1dc08..60d262b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java
@@ -38,6 +38,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
/**
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 06de1cb..fa175df 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
@@ -50,6 +50,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.util.Utils;
import org.opends.server.admin.Configuration;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
index a70fb1c..c64165d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
@@ -40,6 +40,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.BSDMD5Crypt;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java
index 86165b5..447b997 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DefaultEntryCache.java
@@ -47,7 +47,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class defines the default entry cache which acts as an arbiter for
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
index e747395..00cf37e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
@@ -44,6 +44,7 @@
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index faac14d..cfe5c31 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -49,7 +49,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.ServerConstants.*;
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 bd405c6..ed36361 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
@@ -42,7 +42,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.LDAPURL;
import org.opends.server.types.MembershipException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchResultReference;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
index 82f25f0..b0b6d71 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
@@ -41,6 +41,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java
index 4ffc00e..f8bb201 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryCacheCommon.java
@@ -41,7 +41,7 @@
import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
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 7bbc736..d39a25b 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
@@ -39,6 +39,7 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index b2c65cb..e528fa2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -50,7 +50,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 30fa892..508cc2c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -46,6 +46,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
@@ -214,7 +215,7 @@
DereferencePolicy.NEVER_DEREF_ALIASES, 1, 10,
false, filter, requestedAttributes);
- switch (internalSearch.getResultCode())
+ switch (internalSearch.getResultCode().asEnum())
{
case SUCCESS:
// This is fine. No action needed.
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 43a0fe4..849a084 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
@@ -43,6 +43,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.ldap.LDAPClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.config.ConfigConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index df71a83..08c7b45 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -50,7 +50,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index 71d5f4f..eb4d948 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -51,7 +51,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ExpirationCheckTrustManager;
import org.forgerock.i18n.slf4j.LocalizedLogger;
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 7052357..8572acf 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
@@ -65,6 +65,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.ConfigMessages.*;
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 2aeba29..11d7b57 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
@@ -46,6 +46,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -240,7 +241,7 @@
DereferencePolicy.NEVER_DEREF_ALIASES, 1, 10,
false, filter, requestedAttributes);
- switch (searchOperation.getResultCode())
+ switch (searchOperation.getResultCode().asEnum())
{
case SUCCESS:
// This is fine. No action needed.
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index e0e77d2..1d269a9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -69,7 +69,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
index 048397c..00b773f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
@@ -37,6 +37,7 @@
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.opends.server.util.ServerConstants.*;
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 9e4d4ee..f55b494 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
@@ -38,6 +38,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
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 b57c3a5..c5c3637 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
@@ -40,6 +40,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java
index 0aa5351..6e07778 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/JMXAlertHandler.java
@@ -62,7 +62,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.ExtensionMessages.*;
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 4d93368..f54c231 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
@@ -42,6 +42,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.ModificationType;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy;
@@ -58,7 +59,20 @@
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.DereferencePolicy;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.HostPort;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.LDAPException;
+import org.opends.server.types.RawFilter;
+import org.opends.server.types.RawModification;
+import org.opends.server.types.SearchFilter;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
@@ -977,7 +991,7 @@
final ResultCode resultCode = ResultCode.valueOf(searchResult
.getResultCode());
- switch (resultCode)
+ switch (resultCode.asEnum())
{
case SUCCESS:
// The search succeeded. Drop out of the loop and check that we
@@ -987,16 +1001,15 @@
case SIZE_LIMIT_EXCEEDED:
// Multiple matching candidates.
throw new DirectoryException(
- ResultCode.CLIENT_SIDE_MORE_RESULTS_TO_RETURN,
+ ResultCode.CLIENT_SIDE_UNEXPECTED_RESULTS_RETURNED,
ERR_LDAP_PTA_CONNECTION_SEARCH_SIZE_LIMIT.get(host, port, cfg.dn(), baseDN, filter));
default:
// The search failed for some reason.
throw new DirectoryException(resultCode,
ERR_LDAP_PTA_CONNECTION_SEARCH_FAILED.get(host, port,
- cfg.dn(), baseDN, filter, resultCode.getIntValue(),
- resultCode.getResultCodeName(),
- searchResult.getErrorMessage()));
+ cfg.dn(), baseDN, filter, resultCode.intValue(),
+ resultCode.getName(), searchResult.getErrorMessage()));
}
break;
@@ -1013,7 +1026,7 @@
{
// Multiple matching candidates.
throw new DirectoryException(
- ResultCode.CLIENT_SIDE_MORE_RESULTS_TO_RETURN,
+ ResultCode.CLIENT_SIDE_UNEXPECTED_RESULTS_RETURNED,
ERR_LDAP_PTA_CONNECTION_SEARCH_SIZE_LIMIT.get(host, port,
cfg.dn(), baseDN, filter));
}
@@ -1066,7 +1079,7 @@
throw new DirectoryException(resultCode,
ERR_LDAP_PTA_CONNECTION_BIND_FAILED.get(host, port,
cfg.dn(), username,
- resultCode.getIntValue(), resultCode.getResultCodeName(),
+ resultCode.intValue(), resultCode.getName(),
bindResponse.getErrorMessage()));
}
@@ -1121,8 +1134,7 @@
throw new DirectoryException(mappedResultCode,
ERR_LDAP_PTA_CONNECTION_DISCONNECTING.get(host, port,
- cfg.dn(), resultCode.getIntValue(),
- resultCode.getResultCodeName(),
+ cfg.dn(), resultCode.intValue(), resultCode.getName(),
extendedResponse.getErrorMessage()));
}
}
@@ -1730,13 +1742,13 @@
}
catch (final DirectoryException e)
{
- switch (e.getResultCode())
+ switch (e.getResultCode().asEnum())
{
case NO_SUCH_OBJECT:
case CLIENT_SIDE_NO_RESULTS_RETURNED:
// Ignore and try next base DN.
break;
- case CLIENT_SIDE_MORE_RESULTS_TO_RETURN:
+ case CLIENT_SIDE_UNEXPECTED_RESULTS_RETURNED:
// More than one matching entry was returned.
throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
ERR_LDAP_PTA_MAPPED_SEARCH_TOO_MANY_CANDIDATES.get(
@@ -1784,7 +1796,7 @@
}
catch (final DirectoryException e)
{
- switch (e.getResultCode())
+ switch (e.getResultCode().asEnum())
{
case NO_SUCH_OBJECT:
case INVALID_CREDENTIALS:
@@ -2231,7 +2243,7 @@
*/
static boolean isServiceError(final ResultCode resultCode)
{
- switch (resultCode)
+ switch (resultCode.asEnum())
{
case OPERATIONS_ERROR:
case PROTOCOL_ERROR:
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
index 7cf3d81..a3392f2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
@@ -38,6 +38,7 @@
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
index 2277da8..a703664 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
@@ -38,6 +38,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
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 50ae9f0..c35c1fe 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
@@ -51,7 +51,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.MemberList;
import org.opends.server.types.MembershipException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.VirtualAttributeRule;
/**
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 e184b96..cb4d719 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
@@ -40,6 +40,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
index bf0a606..9f5998d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
@@ -42,6 +42,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index 56914a4..07f80a7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -48,7 +48,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.forgerock.i18n.slf4j.LocalizedLogger;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
index 91c80c5..720e65d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
@@ -50,7 +50,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Operation;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
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 57aecf5..6948f32 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
@@ -39,6 +39,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
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 e637310..37156b7 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
@@ -55,6 +55,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
index cc39061..eeec3b4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
@@ -49,6 +49,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.ExtensionMessages.*;
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 0516460..ec753de 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
@@ -38,6 +38,7 @@
import org.opends.server.core.SearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
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 3a91911..37aefe9 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
@@ -50,6 +50,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java
index 37cac31..958942f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java
@@ -35,6 +35,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
index cde58e3..5da094f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -43,6 +43,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index 025a105..148709b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -49,6 +49,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
@@ -236,7 +237,7 @@
DereferencePolicy.NEVER_DEREF_ALIASES, 1, 10,
false, filter, requestedAttributes);
- switch (internalSearch.getResultCode())
+ switch (internalSearch.getResultCode().asEnum())
{
case SUCCESS:
// This is fine. No action needed.
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
index a1e25f6..06e6c04 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
@@ -38,6 +38,7 @@
RepeatedCharactersPasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
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 263dd5a..595b1d5 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
@@ -54,6 +54,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
index 8cab606..7399662 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
@@ -38,6 +38,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
index 96dbeb0..f49d285 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
@@ -57,7 +57,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.EMailMessage;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
index 2f122c8..0b06fde 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
@@ -42,7 +42,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.EMailMessage;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index f15cbd7..4b69ce5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -39,6 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
index 815cfc1..0a06072 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
@@ -39,6 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
index 1c4df3d..8c9bc4f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
@@ -39,6 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
index afd62fb..997d3c6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
@@ -39,6 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
index 60848ab..f3df679 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
@@ -39,6 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
index c479ea4..01ecdbe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
@@ -33,6 +33,7 @@
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.LevenshteinDistance;
import org.opends.server.admin.std.server.SimilarityBasedPasswordValidatorCfg;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
index 8612932..8279b50 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
@@ -33,7 +33,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.ServerConstants.*;
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 77381ab..bb71d2b 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
@@ -60,7 +60,7 @@
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
index d13260f..899ad63 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java
@@ -37,6 +37,7 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
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 c263e09..a4d4e91 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
@@ -46,6 +46,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -299,7 +300,7 @@
DereferencePolicy.NEVER_DEREF_ALIASES, 1, 10,
false, filter, requestedAttributes);
- switch (searchOperation.getResultCode())
+ switch (searchOperation.getResultCode().asEnum())
{
case SUCCESS:
// This is fine. No action needed.
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 d58f601..93e7060 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
@@ -48,6 +48,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
@@ -206,7 +207,7 @@
conn.processSearch(baseDN, SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES, 1, 10,
false, filter, requestedAttributes);
- switch (searchOperation.getResultCode())
+ switch (searchOperation.getResultCode().asEnum())
{
case SUCCESS:
// This is fine. No action needed.
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
index 4dd2ab3..85ae847 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
@@ -41,6 +41,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
index de7a48e..038909e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java
@@ -38,6 +38,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
index 4b92cc4..b3137a9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -52,7 +52,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Operation;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
index a6b11ee..bdde79d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
@@ -35,6 +35,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java b/opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
index 258ef07..ef396a5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
@@ -38,6 +38,7 @@
import org.opends.server.admin.std.server.UniqueCharactersPasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
index f36b892..995e701 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
@@ -40,6 +40,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
/**
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 bdfd05c..6e3292f 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
@@ -47,7 +47,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.MemberList;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
index 636ce7e..bff7e7c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
@@ -38,6 +38,7 @@
import org.opends.server.core.ExtendedOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
index 5d884cb..061beb1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
@@ -48,7 +48,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index 8fd0bac..21de015 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -51,6 +51,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.AddressMask;
import org.forgerock.opendj.ldap.ByteString;
@@ -494,7 +495,7 @@
private boolean filterResponse(final Operation operation)
{
// Check response code.
- final Integer resultCode = operation.getResultCode().getIntValue();
+ final int resultCode = operation.getResultCode().intValue();
if (!cfg.getResponseResultCodeNotEqualTo().isEmpty())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogPublisher.java
index b8cf540..59a794f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogPublisher.java
@@ -32,7 +32,9 @@
import org.opends.server.admin.std.server.AccessLogPublisherCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.core.*;
-import org.opends.server.types.*;
+import org.opends.server.types.DisconnectReason;
+import org.opends.server.types.SearchResultEntry;
+import org.opends.server.types.SearchResultReference;
/**
* This class defines the set of methods and structures that must be
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java
index 0500b90..7e38683 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AccessLogger.java
@@ -25,8 +25,6 @@
* Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.loggers;
-import static org.opends.messages.ConfigMessages.*;
-
import java.util.Collection;
import org.forgerock.i18n.LocalizableMessage;
@@ -35,8 +33,11 @@
import org.opends.server.admin.std.server.AccessLogPublisherCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.core.*;
-import org.opends.server.types.*;
+import org.opends.server.types.DisconnectReason;
+import org.opends.server.types.SearchResultEntry;
+import org.opends.server.types.SearchResultReference;
+import static org.opends.messages.ConfigMessages.*;
/**
* This class defines the wrapper that will invoke all registered access loggers
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
index efbbf39..966c2c1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
@@ -38,7 +38,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java b/opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
index 3e1fdb5..3106e18 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
@@ -35,7 +35,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FixedTimeLogRotationPolicyCfg;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.TimeThread;
@@ -49,7 +49,7 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // The scheduled rotation times as ms offsets from the beginnging of the day.
+ // The scheduled rotation times as ms offsets from the beginning of the day.
private int[] rotationTimes;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
index c78b8b5..3c730e0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -41,7 +41,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class implements a retention policy based on the free disk space
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
index 7c4c5be..04ec74d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
@@ -31,6 +31,7 @@
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.FilePermission;
import org.opends.server.admin.std.server.SizeLimitLogRotationPolicyCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
index 669c5c8..1d79886 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
@@ -39,7 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class implements a retention policy based on the amount of
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java b/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
index acfe086..c94f94c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
@@ -32,7 +32,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.config.ConfigException;
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 040d009..ba0af34 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
@@ -44,6 +44,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.TimeThread;
@@ -1209,7 +1210,7 @@
Operation operation)
{
buffer.append(" result=");
- buffer.append(operation.getResultCode().getIntValue());
+ buffer.append(operation.getResultCode().intValue());
final LocalizableMessageBuilder msg = operation.getErrorMessage();
if ((msg != null) && (msg.length() > 0))
@@ -1220,7 +1221,7 @@
if (operation.getMaskedResultCode() != null)
{
buffer.append(" maskedResult=");
- buffer.append(operation.getMaskedResultCode().getIntValue());
+ buffer.append(operation.getMaskedResultCode().intValue());
}
final LocalizableMessageBuilder maskedMsg = operation.getMaskedErrorMessage();
if (maskedMsg != null && maskedMsg.length() > 0)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
index b12aa4a..dedc48c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
@@ -29,7 +29,7 @@
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.types.ResultCode.*;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -44,6 +44,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
index d51cebd..7886fca 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
@@ -47,7 +47,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.TimeThread;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
index ee6e30e..2a49f00 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -53,7 +53,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
index 8f20b18..a14fb02 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
@@ -52,7 +52,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.FilePermission;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.TimeThread;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
index d33a8aa..c4b59bb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
@@ -31,7 +31,7 @@
import org.opends.server.admin.std.server.TimeLimitLogRotationPolicyCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import java.util.List;
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java
index f22017e..2c4dd7d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TraceSettings.java
@@ -34,7 +34,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.DebugTargetCfg;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class encapsulates the trace settings in effect at a given traceing
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java
index 1f49abd..bbcc28b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/AttributeCleanupPlugin.java
@@ -47,6 +47,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreParseAddOperation;
import org.opends.server.types.operation.PreParseModifyOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
index d8a77c7..4b25438 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
@@ -47,7 +47,7 @@
import org.opends.server.replication.protocol.OperationContext;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Control;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationAddOperation;
import org.opends.server.types.operation.PostOperationDeleteOperation;
import org.opends.server.types.operation.PostOperationModifyDNOperation;
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 b1b0665..3bbaaca 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
@@ -45,6 +45,7 @@
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreOperationAddOperation;
import static org.opends.messages.PluginMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java
index 3ab23bb..b8ab2cc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/LDAPADListPlugin.java
@@ -44,7 +44,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreParseSearchOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
index ec8a84f..4b2dead 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
@@ -45,6 +45,7 @@
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreOperationAddOperation;
import org.opends.server.types.operation.PreOperationModifyDNOperation;
import org.opends.server.types.operation.PreOperationModifyOperation;
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 2a84186..6aded2f 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
@@ -60,6 +60,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
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 8c413be..acda4a7 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
@@ -66,6 +66,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.SubordinateModifyDNOperation;
import org.opends.server.types.operation.PostOperationModifyDNOperation;
import org.opends.server.types.operation.PostOperationDeleteOperation;
@@ -702,7 +703,7 @@
SearchScope.WHOLE_SUBTREE, DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0,
false, SearchFilter.createORFilter(componentFilters), null);
- switch (operation.getResultCode())
+ switch (operation.getResultCode().asEnum())
{
case SUCCESS:
break;
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
index 64f8f9a..b33cf8c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -55,6 +55,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationExtendedOperation;
import org.opends.server.types.operation.PreOperationModifyOperation;
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 3dc7348..938b6bb 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
@@ -40,6 +40,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.operation.PreParseAddOperation;
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 4080248..c42a230 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
@@ -47,6 +47,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.*;
import static org.opends.messages.PluginMessages.*;
@@ -665,7 +666,7 @@
}
}
- switch (searchOperation.getResultCode())
+ switch (searchOperation.getResultCode().asEnum())
{
case SUCCESS:
case NO_SUCH_OBJECT:
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
index 2b39ee3..4e3c054 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
@@ -45,7 +45,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.TimeThread;
import org.forgerock.i18n.slf4j.LocalizedLogger;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
index b5a701f..e01f133 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -54,7 +54,7 @@
import org.opends.server.types.LDIFExportConfig;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.Operation;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.AddChangeRecordEntry;
import org.opends.server.util.ChangeRecordEntry;
import org.opends.server.util.DeleteChangeRecordEntry;
@@ -459,7 +459,7 @@
}
LocalizableMessage m = INFO_LDIF_CONNHANDLER_RESULT_CODE.get(
- operation.getResultCode().getIntValue(),
+ operation.getResultCode().intValue(),
operation.getResultCode());
writer.writeComment(m, 78);
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
index 5fd3560..0c1d2d0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
@@ -78,7 +78,7 @@
import org.opends.server.types.IntermediateResponse;
import org.opends.server.types.Operation;
import org.opends.server.types.OperationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchResultReference;
@@ -427,7 +427,7 @@
private ProtocolOp toResponseProtocolOp(Operation operation)
{
- final int resultCode = operation.getResultCode().getIntValue();
+ final int resultCode = operation.getResultCode().intValue();
if (operation instanceof AddOperation)
{
return new AddResponseProtocolOp(resultCode);
@@ -681,7 +681,7 @@
final Operation operation = previousValue.operation;
if (operation.getOperationType() == OperationType.ABANDON)
{
- if (keepStats && operation.getResultCode() == ResultCode.CANCELED)
+ if (keepStats && operation.getResultCode() == ResultCode.CANCELLED)
{
statTracker.updateAbandonedOperation();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
index 3f0e41f..3ea6396 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
@@ -80,6 +80,7 @@
import org.opends.server.loggers.HTTPAccessLogger;
import org.opends.server.monitors.ClientConnectionMonitorProvider;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.SelectableCertificateKeyManager;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
index e371d44..acbd758 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
@@ -181,7 +181,6 @@
private ProtocolOp toRequestProtocolOp(Operation operation)
{
- operation.getResultCode().getIntValue();
if (operation instanceof AbandonOperation)
{
final AbandonOperation op = (AbandonOperation) operation;
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 c6b568e..ef69470 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
@@ -40,6 +40,7 @@
import org.opends.server.core.*;
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.AddChangeRecordEntry;
import org.opends.server.util.DeleteChangeRecordEntry;
import org.opends.server.util.ModifyChangeRecordEntry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
index 013cdc8..166a123 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
@@ -449,7 +449,7 @@
op.run();
AddResponseProtocolOp addResponse =
- new AddResponseProtocolOp(op.getResultCode().getIntValue(),
+ new AddResponseProtocolOp(op.getResultCode().intValue(),
op.getErrorMessage().toMessage(),
op.getMatchedDN(),
op.getReferralURLs());
@@ -498,7 +498,7 @@
op.run();
BindResponseProtocolOp bindResponse =
- new BindResponseProtocolOp(op.getResultCode().getIntValue(),
+ new BindResponseProtocolOp(op.getResultCode().intValue(),
op.getErrorMessage().toMessage(),
op.getMatchedDN(),
op.getReferralURLs());
@@ -543,7 +543,7 @@
CompareResponseProtocolOp compareResponse =
new CompareResponseProtocolOp(
- op.getResultCode().getIntValue(),
+ op.getResultCode().intValue(),
op.getErrorMessage().toMessage(),
op.getMatchedDN(),
op.getReferralURLs());
@@ -581,7 +581,7 @@
DeleteResponseProtocolOp deleteResponse =
new DeleteResponseProtocolOp(
- op.getResultCode().getIntValue(),
+ op.getResultCode().intValue(),
op.getErrorMessage().toMessage(),
op.getMatchedDN(),
op.getReferralURLs());
@@ -630,7 +630,7 @@
ExtendedResponseProtocolOp extendedResponse =
new ExtendedResponseProtocolOp(
- op.getResultCode().getIntValue(),
+ op.getResultCode().intValue(),
op.getErrorMessage().toMessage(),
op.getMatchedDN(),
op.getReferralURLs(), op.getResponseOID(),
@@ -670,7 +670,7 @@
ModifyResponseProtocolOp modifyResponse =
new ModifyResponseProtocolOp(
- op.getResultCode().getIntValue(),
+ op.getResultCode().intValue(),
op.getErrorMessage().toMessage(),
op.getMatchedDN(),
op.getReferralURLs());
@@ -710,7 +710,7 @@
ModifyDNResponseProtocolOp modifyDNResponse =
new ModifyDNResponseProtocolOp(
- op.getResultCode().getIntValue(),
+ op.getResultCode().intValue(),
op.getErrorMessage().toMessage(),
op.getMatchedDN(),
op.getReferralURLs());
@@ -752,7 +752,7 @@
SearchResultDoneProtocolOp searchDone =
new SearchResultDoneProtocolOp(
- op.getResultCode().getIntValue(),
+ op.getResultCode().intValue(),
op.getErrorMessage().toMessage(),
op.getMatchedDN(),
op.getReferralURLs());
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
index 8dfdd24..da20065 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
@@ -48,6 +48,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 2e9a91d..170b9aa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -45,6 +45,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import static org.opends.messages.ProtocolMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
index bdf923e..7a5a6d5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
@@ -43,6 +43,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
/**
@@ -57,7 +58,7 @@
/**
- * The client authencation mode. <code>true</code> indicates that the
+ * The client authentication mode. <code>true</code> indicates that the
* client will be authenticated by its certificate (SSL protocol).
* <code>true</code> indicate , that we have to perform an lDAP
* authentication
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 62d151f..0bfca2c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -61,6 +61,7 @@
import org.opends.server.extensions.TLSByteChannel;
import org.opends.server.extensions.TLSCapableConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
@@ -807,25 +808,25 @@
{
case ADD:
protocolOp =
- new AddResponseProtocolOp(resultCode.getIntValue(),
+ new AddResponseProtocolOp(resultCode.intValue(),
errorMessage.toMessage(), matchedDN, referralURLs);
break;
case BIND:
ByteString serverSASLCredentials =
((BindOperationBasis) operation).getServerSASLCredentials();
protocolOp =
- new BindResponseProtocolOp(resultCode.getIntValue(),
+ new BindResponseProtocolOp(resultCode.intValue(),
errorMessage.toMessage(), matchedDN, referralURLs,
serverSASLCredentials);
break;
case COMPARE:
protocolOp =
- new CompareResponseProtocolOp(resultCode.getIntValue(),
+ new CompareResponseProtocolOp(resultCode.intValue(),
errorMessage.toMessage(), matchedDN, referralURLs);
break;
case DELETE:
protocolOp =
- new DeleteResponseProtocolOp(resultCode.getIntValue(),
+ new DeleteResponseProtocolOp(resultCode.intValue(),
errorMessage.toMessage(), matchedDN, referralURLs);
break;
case EXTENDED:
@@ -839,23 +840,23 @@
ExtendedOperationBasis extOp = (ExtendedOperationBasis) operation;
protocolOp =
- new ExtendedResponseProtocolOp(resultCode.getIntValue(),
+ new ExtendedResponseProtocolOp(resultCode.intValue(),
errorMessage.toMessage(), matchedDN, referralURLs, extOp
.getResponseOID(), extOp.getResponseValue());
break;
case MODIFY:
protocolOp =
- new ModifyResponseProtocolOp(resultCode.getIntValue(),
+ new ModifyResponseProtocolOp(resultCode.intValue(),
errorMessage.toMessage(), matchedDN, referralURLs);
break;
case MODIFY_DN:
protocolOp =
- new ModifyDNResponseProtocolOp(resultCode.getIntValue(),
+ new ModifyDNResponseProtocolOp(resultCode.intValue(),
errorMessage.toMessage(), matchedDN, referralURLs);
break;
case SEARCH:
protocolOp =
- new SearchResultDoneProtocolOp(resultCode.getIntValue(),
+ new SearchResultDoneProtocolOp(resultCode.intValue(),
errorMessage.toMessage(), matchedDN, referralURLs);
break;
default:
@@ -1103,8 +1104,7 @@
resultCode = LDAPResultCode.UNAVAILABLE;
break;
case SERVER_ERROR:
- resultCode =
- DirectoryServer.getServerErrorResultCode().getIntValue();
+ resultCode = DirectoryServer.getServerErrorResultCode().intValue();
break;
case ADMIN_LIMIT_EXCEEDED:
case IDLE_TIME_LIMIT_EXCEEDED:
@@ -1304,8 +1304,7 @@
if (operation.getOperationType() == OperationType.ABANDON)
{
- if (keepStats
- && (operation.getResultCode() == ResultCode.CANCELED))
+ if (keepStats && operation.getResultCode() == ResultCode.CANCELLED)
{
statTracker.updateAbandonedOperation();
}
@@ -1829,7 +1828,7 @@
logger.traceException(de);
AddResponseProtocolOp responseOp =
- new AddResponseProtocolOp(de.getResultCode().getIntValue(),
+ new AddResponseProtocolOp(de.getResultCode().intValue(),
de.getMessageObject(), de.getMatchedDN(), de
.getReferralURLs());
@@ -1951,7 +1950,7 @@
logger.traceException(de);
BindResponseProtocolOp responseOp =
- new BindResponseProtocolOp(de.getResultCode().getIntValue(),
+ new BindResponseProtocolOp(de.getResultCode().intValue(),
de.getMessageObject(), de.getMatchedDN(), de
.getReferralURLs());
@@ -2022,9 +2021,8 @@
logger.traceException(de);
CompareResponseProtocolOp responseOp =
- new CompareResponseProtocolOp(de.getResultCode()
- .getIntValue(), de.getMessageObject(), de.getMatchedDN(),
- de.getReferralURLs());
+ new CompareResponseProtocolOp(de.getResultCode().intValue(),
+ de.getMessageObject(), de.getMatchedDN(), de.getReferralURLs());
sendLDAPMessage(new LDAPMessage(message.getMessageID(),
responseOp, compareOp.getResponseControls()));
@@ -2083,7 +2081,7 @@
DeleteResponseProtocolOp responseOp =
new DeleteResponseProtocolOp(
- de.getResultCode().getIntValue(), de.getMessageObject(),
+ de.getResultCode().intValue(), de.getMessageObject(),
de.getMatchedDN(), de.getReferralURLs());
sendLDAPMessage(new LDAPMessage(message.getMessageID(),
@@ -2147,9 +2145,8 @@
logger.traceException(de);
ExtendedResponseProtocolOp responseOp =
- new ExtendedResponseProtocolOp(de.getResultCode()
- .getIntValue(), de.getMessageObject(), de.getMatchedDN(),
- de.getReferralURLs());
+ new ExtendedResponseProtocolOp(de.getResultCode().intValue(),
+ de.getMessageObject(), de.getMatchedDN(), de.getReferralURLs());
sendLDAPMessage(new LDAPMessage(message.getMessageID(),
responseOp, extendedOp.getResponseControls()));
@@ -2208,7 +2205,7 @@
ModifyResponseProtocolOp responseOp =
new ModifyResponseProtocolOp(
- de.getResultCode().getIntValue(), de.getMessageObject(),
+ de.getResultCode().intValue(), de.getMessageObject(),
de.getMatchedDN(), de.getReferralURLs());
sendLDAPMessage(new LDAPMessage(message.getMessageID(),
@@ -2269,9 +2266,8 @@
logger.traceException(de);
ModifyDNResponseProtocolOp responseOp =
- new ModifyDNResponseProtocolOp(de.getResultCode()
- .getIntValue(), de.getMessageObject(), de.getMatchedDN(),
- de.getReferralURLs());
+ new ModifyDNResponseProtocolOp(de.getResultCode().intValue(),
+ de.getMessageObject(), de.getMatchedDN(), de.getReferralURLs());
sendLDAPMessage(new LDAPMessage(message.getMessageID(),
responseOp, modifyDNOp.getResponseControls()));
@@ -2332,9 +2328,8 @@
logger.traceException(de);
SearchResultDoneProtocolOp responseOp =
- new SearchResultDoneProtocolOp(de.getResultCode()
- .getIntValue(), de.getMessageObject(), de.getMatchedDN(),
- de.getReferralURLs());
+ new SearchResultDoneProtocolOp(de.getResultCode().intValue(),
+ de.getMessageObject(), de.getMatchedDN(), de.getReferralURLs());
sendLDAPMessage(new LDAPMessage(message.getMessageID(),
responseOp, searchOp.getResponseControls()));
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 65c1423..293198b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -62,6 +62,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.monitors.ClientConnectionMonitorProvider;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.SelectableCertificateKeyManager;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
index 76216e1..763829a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
@@ -38,6 +38,7 @@
import org.opends.server.api.MatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java
index 1b6745c..353ff3e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java
@@ -36,6 +36,7 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.ServerConstants;
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 1e9001c..43e9c01 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
@@ -39,6 +39,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
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 03cbe96..fa32ce3 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
@@ -39,6 +39,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
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 b5d5d8c..cb5160b 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
@@ -40,6 +40,7 @@
import org.opends.server.replication.plugin.MultimasterReplication;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.ServerConstants;
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/common/MultiDomainServerState.java b/opendj3-server-dev/src/server/org/opends/server/replication/common/MultiDomainServerState.java
index e3e40e6..094a82d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/common/MultiDomainServerState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/common/MultiDomainServerState.java
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
index 864c3a7..6a367fc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ExternalChangelogDomain.java
@@ -35,7 +35,7 @@
import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class specifies the external changelog feature for a replication
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 1fced5b..0787ed0 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
@@ -40,6 +40,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.plugin.LDAPReplicationDomain.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.plugin.LDAPReplicationDomain.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
index 2f0e6c3..6287837 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
@@ -35,6 +35,7 @@
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.ByteSequence;
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 00ce914..67ee81d 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
@@ -68,6 +68,7 @@
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
import org.opends.server.tasks.TaskUtils;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.*;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.TimeThread;
@@ -79,7 +80,7 @@
import static org.opends.server.replication.plugin.EntryHistorical.*;
import static org.opends.server.replication.protocol.OperationContext.*;
import static org.opends.server.replication.service.ReplicationMonitor.*;
-import static org.opends.server.types.ResultCode.*;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -661,7 +662,7 @@
&& search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
{
logger.error(ERR_SEARCHING_GENERATION_ID,
- search.getResultCode().getResultCodeName() + " " + search.getErrorMessage(),
+ search.getResultCode().getName() + " " + search.getErrorMessage(),
getBaseDNString());
return false;
}
@@ -3358,7 +3359,7 @@
if (result != ResultCode.SUCCESS)
{
- logger.error(ERR_UPDATING_GENERATION_ID, result.getResultCodeName(), getBaseDNString());
+ logger.error(ERR_UPDATING_GENERATION_ID, result.getName(), getBaseDNString());
}
}
else
@@ -3411,7 +3412,7 @@
if (search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
{
logger.error(ERR_SEARCHING_GENERATION_ID,
- search.getResultCode().getResultCodeName() + " " + search.getErrorMessage(),
+ search.getResultCode().getName() + " " + search.getErrorMessage(),
getBaseDNString());
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index 9aaaa9c..2d69ab2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -43,6 +43,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.*;
import static org.opends.messages.ReplicationMessages.*;
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 02c9227..76d8120 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
@@ -44,6 +44,7 @@
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.ServerState;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
@@ -194,7 +195,7 @@
if (((search.getResultCode() != ResultCode.SUCCESS)) &&
((search.getResultCode() != ResultCode.NO_SUCH_OBJECT)))
{
- logger.error(ERR_ERROR_SEARCHING_RUV, search.getResultCode().getResultCodeName(), search,
+ logger.error(ERR_ERROR_SEARCHING_RUV, search.getResultCode().getName(), search,
search.getErrorMessage(), baseDn);
return null;
}
@@ -339,7 +340,7 @@
if (op.getResultCode() != ResultCode.SUCCESS)
{
logger.trace(DEBUG_ERROR_UPDATING_RUV,
- op.getResultCode().getResultCodeName(), op, op.getErrorMessage(), baseDn);
+ op.getResultCode().getName(), op, op.getErrorMessage(), baseDn);
}
return op.getResultCode();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java
index 7ab7555..481d9cc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationServerListener.java
@@ -37,7 +37,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
/**
@@ -50,7 +50,7 @@
implements ConfigurationAddListener<ReplicationServerCfg>,
ConfigurationDeleteListener<ReplicationServerCfg>
{
- ReplicationServer replicationServer = null;
+ private ReplicationServer replicationServer;
/**
* Build a ReplicationServer Listener from the given Multimaster
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java
index 2b00b17..2506869 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java
@@ -32,19 +32,19 @@
import java.util.Map;
import java.util.zip.DataFormatException;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.DecodeException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.AddOperationBasis;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.io.ASN1;
-import org.forgerock.opendj.ldap.DecodeException;
-import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.plugin.EntryHistorical;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.operation.PostOperationAddOperation;
import static org.opends.server.replication.protocol.OperationContext.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
index 1f9fcd9..6f1de95 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -34,6 +34,7 @@
import org.opends.server.replication.common.*;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.common.ServerStatus.*;
import static org.opends.server.replication.common.StatusMachine.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
index fb382cf..673973e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -40,6 +40,7 @@
import org.opends.server.replication.protocol.*;
import org.opends.server.replication.server.changelog.api.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.ReplicationMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java
index 6586327..553638c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -42,6 +42,7 @@
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
index da1ce74..a2f035a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -56,6 +56,7 @@
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.*;
import static java.util.Collections.*;
@@ -665,7 +666,7 @@
}
catch (CanceledOperationException e)
{
- searchOperation.setResultCode(ResultCode.CANCELED);
+ searchOperation.setResultCode(ResultCode.CANCELLED);
searchOperation.setErrorMessage(null);
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index f0b7778..c34f72e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -54,6 +54,7 @@
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.je.JEChangelogDB;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.TimeThread;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 4315b9f..af28824 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -47,6 +47,7 @@
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.protocol.ProtocolVersion.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
index ea4545c..6f0d924 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -40,6 +40,7 @@
import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.protocol.ProtocolVersion.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
index 5c0614a..8ddaf01 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -44,6 +44,7 @@
import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
index 827bf93..60a2b4a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -51,7 +51,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.common.AssuredMode.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
index c3614ce..c8604f7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
@@ -47,6 +47,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.config.ConfigConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
index 26f8572..41a6694 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
@@ -41,7 +41,7 @@
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
index d93f82b..8660dce 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
@@ -26,22 +26,20 @@
*/
package org.opends.server.schema;
-
-
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.opendj.ldap.ByteSequence;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DirectoryException;
+
import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
-
-
/**
* This class defines the binary attribute syntax, which is essentially a byte
* array using very strict matching. Equality, ordering, and substring matching
@@ -73,6 +71,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ByteString decode(AttributeValue value) throws DirectoryException {
// Make sure that the value is valid.
value.getNormalizedValue();
@@ -98,6 +97,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
@@ -130,6 +130,7 @@
*
* @return The common name for this attribute syntax.
*/
+ @Override
public String getSyntaxName()
{
return SYNTAX_BINARY_NAME;
@@ -142,6 +143,7 @@
*
* @return The OID for this attribute syntax.
*/
+ @Override
public String getOID()
{
return SYNTAX_BINARY_OID;
@@ -154,6 +156,7 @@
*
* @return A description for this attribute syntax.
*/
+ @Override
public String getDescription()
{
return SYNTAX_BINARY_DESCRIPTION;
@@ -169,6 +172,7 @@
* attributes with this syntax, or <CODE>null</CODE> if equality
* matches will not be allowed for this type by default.
*/
+ @Override
public EqualityMatchingRule getEqualityMatchingRule()
{
return defaultEqualityMatchingRule;
@@ -184,6 +188,7 @@
* attributes with this syntax, or <CODE>null</CODE> if ordering
* matches will not be allowed for this type by default.
*/
+ @Override
public OrderingMatchingRule getOrderingMatchingRule()
{
return defaultOrderingMatchingRule;
@@ -199,6 +204,7 @@
* attributes with this syntax, or <CODE>null</CODE> if substring
* matches will not be allowed for this type by default.
*/
+ @Override
public SubstringMatchingRule getSubstringMatchingRule()
{
return defaultSubstringMatchingRule;
@@ -214,6 +220,7 @@
* attributes with this syntax, or <CODE>null</CODE> if approximate
* matches will not be allowed for this type by default.
*/
+ @Override
public ApproximateMatchingRule getApproximateMatchingRule()
{
// There is no approximate matching rule by default.
@@ -234,6 +241,7 @@
* @return <CODE>true</CODE> if the provided value is acceptable for use with
* this syntax, or <CODE>false</CODE> if not.
*/
+ @Override
public boolean valueIsAcceptable(ByteSequence value,
LocalizableMessageBuilder invalidReason)
{
@@ -246,6 +254,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isBEREncodingRequired()
{
return false;
@@ -256,6 +265,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isHumanReadable()
{
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
index 0ba0816..4ea4258 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
index dc20dae..f5d69bb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
index 436a659..ce70509 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
@@ -39,6 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
index 1ee30e2..7cc4fb8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
index 41ad145..bd3ff86 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
index a7ebff5..2e28dd5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
index 489a253..16b2487 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
index 7226ef3..2e64d3b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
@@ -51,7 +51,7 @@
import org.opends.server.protocols.asn1.GSERParser;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
index ab722e9..8499e0c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
@@ -44,7 +44,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
index ad9d6ab..1767e97 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -44,6 +44,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
index f42900a..5645fe7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -42,7 +42,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
index e4aada1..aaea30b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
@@ -45,6 +45,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
index c82ad47..f7db899 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -45,6 +45,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
index 6aa4f4f..1f4aec3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
@@ -45,6 +45,7 @@
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
index bbf96ba..75a4d8e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
@@ -37,7 +37,7 @@
import org.opends.server.types.AcceptRejectWarn;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
index e3dda27..3427774 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -46,6 +46,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
index 3351a73..27a4784 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
index 482e18e..8385659 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
@@ -35,7 +35,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
index dfa7be5..ab0c24f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
@@ -39,7 +39,7 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
index 3c27abe..6283a43 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
@@ -39,6 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
index a9a5929..d9018db 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
@@ -43,7 +43,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 858aa0f..269a9eb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -42,6 +42,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index 19c9e4c..8ae74a3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -43,6 +43,7 @@
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
index 2ba7010..fae93fa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -46,6 +46,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
index 45d9292..296132a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
@@ -45,6 +45,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
index 2e41352..f9d60bd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
index 047034e..3946649 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
@@ -39,7 +39,7 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
index 7139752..52870c2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
index 899c5aa..68f7af6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -47,6 +47,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.config.ConfigConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
index 8bd00c0..17ea188 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
@@ -37,6 +37,7 @@
import org.opends.server.api.MatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
index f318fee..f634818 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
@@ -36,7 +36,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
index 5db3161..b9c8ce2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -44,7 +44,7 @@
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
index dd10e8d..56cbc02 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
@@ -42,6 +42,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
index f643e3d..6183586 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -45,6 +45,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index f4f9c67..f48db90 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
index 71b9a18..44d2c13 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
@@ -39,7 +39,7 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
index 34bc131..7c3de91 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
@@ -39,7 +39,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
index e1b0167..c341743 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
@@ -41,6 +41,7 @@
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
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 88b6d1b..189ec36 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
@@ -43,6 +43,7 @@
import org.opends.server.core.SchemaConfigManager;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.TaskMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java
index 7c10c27..b1c2bf8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java
@@ -55,7 +55,7 @@
import org.opends.server.types.Entry;
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.std.server.BackendCfg;
import java.util.ArrayList;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java
index 4f64960..16c4b41 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java
@@ -45,7 +45,7 @@
import org.opends.server.types.Entry;
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.TaskMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/EnterLockdownModeTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/EnterLockdownModeTask.java
index 1e3052c..73dea2a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/EnterLockdownModeTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/EnterLockdownModeTask.java
@@ -35,6 +35,7 @@
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.TaskMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java
index ffacb8a..bb8aed9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java
@@ -51,7 +51,7 @@
import org.opends.server.types.LDIFExportConfig;
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import java.util.ArrayList;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
index c7fa435..1e75005 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
@@ -54,7 +54,7 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import java.io.File;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java
index 286f40e..1b756af 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java
@@ -36,6 +36,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.core.DirectoryServer.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java
index e38d9d8..3484017 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTask.java
@@ -38,6 +38,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class provides an implementation of a Directory Server task that can
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/LeaveLockdownModeTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/LeaveLockdownModeTask.java
index 980b3be..f6ccd8d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/LeaveLockdownModeTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/LeaveLockdownModeTask.java
@@ -35,6 +35,7 @@
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.TaskMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java
index 7e458b0..e2554fb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/PurgeConflictsHistoricalTask.java
@@ -37,6 +37,7 @@
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.TimeThread;
import static org.opends.server.config.ConfigConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java
index 20f580c..eeec27d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java
@@ -43,7 +43,7 @@
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.api.ClientConnection;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java
index bf6d3b5..cb2e9c2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java
@@ -54,7 +54,7 @@
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
import org.opends.server.types.RestoreConfig;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import java.util.List;
import java.util.Map;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java
index 689ae1d..c01336b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/SetGenerationIdTask.java
@@ -39,6 +39,7 @@
import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.replication.service.ReplicationDomain;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class provides an implementation of a Directory Server task that can
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 accc141..33206fe 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
@@ -45,7 +45,7 @@
import org.opends.server.types.Entry;
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java b/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
index d2cd47a..b788f84 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
@@ -49,6 +49,7 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
index 005d039..44cc507 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
@@ -74,7 +74,7 @@
import org.opends.server.types.LDIFImportResult;
import org.opends.server.types.NullOutputStream;
import org.opends.server.types.RawAttribute;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.args.LDAPConnectionArgumentParser;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
index 4f3c73b..a35a30d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
@@ -464,9 +464,8 @@
le.getCause());
} catch (DirectoryException de)
{
- throw new LDAPConnectionException(de.getMessageObject(), de
- .getResultCode().getIntValue(), null, de.getMatchedDN(), de
- .getCause());
+ throw new LDAPConnectionException(de.getMessageObject(),
+ de.getResultCode().intValue(), null, de.getMatchedDN(), de.getCause());
} catch(Exception ex)
{
logger.traceException(ex);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
index bbe59f1..800513f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
@@ -59,6 +59,7 @@
import org.opends.server.protocols.ldap.ModifyDNResponseProtocolOp;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.AddChangeRecordEntry;
import org.opends.server.util.ChangeRecordEntry;
@@ -383,11 +384,10 @@
}
else
{
- // This shouldnt happen but if it does debug
- // log it, set the error code to OTHER and
- // fall thru.
+ // This should not happen but if it does, then debug log it,
+ // set the error code to OTHER and fall through.
logger.traceException(ce);
- resultCode = ResultCode.OTHER.getIntValue();
+ resultCode = ResultCode.OTHER.intValue();
errorMessage = null;
matchedDN = null;
referralURLs = null;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java
index c795684..d86dfb3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java
@@ -40,7 +40,7 @@
import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.OpenDsException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java
index 64ff4a1..809219c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java
@@ -29,7 +29,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.types.ResultCode.*;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -430,7 +430,7 @@
LDAPMessage responseMessage = reader.readMessage();
if (responseMessage == null) {
LocalizableMessage message = ERR_TASK_CLIENT_UNEXPECTED_CONNECTION_CLOSURE.get();
- throw new LDAPException(UNAVAILABLE.getIntValue(), message);
+ throw new LDAPException(UNAVAILABLE.intValue(), message);
} else {
opType = responseMessage.getProtocolOpType();
if (opType == LDAPConstants.OP_TYPE_SEARCH_RESULT_ENTRY) {
@@ -495,7 +495,7 @@
if (responseMessage == null) {
LocalizableMessage message = ERR_TASK_CLIENT_UNEXPECTED_CONNECTION_CLOSURE.get();
- throw new LDAPException(UNAVAILABLE.getIntValue(), message);
+ throw new LDAPException(UNAVAILABLE.intValue(), message);
}
if (responseMessage.getProtocolOpType() !=
@@ -530,7 +530,7 @@
if (responseMessage == null) {
LocalizableMessage message = ERR_TASK_CLIENT_UNEXPECTED_CONNECTION_CLOSURE.get();
- throw new LDAPException(UNAVAILABLE.getIntValue(), message);
+ throw new LDAPException(UNAVAILABLE.intValue(), message);
}
if (responseMessage.getProtocolOpType() !=
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 f0ed7c6..61a1544 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
@@ -30,14 +30,15 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.util.Reject;
import org.opends.server.api.ClientConnection;
import org.opends.server.controls.ControlDecoder;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.operation.PostResponseOperation;
import org.opends.server.types.operation.PreParseOperation;
-import org.forgerock.util.Reject;
/**
* This class defines a generic operation that may be processed by the
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java b/opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java
index 89772cc..fa2b801 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java
@@ -26,17 +26,13 @@
*/
package org.opends.server.types;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
-
-
-
+import org.forgerock.opendj.ldap.ResultCode;
+import org.opends.server.api.EqualityMatchingRule;
import static org.opends.messages.CoreMessages.*;
-import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.EqualityMatchingRule;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-
/**
* This class contains various methods for manipulating
@@ -167,6 +163,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ByteString getNormalizedValue() throws DirectoryException
{
if (normalizedValue == null)
@@ -191,6 +188,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ByteString getValue()
{
return value;
@@ -201,6 +199,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object o)
{
if (this == o)
@@ -231,6 +230,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode()
{
EqualityMatchingRule equalityMatchingRule = attributeType
@@ -263,6 +263,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
if (value == null)
@@ -280,6 +281,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append(value.toString());
@@ -322,6 +324,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ByteString getNormalizedValue()
{
return normalizedValue;
@@ -332,6 +335,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ByteString getValue()
{
return value;
@@ -342,6 +346,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object o)
{
if (this == o)
@@ -372,6 +377,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode()
{
return normalizedValue.hashCode();
@@ -382,6 +388,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
if (value == null)
@@ -399,6 +406,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append(value.toString());
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/CancelResult.java b/opendj3-server-dev/src/server/org/opends/server/types/CancelResult.java
index 087622d..991886c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/CancelResult.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/CancelResult.java
@@ -27,6 +27,7 @@
package org.opends.server.types;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
/**
@@ -95,6 +96,7 @@
*
* @return A string representation of this cancel result.
*/
+ @Override
public final String toString()
{
return String.valueOf(resultCode);
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/CommonSchemaElements.java b/opendj3-server-dev/src/server/org/opends/server/types/CommonSchemaElements.java
index b55be44..daa8c59 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/CommonSchemaElements.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/CommonSchemaElements.java
@@ -26,12 +26,6 @@
*/
package org.opends.server.types;
-import org.forgerock.i18n.LocalizableMessage;
-import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.toLowerCase;
-import static org.forgerock.util.Reject.*;
-
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -40,7 +34,13 @@
import java.util.List;
import java.util.Map;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
+import static org.forgerock.util.Reject.*;
+import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
/**
* An abstract base class for LDAP schema definitions which contain an
@@ -525,8 +525,8 @@
* @return <code>true</code> if the provided object is equal to
* this schema definition, or <code>false</code> if not.
*/
+ @Override
public final boolean equals(Object o) {
-
if (this == o) {
return true;
}
@@ -547,8 +547,8 @@
*
* @return The hash code for this schema definition.
*/
+ @Override
public final int hashCode() {
-
return hashCode;
}
@@ -561,8 +561,8 @@
* @return The string representation of this schema definition in
* the form specified in RFC 2252.
*/
+ @Override
public final String toString() {
-
StringBuilder buffer = new StringBuilder();
toString(buffer, true);
return buffer.toString();
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/ConfigChangeResult.java b/opendj3-server-dev/src/server/org/opends/server/types/ConfigChangeResult.java
index 9fad715..80de10b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/ConfigChangeResult.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/ConfigChangeResult.java
@@ -26,18 +26,12 @@
*/
package org.opends.server.types;
-import org.forgerock.i18n.LocalizableMessage;
-
-
-
-
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
-
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class defines a data structure that can be used to hold
@@ -199,6 +193,7 @@
*
* @return A string representation of this config change result.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/DN.java b/opendj3-server-dev/src/server/org/opends/server/types/DN.java
index ad63055..fdb76f9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/DN.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/DN.java
@@ -35,6 +35,7 @@
import org.forgerock.opendj.ldap.ByteSequenceReader;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java b/opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java
index 005e7f9..975a2f7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java
@@ -27,13 +27,11 @@
package org.opends.server.types;
import java.util.List;
-import org.forgerock.i18n.LocalizableMessage;
-
-
-
import java.util.Map;
import java.util.Set;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -51,10 +49,9 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-
/**
* This interface defines a set of methods that may be used by
- * third-party code to obtatin information about the core Directory
+ * third-party code to obtain information about the core Directory
* Server configuration and the instances of various kinds of
* components that have registered themselves with the server.
* <BR><BR>
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/DirectoryException.java b/opendj3-server-dev/src/server/org/opends/server/types/DirectoryException.java
index 2d5d64e..a87910e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/DirectoryException.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/DirectoryException.java
@@ -29,6 +29,7 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
/**
* This class defines an exception that may be thrown if a problem
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 2b946e7..58cb8f4 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
@@ -38,6 +38,7 @@
import org.forgerock.opendj.ldap.ByteSequenceReader;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.server.api.AttributeValueDecoder;
@@ -51,10 +52,10 @@
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFWriter;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.UtilityMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.types.ResultCode.*;
import static org.opends.server.util.LDIFWriter.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java b/opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java
index e13a295..d1c11e9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java
@@ -26,22 +26,18 @@
*/
package org.opends.server.types;
-import org.forgerock.i18n.LocalizableMessage;
-
-
-
import java.io.File;
import java.io.FileNotFoundException;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.UtilityMessages.*;
-
-
/**
* This class provides a mechanism for setting file permissions in a
* more abstract manner than is provided by the underlying operating
@@ -1147,6 +1143,7 @@
*
* @return A string representation of this file permission.
*/
+ @Override
public String toString()
{
StringBuilder buffer = new StringBuilder();
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java b/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java
index f338cae..3e71a63 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java
@@ -33,11 +33,12 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.core.DirectoryServer;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.opends.messages.UtilityMessages.*;
-import static org.opends.server.types.ResultCode.*;
import static org.opends.server.util.StaticUtils.*;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Operation.java b/opendj3-server-dev/src/server/org/opends/server/types/Operation.java
index 7b8253f..d099d86 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Operation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/Operation.java
@@ -31,6 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.api.ClientConnection;
import org.opends.server.controls.ControlDecoder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/RDN.java b/opendj3-server-dev/src/server/org/opends/server/types/RDN.java
index 744461e..a83605e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/RDN.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/RDN.java
@@ -26,15 +26,15 @@
*/
package org.opends.server.types;
-import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.opendj.ldap.ByteStringBuilder;
-
import java.util.*;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Schema.java b/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
index d9c472e..4f7b31c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
@@ -43,6 +43,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ModificationType;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.EqualityMatchingRule;
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 5df3949..b355c5d 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
@@ -41,6 +41,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.ConditionResult;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.api.MatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
@@ -2725,8 +2726,6 @@
return ConditionResult.UNDEFINED;
}
- ConditionResult result = ConditionResult.FALSE;
-
// Iterate through all the attributes and see if we can find a match.
AttributeValue dummyAttributeValue = AttributeValues.create(value,
normalizedValue);
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 d9b11d4..7597fe8 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
@@ -27,15 +27,17 @@
package org.opends.server.types;
-import org.forgerock.i18n.LocalizableMessage;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Set;
import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.core.DirectoryServer;
-import static org.opends.server.util.ServerConstants.*;
import static org.opends.messages.SchemaMessages.*;
+import static org.opends.server.util.ServerConstants.*;
/**
* This class represents RFC 3672 subentries and RFC 3671
@@ -43,7 +45,7 @@
*/
public class SubEntry {
/**
- * Defines the set of permissable values for the conflict behavior.
+ * Defines the set of permissible values for the conflict behavior.
* Specifies the behavior that the server is to exhibit for entries
* that already contain one or more real values for the associated
* collective attribute.
@@ -229,8 +231,8 @@
}
}
- // Check that the subtree spec is flaged as valid. If it is not
- // that means all parsers have failed and it is ivalid syntax.
+ // Check that the subtree spec is flagged as valid. If it is not
+ // that means all parsers have failed and it is invalid syntax.
if (!isValidSpec)
{
LocalizableMessage message =
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 714207b..1129d3d 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
@@ -26,16 +26,15 @@
*/
package org.opends.server.types;
-import static org.opends.messages.SchemaMessages.*;
-
import java.util.*;
import java.util.regex.Pattern;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.core.DirectoryServer;
import org.opends.server.util.StaticUtils;
-
+import static org.opends.messages.SchemaMessages.*;
/**
* An RFC 3672 subtree specification.
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SynchronizationProviderResult.java b/opendj3-server-dev/src/server/org/opends/server/types/SynchronizationProviderResult.java
index 7e2f880..170eaf8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SynchronizationProviderResult.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SynchronizationProviderResult.java
@@ -26,10 +26,11 @@
*/
package org.opends.server.types;
-import org.forgerock.i18n.LocalizableMessage;
-
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
+
/**
* This class defines a data structure that holds information about
@@ -97,6 +98,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ResultCode getResultCode()
{
return null;
@@ -105,6 +107,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public DN getMatchedDN()
{
return null;
@@ -113,6 +116,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getReferralURLs()
{
return null;
@@ -121,6 +125,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean continueProcessing()
{
return true;
@@ -129,6 +134,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public LocalizableMessage getErrorMessage()
{
return null;
@@ -153,14 +159,16 @@
private final LocalizableMessage errorMessage;
/**
- * Contrust a new stop processing synchronization provider
- * result.
+ * Construct a new stop processing synchronization provider result.
*
- * @param resultCode The result code for this result.
- * @param errorMessage An message explaining why processing
- * should stop.
- * @param matchedDN The matched DN for this result.
- * @param referralURLs The set of referral URLs for this result.
+ * @param resultCode
+ * The result code for this result.
+ * @param errorMessage
+ * An message explaining why processing should stop.
+ * @param matchedDN
+ * The matched DN for this result.
+ * @param referralURLs
+ * The set of referral URLs for this result.
*/
public StopProcessing(ResultCode resultCode, LocalizableMessage errorMessage,
DN matchedDN, List<String> referralURLs)
@@ -172,12 +180,12 @@
}
/**
- * Contrust a new stop processing synchronization provider
- * result.
+ * Construct a new stop processing synchronization provider result.
*
- * @param resultCode The result code for this result.
- * @param errorMessage An message explaining why processing
- * should stop.
+ * @param resultCode
+ * The result code for this result.
+ * @param errorMessage
+ * An message explaining why processing should stop.
*/
public StopProcessing(ResultCode resultCode, LocalizableMessage errorMessage)
{
@@ -190,6 +198,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ResultCode getResultCode()
{
return resultCode;
@@ -198,6 +207,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public DN getMatchedDN()
{
return matchedDN;
@@ -206,6 +216,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getReferralURLs()
{
return referralURLs;
@@ -214,6 +225,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean continueProcessing()
{
return false;
@@ -222,6 +234,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public LocalizableMessage getErrorMessage()
{
return errorMessage;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/InProgressOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/InProgressOperation.java
index bb03012..639d8ca 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/InProgressOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/InProgressOperation.java
@@ -32,6 +32,7 @@
import java.util.List;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationOperation.java
index 5fa3219..e9a0fae 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationOperation.java
@@ -32,6 +32,7 @@
import java.util.List;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseOperation.java
index 14d98fc..7d5a1d0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseOperation.java
@@ -32,7 +32,7 @@
import org.opends.server.types.AdditionalLogItem;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationOperation.java
index fdfb2b4..62e1b4d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationOperation.java
@@ -32,7 +32,7 @@
import org.opends.server.types.AdditionalLogItem;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java b/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
index fc0ba7d..ddfd661 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
@@ -54,6 +54,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java
index c3f5789..23b0070 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java
@@ -46,7 +46,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;
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 68e3f8d..8f5e43d 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
@@ -46,6 +46,7 @@
import org.opends.server.replication.server.ECLServerHandler;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationSearchOperation;
import org.opends.server.types.operation.PreOperationSearchOperation;
import org.opends.server.types.operation.SearchEntrySearchOperation;
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 37b4bc3..60a29d7 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
@@ -47,6 +47,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostOperationAddOperation;
import org.opends.server.types.operation.PostResponseAddOperation;
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 c1a6327..993c18b 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
@@ -42,6 +42,7 @@
import org.opends.server.core.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostOperationBindOperation;
import org.opends.server.types.operation.PostResponseBindOperation;
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 9595083..8a28be6 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
@@ -40,6 +40,7 @@
import org.opends.server.core.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationCompareOperation;
import org.opends.server.types.operation.PostResponseCompareOperation;
import org.opends.server.types.operation.PreOperationCompareOperation;
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 5290dcb..a09253b 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
@@ -46,6 +46,7 @@
import org.opends.server.core.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationDeleteOperation;
import org.opends.server.types.operation.PostResponseDeleteOperation;
import org.opends.server.types.operation.PostSynchronizationDeleteOperation;
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 16cab99..e627362 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
@@ -42,6 +42,7 @@
import org.opends.server.controls.*;
import org.opends.server.core.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationModifyDNOperation;
import org.opends.server.types.operation.PostResponseModifyDNOperation;
import org.opends.server.types.operation.PostSynchronizationModifyDNOperation;
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 05393f0..ff62a4e 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
@@ -45,6 +45,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationModifyOperation;
import org.opends.server.types.operation.PostResponseModifyOperation;
import org.opends.server.types.operation.PostSynchronizationModifyOperation;
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 db51060..822a04e 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
@@ -35,6 +35,7 @@
import org.opends.server.controls.*;
import org.opends.server.core.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PostOperationSearchOperation;
import org.opends.server.types.operation.PreOperationSearchOperation;
import org.opends.server.types.operation.SearchEntrySearchOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
index 5b791b7..e5b8dc0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -48,6 +48,7 @@
import org.opends.server.core.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.workflowelement.LeafWorkflowElement;
import static org.opends.messages.CoreMessages.*;
diff --git a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
index f8d49db..a4d065e 100644
--- a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
+++ b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.forgerock.util.Reject;
diff --git a/opendj3-server-dev/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java b/opendj3-server-dev/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java
index 6455877..8120136 100644
--- a/opendj3-server-dev/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java
+++ b/opendj3-server-dev/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java
@@ -22,8 +22,8 @@
*
*
* Portions Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
-
package com.ibm.staf.service.opends.tester;
/**
@@ -601,7 +601,7 @@
{
String message;
- switch (resultCode)
+ switch (resultCode.asEnum())
{
case SUCCESS:
message = "SUCCESS";
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 77577c4..238aefb 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
@@ -62,6 +62,7 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.dsconfig.DSConfig;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.FilePermission;
import org.opends.server.util.BuildVersion;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
index 28e089f..f108c5c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
@@ -48,7 +48,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
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 8170745..eadd13d 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
@@ -47,7 +47,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -475,7 +475,7 @@
};
int result = TestCaseUtils.applyModifications(true, changes);
- Assert.assertEquals(result, ResultCode.SUCCESS.getIntValue());
+ Assert.assertEquals(result, ResultCode.SUCCESS.intValue());
} finally {
TestCfg.removeConstraint(constraint);
try {
@@ -522,8 +522,7 @@
};
int result = TestCaseUtils.applyModifications(true, changes);
- Assert
- .assertEquals(result, ResultCode.UNWILLING_TO_PERFORM.getIntValue());
+ Assert.assertEquals(result, ResultCode.UNWILLING_TO_PERFORM.intValue());
} finally {
TestCfg.removeConstraint(constraint);
try {
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
index ca4bd24..d956ac1 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
@@ -45,7 +45,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
index 8289b62..2e3adc9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
@@ -46,7 +46,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java
index 6e1c130..5385944 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java
@@ -38,6 +38,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.testng.annotations.BeforeClass;
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 35c155c..d6c3e3c 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
@@ -53,7 +53,7 @@
import org.opends.server.types.Entry;
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.types.RawModification;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
index 53e5835..ff61c17 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
@@ -48,6 +48,7 @@
import org.opends.server.tools.LDAPPasswordModify;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.Assert;
import org.testng.Reporter;
import org.testng.annotations.AfterClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
index 076b7bc..f9645b3 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
@@ -48,7 +48,7 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -189,7 +189,7 @@
"-f", subtreeDeletePath
};
resultCode = LDAPModify.mainModify(args, false, System.out, System.err);
- assertEquals(resultCode, ResultCode.NOT_ALLOWED_ON_NONLEAF.getIntValue());
+ assertEquals(resultCode, ResultCode.NOT_ALLOWED_ON_NONLEAF.intValue());
// Verify that the subtree delete will succeed if we include the subtree
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 ae40b1e..ae8c7f1 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
@@ -37,6 +37,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 3049655..86c0000 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
@@ -40,7 +40,7 @@
import org.opends.server.tools.makeldif.TemplateFile;
import org.opends.server.types.DN;
import org.opends.server.types.LDIFImportConfig;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.forgerock.i18n.LocalizableMessage;
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 bc078a4..2609b80 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
@@ -44,6 +44,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.Base64;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
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 3c6c8fb..548291d 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
@@ -44,6 +44,7 @@
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
index 00b08bf..1422e9f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
@@ -43,7 +43,7 @@
import org.opends.server.tasks.TasksTestCase;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
index 8106697..69d8c40 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
@@ -45,6 +45,7 @@
import org.opends.server.protocols.ldap.LDAPReader;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.DataProvider;
import org.testng.annotations.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 4cf5728..72e8261 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
@@ -46,7 +46,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.types.SortKey;
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 e9649ee..f3283fb 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
@@ -42,6 +42,7 @@
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 b7e19dc..a0934b0 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
@@ -42,6 +42,7 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 c011f84..a056434 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
@@ -47,6 +47,7 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.AfterMethod;
@@ -1957,7 +1958,7 @@
LocalizableMessage.raw("testCancelBeforeStartup"));
addOperation.abort(cancelRequest);
addOperation.run();
- assertEquals(addOperation.getResultCode(), ResultCode.CANCELED);
+ assertEquals(addOperation.getResultCode(), ResultCode.CANCELLED);
}
/**
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 297a5d1..1a3836b 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
@@ -43,7 +43,7 @@
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
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 3c2e44e..d4b0e7c 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
@@ -42,6 +42,7 @@
import org.opends.server.tools.*;
import org.opends.server.tools.LDAPReader;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
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 7009795..3115b91 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
@@ -43,6 +43,7 @@
import org.opends.server.protocols.ldap.*;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.ServerConstants;
import org.testng.annotations.BeforeClass;
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 340003f..78db2db 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
@@ -47,6 +47,7 @@
import org.opends.server.tools.LDAPDelete;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.StaticUtils;
import org.opends.server.workflowelement.localbackend.LocalBackendDeleteOperation;
@@ -710,7 +711,7 @@
LocalizableMessage.raw("testCancelBeforeStartup"));
deleteOperation.abort(cancelRequest);
deleteOperation.run();
- assertEquals(deleteOperation.getResultCode(), ResultCode.CANCELED);
+ assertEquals(deleteOperation.getResultCode(), ResultCode.CANCELLED);
}
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
index da98afa..c444396 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
@@ -58,7 +58,7 @@
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.types.RDN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
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 dae215d..358616d 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
@@ -47,6 +47,7 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.Base64;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
@@ -2815,7 +2816,7 @@
LocalizableMessage.raw("testCancelBeforeStartup"));
modifyOperation.abort(cancelRequest);
modifyOperation.run();
- assertEquals(modifyOperation.getResultCode(), ResultCode.CANCELED);
+ assertEquals(modifyOperation.getResultCode(), ResultCode.CANCELLED);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
index 62e3933..2ad78b6 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
@@ -39,6 +39,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.UnbindRequestProtocolOp;
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 a8a3a7a..67b876c 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
@@ -44,6 +44,7 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.BeforeClass;
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 d7971d4..98225f8 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
@@ -43,6 +43,7 @@
import org.opends.server.tools.LDAPDelete;
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
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 29031d9..e57f2f0 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
@@ -43,7 +43,7 @@
import org.opends.server.types.AttributeValues;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.AfterClass;
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 e296964..e9f317a 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
@@ -43,6 +43,7 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
@@ -1345,7 +1346,7 @@
LocalizableMessage.raw("testCancelBeforeStartup"));
modifyDNOperation.abort(cancelRequest);
modifyDNOperation.run();
- assertEquals(modifyDNOperation.getResultCode(), ResultCode.CANCELED);
+ assertEquals(modifyDNOperation.getResultCode(), ResultCode.CANCELLED);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
index a2bda1f..31abb15 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
@@ -34,7 +34,7 @@
import org.opends.server.types.CancelRequest;
import org.opends.server.types.Control;
import org.opends.server.types.Operation;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.Test;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
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 feda496..9a00c06 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
@@ -42,6 +42,7 @@
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.UtilTestCase;
import org.opends.server.workflowelement.localbackend.LocalBackendWorkflowElement;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java
index 13260bd..7af034b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java
@@ -40,7 +40,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.UtilTestCase;
import org.opends.server.workflowelement.WorkflowElement;
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 4390832..75284c0 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
@@ -39,6 +39,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.opends.server.workflowelement.WorkflowElement;
import org.testng.annotations.BeforeClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
index cead220..900771e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
@@ -39,6 +39,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
index 8a8be615..c4da3aa 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
@@ -39,7 +39,7 @@
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.testng.Assert.*;
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 d882ad3..d766663 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
@@ -47,6 +47,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.testng.Assert.*;
@@ -75,7 +76,7 @@
/**
- * Retrieves a set of invvalid configuration entries.
+ * Retrieves a set of invalid configuration entries.
*
* @throws Exception If an unexpected problem occurs.
*/
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 d3271fd..2a36ae2 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
@@ -71,14 +71,14 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.types.RawAttribute;
import org.opends.server.types.RawModification;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
- * A set of test cases for the cancel extended oepration handler.
+ * A set of test cases for the cancel extended operation handler.
*/
public class CancelExtendedOperationTestCase
extends ExtensionsTestCase
@@ -401,7 +401,7 @@
assertEquals(bindResponse.getResultCode(), LDAPResultCode.SUCCESS);
- // Create a "Who Am I?" extended oepration and send it to the server. Make
+ // Create a "Who Am I?" extended operation and send it to the server. Make
// sure to include the delay request control so it won't complete before we
// can send the cancel request.
ExtendedRequestProtocolOp whoAmIRequest =
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
index 7ef4f55..3e1c234 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
@@ -38,7 +38,6 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.CryptPasswordStorageSchemeCfgDefn;
import org.opends.server.admin.std.server.CryptPasswordStorageSchemeCfg;
-import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.PasswordPolicy;
@@ -52,7 +51,7 @@
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -64,13 +63,6 @@
public class CryptPasswordStorageSchemeTestCase
extends ExtensionsTestCase
{
- // The configuration entry for this password storage scheme.
- private ConfigEntry configEntry;
-
- // The string representation of the DN of the configuration entry for this
- // password storage scheme.
- private static final String configDNString =
- "cn=Crypt,cn=Password Storage Schemes,cn=config";
// Names of all the crypt algorithms we want to test.
private static final String[] names = { "unix", "md5", "sha256", "sha512" };
@@ -82,7 +74,6 @@
public CryptPasswordStorageSchemeTestCase()
{
super();
- this.configEntry = null;
}
@@ -91,12 +82,9 @@
* tests.
*/
@BeforeClass()
- public void startServer()
- throws Exception
+ public void startServer() throws Exception
{
TestCaseUtils.startServer();
-
- configEntry = DirectoryServer.getConfigEntry(DN.valueOf(configDNString));
}
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 991135f..2808009 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
@@ -49,6 +49,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.testng.Assert.*;
@@ -73,18 +74,15 @@
{
TestCaseUtils.startServer();
-
TestCaseUtils.dsconfig(
"set-sasl-mechanism-handler-prop",
"--handler-name", "DIGEST-MD5",
"--set", "server-fqdn:" + "127.0.0.1");
-
}
@AfterClass
public void tearDown() throws Exception {
-
TestCaseUtils.dsconfig(
"set-sasl-mechanism-handler-prop",
"--handler-name", "DIGEST-MD5",
@@ -93,7 +91,7 @@
/**
- * Retrieves a set of invvalid configuration entries.
+ * Retrieves a set of invalid configuration entries.
*
* @throws Exception If an unexpected problem occurs.
*/
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
index d85c340..638c63b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
@@ -38,7 +38,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
index 093b73d..29bb922 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
@@ -70,7 +70,7 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.types.RawAttribute;
import org.opends.server.types.RawModification;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.types.VirtualAttributeRule;
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 b0e10e8..9205859 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
@@ -42,6 +42,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
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 e46c680..09f3f96 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
@@ -44,6 +44,7 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.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 7a647b0..fb09f92 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
@@ -53,6 +53,7 @@
import org.opends.server.tools.LDAPSearch;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.Base64;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
index 7080ba1..18586a1 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
@@ -52,7 +52,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
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 54e7658..b3eef60 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
@@ -46,7 +46,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.VirtualAttributeRule;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
index 20eefd1..c6012de 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
@@ -37,6 +37,7 @@
import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.server.ConfigurationChangeListener;
@@ -177,8 +178,7 @@
{
if (resultCode != ResultCode.SUCCESS)
{
- return new DirectoryException(resultCode,
- resultCode.getResultCodeName());
+ return new DirectoryException(resultCode, resultCode.getName());
}
return null;
}
@@ -1461,7 +1461,7 @@
Object getResult()
{
return resultCode == ResultCode.SUCCESS ? username
- : new DirectoryException(resultCode, resultCode.getResultCodeName());
+ : new DirectoryException(resultCode, resultCode.getName());
}
@@ -1544,7 +1544,7 @@
if (resultCode != ResultCode.SUCCESS)
{
return new DirectoryException(resultCode,
- resultCode.getResultCodeName());
+ resultCode.getName());
}
return null;
}
@@ -1816,7 +1816,7 @@
return new Object[][] {
{ ResultCode.NO_SUCH_OBJECT },
{ ResultCode.CLIENT_SIDE_NO_RESULTS_RETURNED },
- { ResultCode.CLIENT_SIDE_MORE_RESULTS_TO_RETURN },
+ { ResultCode.CLIENT_SIDE_UNEXPECTED_RESULTS_RETURNED },
{ ResultCode.UNAVAILABLE }
};
// @formatter:on
@@ -3001,7 +3001,7 @@
catch (final DirectoryException e)
{
assertEquals(e.getResultCode(),
- ResultCode.CLIENT_SIDE_MORE_RESULTS_TO_RETURN, e.getMessage());
+ ResultCode.CLIENT_SIDE_UNEXPECTED_RESULTS_RETURNED, e.getMessage());
}
finally
{
@@ -3136,7 +3136,7 @@
catch (final DirectoryException e)
{
assertEquals(e.getResultCode(),
- ResultCode.CLIENT_SIDE_MORE_RESULTS_TO_RETURN, e.getMessage());
+ ResultCode.CLIENT_SIDE_UNEXPECTED_RESULTS_RETURNED, e.getMessage());
}
finally
{
@@ -3356,7 +3356,7 @@
assertEquals(state.getAuthenticationPolicy(), policy);
// Perform authentication.
- switch (bindResultCode)
+ switch (bindResultCode.asEnum())
{
case SUCCESS:
assertTrue(state.passwordMatches(ByteString.valueOf(userPassword)));
@@ -4398,7 +4398,7 @@
BindResponseProtocolOp newBindResult(final ResultCode resultCode)
{
- return new BindResponseProtocolOp(resultCode.getIntValue());
+ return new BindResponseProtocolOp(resultCode.intValue());
}
@@ -4406,7 +4406,7 @@
ExtendedResponseProtocolOp newDisconnectNotification(
final ResultCode resultCode)
{
- return new ExtendedResponseProtocolOp(resultCode.getIntValue(), null, null,
+ return new ExtendedResponseProtocolOp(resultCode.intValue(), null, null,
null, OID_NOTICE_OF_DISCONNECTION, null);
}
@@ -4435,6 +4435,6 @@
SearchResultDoneProtocolOp newSearchResult(final ResultCode resultCode)
{
- return new SearchResultDoneProtocolOp(resultCode.getIntValue());
+ return new SearchResultDoneProtocolOp(resultCode.intValue());
}
}
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 c7706d9..b4a6060 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
@@ -38,6 +38,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -45,6 +46,7 @@
import static org.testng.Assert.*;
+@SuppressWarnings("javadoc")
public class PasswordExpirationTimeVirtualAttributeProviderTestCase
extends ExtensionsTestCase
{
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 4cec61a..a8a94f6 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
@@ -43,6 +43,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPPasswordModify;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
index 0e04dd8..eeb4745 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
@@ -48,7 +48,7 @@
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
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 12a01c4..698e743 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
@@ -41,7 +41,7 @@
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.AuthenticationInfo;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
index c5bb61e..e1693b7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
@@ -56,7 +56,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
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 7716743..647ed3f 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
@@ -39,7 +39,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
index 92b6e9a..b1011ec 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
@@ -53,7 +53,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
index 300613f..d34e864 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
@@ -52,7 +52,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
index 3a858cd..edd5750 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
@@ -49,7 +49,7 @@
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
import org.testng.annotations.BeforeClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
index e99dee9..cacbf4a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
@@ -56,7 +56,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
index bfb2933..7b408e0 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
@@ -37,6 +37,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 27d4f3a..c199874 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
@@ -41,6 +41,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
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 151169e..1111792 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
@@ -51,6 +51,7 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.testng.Assert.*;
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 672d9b1..9823d78 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
@@ -30,7 +30,7 @@
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchResultEntry;
import org.testng.annotations.AfterClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
index 2db3e9f..992fc35 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
@@ -44,6 +44,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
index 44d8310..636b3d4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
@@ -44,6 +44,7 @@
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.*;
@@ -71,7 +72,7 @@
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<DelayRequestControl>
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
index d489271..125ed51 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
@@ -85,7 +85,7 @@
public static class DisconnectClientControl extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<DisconnectClientControl>
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 138f76c..52f0838 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
@@ -52,7 +52,7 @@
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
index f84734f..e467078 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
@@ -51,7 +51,7 @@
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
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 22fb5f4..4421480 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
@@ -57,7 +57,7 @@
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.types.RDN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
index d4cd416..3e66e0a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
@@ -46,6 +46,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.*;
import static org.testng.Assert.*;
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 91ad8d0..193be45 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
@@ -43,6 +43,7 @@
import org.opends.server.plugins.SambaPasswordPlugin.TimeStampProvider;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import org.testng.annotations.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
index dc705d7..78254d4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -31,7 +32,7 @@
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.tools.LDAPModify;
import static org.testng.Assert.*;
@@ -246,7 +247,7 @@
};
assertEquals(LDAPModify.mainModify(args, false, System.out, System.err),
- ResultCode.CONSTRAINT_VIOLATION.getIntValue());
+ ResultCode.CONSTRAINT_VIOLATION.intValue());
}
finally
{
@@ -411,7 +412,7 @@
};
assertEquals(LDAPModify.mainModify(args, false, System.out, System.err),
- ResultCode.CONSTRAINT_VIOLATION.getIntValue());
+ ResultCode.CONSTRAINT_VIOLATION.intValue());
}
finally
{
@@ -639,7 +640,7 @@
};
assertEquals(LDAPModify.mainModify(args, false, System.out, System.err),
- ResultCode.CONSTRAINT_VIOLATION.getIntValue());
+ ResultCode.CONSTRAINT_VIOLATION.intValue());
}
finally
{
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
index 7bc0247..4574fb0 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
@@ -36,17 +36,20 @@
import java.util.concurrent.ConcurrentHashMap;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.std.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.opends.server.controls.ControlDecoder;
-import org.forgerock.opendj.io.ASN1;
-import org.forgerock.opendj.io.ASN1Reader;
-import org.forgerock.opendj.io.ASN1Writer;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.types.Control;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.OperationType;
import org.opends.server.types.operation.*;
/**
@@ -72,7 +75,7 @@
public static class ShortCircuitRequestControl extends Control
{
/**
- * ControlDecoder implentation to decode this control from a ByteString.
+ * ControlDecoder implementation to decode this control from a ByteString.
*/
private final static class Decoder
implements ControlDecoder<ShortCircuitRequestControl>
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
index fdc98df..dbe0fb5 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
@@ -43,6 +43,7 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.*;
import static org.testng.Assert.*;
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 b91a5f3..f1db9c3 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
@@ -46,6 +46,7 @@
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
index a47a911..883cc61 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
@@ -34,6 +34,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 18d8ba8..724cf04 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
@@ -59,7 +59,7 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
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 8b0ac3c..0373fea 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
@@ -59,6 +59,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
index 75fa471..5d6b969 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
@@ -34,7 +34,7 @@
import org.opends.server.plugins.InvocationCounterPlugin;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
index 9c7b4be..4882e73 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
@@ -44,6 +44,7 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.Base64;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.BeforeClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
index f1b365a..3cde311 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
@@ -36,25 +36,23 @@
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
+@SuppressWarnings("javadoc")
public class TestBindResponseProtocolOp extends LdapTestCase {
private static LocalizableMessage message = LocalizableMessage.raw("This is a message");
- private static LocalizableMessage message2 = LocalizableMessage.raw("This is a second message");
ResultCode okCode = ResultCode.SUCCESS;
ResultCode busyCode = ResultCode.BUSY;
ResultCode invalidSyntaxCode = ResultCode.INVALID_ATTRIBUTE_SYNTAX;
private static String dn = "cn=dn, dc=example,dc=com";
- private static String dn2 = "cn=dn2, dc=example,dc=com";
private static String saslCreds = "sasl credentials";
- private static String saslCreds2 = "sasl2 credentials";
private static String url = "ldap://somewhere.example.com";
- private static String url2 = "ldap://somewhere2.example.com";
/**
* Once-only initialization.
@@ -79,7 +77,7 @@
ByteString serverSASLCredentials =
ByteString.valueOf(saslCreds);
BindResponseProtocolOp r =
- new BindResponseProtocolOp(okCode.getIntValue(),
+ new BindResponseProtocolOp(okCode.intValue(),
message, responseDn, referralURLs,
serverSASLCredentials);
toString(r);
@@ -108,7 +106,7 @@
ByteStringBuilder bsb = new ByteStringBuilder();
ASN1Writer writer = ASN1.getWriter(bsb);
writer.writeStartSequence(OP_TYPE_BIND_RESPONSE);
- writer.writeInteger(okCode.getIntValue());
+ writer.writeInteger(okCode.intValue());
writer.writeOctetString(responseDn.toString());
writer.writeOctetString(message.toString());
writer.writeBoolean(true);
@@ -119,7 +117,7 @@
assertTrue(protocolOp instanceof BindResponseProtocolOp);
BindResponseProtocolOp bindResponse = (BindResponseProtocolOp)protocolOp;
- assertTrue(bindResponse.getResultCode() == okCode.getIntValue());
+ assertTrue(bindResponse.getResultCode() == okCode.intValue());
assertTrue(bindResponse.getMatchedDN().toNormalizedString().equals(responseDn.toNormalizedString()));
assertTrue(bindResponse.getErrorMessage().toString().equals(message.toString()));
assertNull(bindResponse.getReferralURLs());
@@ -153,7 +151,7 @@
ByteStringBuilder bsb = new ByteStringBuilder();
ASN1Writer writer = ASN1.getWriter(bsb);
writer.writeStartSequence(OP_TYPE_BIND_RESPONSE);
- writer.writeInteger(okCode.getIntValue());
+ writer.writeInteger(okCode.intValue());
writer.writeOctetString(responseDn.toString());
writer.writeOctetString(message.toString());
writer.writeInteger(Long.MAX_VALUE);
@@ -166,7 +164,7 @@
assertTrue(protocolOp instanceof BindResponseProtocolOp);
BindResponseProtocolOp bindResponse = (BindResponseProtocolOp)protocolOp;
- assertTrue(bindResponse.getResultCode() == okCode.getIntValue());
+ assertTrue(bindResponse.getResultCode() == okCode.intValue());
assertTrue(bindResponse.getMatchedDN().toNormalizedString().equals(responseDn.toNormalizedString()));
assertTrue(bindResponse.getErrorMessage().toString().equals(message.toString()));
assertNull(bindResponse.getReferralURLs());
@@ -182,14 +180,13 @@
ByteString.valueOf(saslCreds);
BindResponseProtocolOp saslOkResp =
- new BindResponseProtocolOp(okCode.getIntValue(),
+ new BindResponseProtocolOp(okCode.intValue(),
message, responseDn, referralURLs,
serverSASLCredentials);
BindResponseProtocolOp busyResp =
- new BindResponseProtocolOp(busyCode.getIntValue());
+ new BindResponseProtocolOp(busyCode.intValue());
BindResponseProtocolOp invalidSyntaxResp =
- new BindResponseProtocolOp(invalidSyntaxCode.getIntValue(),
- message);
+ new BindResponseProtocolOp(invalidSyntaxCode.intValue(), message);
ByteStringBuilder saslOkBuilder = new ByteStringBuilder();
ASN1Writer saslOkWriter = ASN1.getWriter(saslOkBuilder);
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 7af2b26..053ea51 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
@@ -50,6 +50,7 @@
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.tasks.LdifFileWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 faee1c1..988cdde 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
@@ -47,6 +47,7 @@
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.Base64;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
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 73c5868..ca6ed89 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
@@ -45,6 +45,7 @@
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 302404a..405bf07 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
@@ -35,7 +35,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 a3f15a3..fee554b 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
@@ -54,6 +54,7 @@
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.schema.IntegerSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -62,7 +63,7 @@
import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.schema.DirectoryStringSyntax.*;
-import static org.opends.server.types.ResultCode.*;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.testng.Assert.*;
/**
@@ -273,7 +274,7 @@
DeleteOperation op = connection.processDelete(dn);
assertTrue(op.getResultCode() == SUCCESS || op.getResultCode() == NO_SUCH_OBJECT,
- "Delete entry " + dn + " failed: " + op.getResultCode().getResultCodeName());
+ "Delete entry " + dn + " failed: " + op.getResultCode());
}
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
index bc0cf3c..01aabdb 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
@@ -47,6 +47,7 @@
import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 bd29173..a06fbfa 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
@@ -44,6 +44,7 @@
import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
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 f6ce433..fedc09b 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
@@ -49,6 +49,7 @@
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.TimeThread;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
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 d724e37..0a4ec47 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
@@ -47,6 +47,7 @@
import org.opends.server.replication.common.*;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
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 21e7cb9..8ba7ec4 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
@@ -50,6 +50,7 @@
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.service.ReplicationDomain;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
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 87f15a3..4f9c087 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
@@ -45,6 +45,7 @@
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
index b70b6e0..356c669 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
@@ -38,7 +38,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.types.DN;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.Test;
/**
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 5535f59..4ee411e 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
@@ -42,6 +42,7 @@
import org.opends.server.replication.protocol.DeleteMsg;
import org.opends.server.replication.protocol.ModifyDNMsg;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.Test;
import static org.opends.server.TestCaseUtils.*;
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 adbd3fd..905a609 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
@@ -65,6 +65,7 @@
import org.opends.server.tools.LDAPSearch;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.LDIFWriter;
import org.opends.server.util.TimeThread;
import org.opends.server.workflowelement.externalchangelog.ECLSearchOperation;
@@ -77,7 +78,7 @@
import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.controls.PersistentSearchChangeType.*;
import static org.opends.server.replication.protocol.OperationContext.*;
-import static org.opends.server.types.ResultCode.*;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.opends.server.util.StaticUtils.*;
import static org.testng.Assert.*;
@@ -1878,7 +1879,7 @@
private void assertSuccessful(LDAPMessage message)
{
SearchResultDoneProtocolOp doneOp = message.getSearchResultDoneProtocolOp();
- assertEquals(doneOp.getResultCode(), ResultCode.SUCCESS.getIntValue(),
+ assertEquals(doneOp.getResultCode(), ResultCode.SUCCESS.intValue(),
doneOp.getErrorMessage().toString());
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index 5ddefb6..ae77b18 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -55,6 +55,7 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.LDIFWriter;
import org.opends.server.util.TimeThread;
import org.opends.server.workflowelement.localbackend.LocalBackendModifyDNOperation;
@@ -67,7 +68,7 @@
import static org.forgerock.opendj.ldap.SearchScope.*;
import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.replication.protocol.OperationContext.*;
-import static org.opends.server.types.ResultCode.*;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java
index 2108816..4887144 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java
@@ -37,7 +37,7 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java
index d6b5ca1..6c03876 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java
@@ -37,7 +37,7 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ReplicationMessages.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
index f295201..86a1def 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
@@ -41,7 +41,7 @@
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.Control;
import org.opends.server.types.DereferencePolicy;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import static org.testng.Assert.*;
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 94d8450..95c3c5d 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
@@ -45,7 +45,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchResultEntry;
import org.forgerock.opendj.ldap.SearchScope;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
index 07aac00..f8edc45 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
@@ -40,7 +40,7 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
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 bb3210f..f88aaf8 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
@@ -43,7 +43,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchResultEntry;
import org.forgerock.opendj.ldap.SearchScope;
import org.testng.annotations.DataProvider;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
index 6b50a17..29880bf 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
@@ -39,7 +39,7 @@
import org.opends.server.protocols.ldap.LDAPFilter;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DereferencePolicy;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchResultEntry;
import org.forgerock.opendj.ldap.SearchScope;
import org.testng.annotations.BeforeClass;
@@ -48,7 +48,7 @@
/**
- * This Test Class tests various matching rules for their compability
+ * This Test Class tests various matching rules for their compatibility
* against RFC 4517,4518 and 3454.
*/
public final class StringPrepProfileTestCase
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 d0396a7..bed0670 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
@@ -46,7 +46,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.SearchResultEntry;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.util.TimeThread;
@@ -64,21 +64,14 @@
{
//User DNs to be used in tests.
private DN user1;
-
- private DN user2 ;
-
+ private DN user2;
private DN user3;
-
private DN user4;
-
private DN user5;
-
private DN user6;
- private DN user7;
- private DN user8;
- private final static String TIME_ATTR = "test-time";
- private final static String DATE_ATTR = "test-date";
+ private final static String TIME_ATTR = "test-time";
+ private final static String DATE_ATTR = "test-date";
/**
@@ -101,11 +94,9 @@
user4 = DN.valueOf("cn=user4,dc=example,dc=com");
user5 = DN.valueOf("cn=user5,dc=example,dc=com");
user6 = DN.valueOf("cn=user6,dc=example,dc=com");
- user7 = DN.valueOf("cn=user7,dc=example,dc=com");
- user8 = DN.valueOf("cn=user!,dc=example,dc=com");
/**
- Extend the schema and add an attribute which is baseed on
+ Extend the schema and add an attribute which is based on
generalizedTimeSyntax. Since all the existing attributes based
on that syntax are read-only, let us create a new attribute and
add it.*/
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
index c28f389..a98c3ec 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
@@ -49,7 +49,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
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 e714618..e2e91a2 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
@@ -39,6 +39,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.Test;
import static org.opends.server.config.ConfigConstants.*;
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 708362b..a77ab67 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
@@ -38,7 +38,7 @@
import org.opends.server.api.TestTaskListener;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.backends.task.TaskState;
import static org.testng.Assert.*;
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 42769f4..5c27fc3 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
@@ -50,6 +50,7 @@
import org.opends.server.extensions.AnonymousSASLMechanismHandler;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import static org.testng.Assert.*;
import com.forgerock.opendj.cli.ClientException;
@@ -62,7 +63,8 @@
public class LDAPAuthenticationHandlerTestCase
extends ToolsTestCase
{
- String hostname;
+ private String hostname;
+
/**
* Ensures that the Directory Server is running.
*
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 545ce24..4e0d52f 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
@@ -40,7 +40,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.Base64;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.AfterClass;
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 986f38a..8ae1579 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
@@ -42,7 +42,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
import static org.opends.server.util.ServerConstants.*;
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 7e93bef..11faf8f 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
@@ -43,7 +43,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
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 9c0855f..fca7692 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
@@ -42,7 +42,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Entry;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
index 47c9d26..2ec58ad 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
@@ -40,7 +40,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
index 82735c7..f1da839 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
@@ -39,7 +39,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.Modification;
import org.forgerock.opendj.ldap.ModificationType;
-import org.opends.server.types.ResultCode;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
index 3b1cfea..2e8e8eb 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
@@ -29,11 +29,11 @@
import java.util.ArrayList;
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ResultCode;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import org.forgerock.i18n.LocalizableMessage;
-
import static org.testng.Assert.*;
@@ -52,12 +52,12 @@
@DataProvider(name = "resultCodes")
public Object[][] getResultCodes()
{
- ResultCode[] resultCodes = ResultCode.values();
- Object[][] array = new Object[resultCodes.length][1];
+ List<ResultCode> resultCodes = ResultCode.values();
+ Object[][] array = new Object[resultCodes.size()][1];
- for (int i=0; i < resultCodes.length; i++)
+ for (int i = 0; i < resultCodes.size(); i++)
{
- array[i][0] = resultCodes[i];
+ array[i][0] = resultCodes.get(i);
}
return array;
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 7059209..17f2eb2 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
@@ -35,6 +35,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ModificationType;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.GlobalCfgDefn.DisabledPrivilege;
@@ -57,8 +58,8 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.forgerock.opendj.ldap.ResultCode.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
-import static org.opends.server.types.ResultCode.*;
import static org.testng.Assert.*;
/**
--
Gitblit v1.10.0