From 274227c07205d3dbd7125ed75ed6d2acdd3c9ce0 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 10 Jan 2014 10:02:47 +0000
Subject: [PATCH]
---
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 3
opendj3-server-dev/src/server/org/opends/server/types/OperatingSystem.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java | 6
opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Reader.java | 7
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java | 3
opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java | 3
opendj3-server-dev/src/server/org/opends/server/api/PasswordStorageScheme.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/InvokableMethod.java | 3
opendj3-server-dev/src/server/org/opends/server/api/PasswordValidator.java | 3
opendj3-server-dev/src/server/org/opends/server/types/LDIFImportConfig.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java | 5
opendj3-server-dev/src/server/org/opends/server/backends/jeb/SortValuesSet.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/PersistentSearchControl.java | 3
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/ResultCode.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/types/ByteStringBuilder.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/LDAPToolUtils.java | 4
opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java | 3
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/extensions/TestPasswordValidator.java | 2
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 | 2
opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/LDAPWriter.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java | 4
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/tools/EncodePassword.java | 1
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/GetEffectiveRightsRequestControl.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/core/BindOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java | 2
opendj3-server-dev/src/server/org/opends/server/types/ConfigChangeResult.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java | 87 +-
opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java | 1
opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationType.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidator.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/types/CollectiveVirtualAttribute.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java | 7
opendj3-server-dev/src/server/org/opends/server/core/ModifyOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/types/DereferencePolicy.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/CancelExtendedOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/types/DITStructureRule.java | 3
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/api/ApproximateMatchingRule.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java | 1
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 | 5
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java | 3
opendj3-server-dev/src/server/org/opends/server/types/ByteSequence.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/operation/InProgressOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/core/CompareOperationWrapper.java | 4
opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java | 4
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReader.java | 8
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/BackupInfo.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java | 5
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java | 5
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/CollectiveAttributeSubentriesVirtualAttributeProvider.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/types/LDAPSyntaxDescription.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java | 4
opendj3-server-dev/src/server/org/opends/server/types/Entry.java | 5
opendj3-server-dev/src/server/org/opends/server/types/OpenDsException.java | 2
opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationBasis.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/StringPrepProfile.java | 2
opendj3-server-dev/src/server/org/opends/server/core/CompareOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java | 2
opendj3-server-dev/src/server/org/opends/server/types/Attribute.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidator.java | 3
opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperation.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 | 4
opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java | 4
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortResponseControl.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java | 1
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/types/AbstractAttribute.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiringControl.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProvider.java | 4
opendj3-server-dev/src/server/org/opends/server/core/VirtualAttributeConfigManager.java | 1
opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/MemberVirtualAttributeProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java | 2
opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java | 3
opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/TripleDESPasswordStorageScheme.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.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/protocols/ldap/TestModifyResponseProtocolOp.java | 1
opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java | 5
opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java | 1
opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/AttributeValuePasswordValidator.java | 4
opendj3-server-dev/src/server/org/opends/server/api/ExtensibleMatchingRule.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java | 5
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPInputStream.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/MatchingRuleUse.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/types/DisconnectReason.java | 3
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java | 3
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternDN.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java | 7
opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskClient.java | 3
opendj3-server-dev/src/server/org/opends/server/types/ByteString.java | 105 --
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 | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java | 3
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriter.java | 7
opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java | 3
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/types/InitializationException.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPControl.java | 7
opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java | 4
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 | 4
opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java | 5
opendj3-server-dev/src/server/org/opends/server/types/MembershipException.java | 2
opendj3-server-dev/src/server/org/opends/server/types/RawModification.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseBindOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java | 2
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 | 4
opendj3-server-dev/src/server/org/opends/server/types/SortKey.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java | 6
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java | 7
opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/types/RecordingOutputStream.java | 4
opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java | 7
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java | 2
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 | 5
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java | 5
opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java | 2
opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java | 5
opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecificationSet.java | 4
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/ControlDecoder.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProvider.java | 4
opendj3-server-dev/src/server/org/opends/server/types/StabilityLevel.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java | 5
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/core/AddOperationBasis.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java | 2
opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationBasis.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/common/CSN.java | 10
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java | 6
opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/tasks/EnterLockdownModeTask.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/types/RDN.java | 5
opendj3-server-dev/src/server/org/opends/server/api/IndexQueryFactory.java | 3
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java | 4
opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java | 20
opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/Attributes.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseAddOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java | 4
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ByteSequenceOutputStream.java | 4
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/schema/BitStringSyntaxTest.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java | 3
opendj3-server-dev/src/server/org/opends/server/core/BindOperationBasis.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/RC4PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java | 3
opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/admin/ACIPropertyDefinition.java | 2
opendj3-server-dev/src/server/org/opends/server/types/RawAttribute.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/BackupDirectory.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/ExternalChangelogRequestControl.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/protocol/ChangeTimeHeartbeatMsg.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/common/ServerState.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/EntryChangelogNotificationControl.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java | 2
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 | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/PagedResultsControl.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSetSorter.java | 3
opendj3-server-dev/src/server/org/opends/server/types/WritabilityMode.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java | 13
opendj3-server-dev/src/server/org/opends/server/types/ByteSequenceReader.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java | 3
opendj3-server-dev/src/server/org/opends/server/types/SearchResultReference.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationAddOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/controls/SubentriesControl.java | 3
opendj3-server-dev/src/server/org/opends/server/types/CancelRequest.java | 2
opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationWrapper.java | 3
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Writer.java | 4
opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationAddOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationWrapper.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java | 3
opendj3-server-dev/src/server/org/opends/server/core/SearchOperationBasis.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerHandler.java | 3
opendj3-server-dev/src/server/org/opends/server/admin/AdministrationDataSync.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java | 7
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java | 4
opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/api/OrderingMatchingRule.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/protocol/StartSessionMsg.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java | 3
opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/package-info.java | 2
opendj3-server-dev/src/server/org/opends/server/types/NameForm.java | 3
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java | 1
opendj3-server-dev/ivy.xml | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java | 2
opendj3-server-dev/src/server/org/opends/server/api/EqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/core/CompareOperationBasis.java | 3
opendj3-server-dev/src/server/org/opends/server/types/AttributeValue.java | 3
opendj3-server-dev/src/server/org/opends/server/types/RecordingInputStream.java | 4
opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationWrapper.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/SubtreeDeleteControl.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/common/FirstChangeNumberVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java | 14
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java | 3
opendj3-server-dev/src/server/org/opends/server/types/LDAPURL.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java | 5
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 | 2
opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java | 7
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1.java | 10
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java | 3
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/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/DITContentRule.java | 3
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java | 2
opendj3-server-dev/src/server/org/opends/server/types/FilterType.java | 3
opendj3-server-dev/src/server/org/opends/server/types/IdentifiedException.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java | 1
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyCommonMsg.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationBasis.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java | 14
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/tasks/LeaveLockdownModeTask.java | 2
opendj3-server-dev/src/server/org/opends/server/types/AttributeType.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/JECompressedSchema.java | 4
opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java | 5
opendj3-server-dev/src/server/org/opends/server/core/CoreConfigManager.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java | 8
opendj3-server-dev/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java | 4
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/common/ChangelogBaseDNVirtualAttributeProvider.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/server/MessageHandler.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 5
opendj3-server-dev/src/server/org/opends/server/core/DefaultCompressedSchema.java | 4
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Aci.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProvider.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationBindOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/controls/EntryChangeNotificationControl.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/CanceledOperationException.java | 2
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java | 2
opendj3-server-dev/src/server/org/opends/server/types/LDAPException.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 | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java | 39
opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationProperty.java | 4
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationBindOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java | 3
opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java | 1
opendj3-server-dev/src/server/org/opends/server/core/AddOperationWrapper.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/IntermediateResponse.java | 4
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/core/DeleteOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java | 20
opendj3-server-dev/build.xml | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/PasswordExpiredControl.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/controls/VLVResponseControl.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java | 3
opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationWrapper.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyFactory.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java | 3
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.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 | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java | 1
opendj3-server-dev/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java | 5
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java | 1
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java | 4
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java | 4
opendj3-server-dev/src/server/org/opends/server/core/BindOperationWrapper.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java | 3
opendj3-server-dev/src/server/org/opends/server/controls/AccountUsableRequestControl.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java | 2
opendj3-server-dev/src/server/org/opends/server/types/EntryEncodeConfig.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java | 1
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesControl.java | 3
opendj3-server-dev/src/server/org/opends/server/types/AddressMask.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java | 12
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java | 1
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 1
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java | 4
opendj3-server-dev/src/server/org/opends/server/types/NamedCharacterSet.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/RegularExpressionIdentityMapper.java | 2
opendj3-server-dev/src/server/org/opends/server/types/DN.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java | 5
opendj3-server-dev/src/server/org/opends/server/types/RawFilter.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java | 1
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java | 16
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java | 3
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java | 3
opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java | 5
opendj3-server-dev/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java | 3
opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationAddOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseAddOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java | 4
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/protocols/asn1/ASN1Exception.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java | 5
opendj3-server-dev/src/server/org/opends/server/types/VirtualAttribute.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/util/ServerConstants.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java | 5
opendj3-server-dev/src/server/org/opends/server/core/AddOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/types/IndexType.java | 3
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java | 7
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/api/SubstringMatchingRule.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/GetConnectionIDExtendedOperation.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/RandomPasswordGenerator.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java | 4
opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/common/LastChangeNumberVirtualAttributeProvider.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/util/Base64.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java | 3
opendj3-server-dev/src/server/org/opends/server/types/AdditionalLogItem.java | 2
opendj3-server-dev/src/server/org/opends/server/types/operation/SubordinateModifyDNOperation.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/VLVRequestControl.java | 3
opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseBindOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyMsg.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java | 1
opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java | 1
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationBasis.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java | 3
opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java | 8
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java | 5
opendj3-server-dev/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java | 3
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java | 1
opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/AESPasswordStorageScheme.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java | 1
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java | 6
opendj3-server-dev/src/server/org/opends/server/util/BSDMD5Crypt.java | 6
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java | 2
opendj3-server-dev/src/server/org/opends/server/api/PasswordGenerator.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java | 5
opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java | 3
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java | 5
opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseCompareOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java | 3
opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java | 5
/dev/null | 145 ---
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/BlowfishPasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/makeldif/TemplateEntry.java | 1
opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java | 3
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java | 5
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java | 2
665 files changed, 1,385 insertions(+), 1,174 deletions(-)
diff --git a/opendj3-server-dev/build.xml b/opendj3-server-dev/build.xml
index f431521..8d745dc 100644
--- a/opendj3-server-dev/build.xml
+++ b/opendj3-server-dev/build.xml
@@ -22,7 +22,7 @@
!
!
! Copyright 2006-2010 Sun Microsystems, Inc.
- ! Portions Copyright 2011-2013 ForgeRock AS
+ ! Portions Copyright 2011-2014 ForgeRock AS
! Portions Copyright 2012 Delta Victor Consultants
! -->
@@ -1580,6 +1580,7 @@
<fileset dir="${dsml.lib.dir}">
<include name="*.jar" />
</fileset>
+ <fileset refid="opendj.runtime.jars"/>
<dirset dir="${classes.dir}" />
</classpath>
diff --git a/opendj3-server-dev/ivy.xml b/opendj3-server-dev/ivy.xml
index 02d9b3e..a9c74f4 100644
--- a/opendj3-server-dev/ivy.xml
+++ b/opendj3-server-dev/ivy.xml
@@ -22,12 +22,12 @@
! CDDL HEADER END
!
!
- ! Copyright 2013 ForgeRock AS
+ ! Copyright 2013-2014 ForgeRock AS
! -->
<!-- Using entities prevent constantly declaring the same versions -->
<!DOCTYPE ivy-module [
<!ENTITY grizzly.version "2.3.6">
- <!ENTITY opendj.sdk.version "2.7.0-SNAPSHOT">
+ <!ENTITY opendj.sdk.version "3.0.0-SNAPSHOT">
<!ENTITY crest.version "2.1.0-SNAPSHOT">
<!ENTITY jackson.version "1.9.2">
<!ENTITY slf4j.version "1.7.5">
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java
index f36d54f..e14f544 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java
@@ -21,20 +21,17 @@
* CDDL HEADER END
*
*
- * Copyright 2012 ForgeRock AS.
+ * Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.dsml.protocol;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-import java.nio.CharBuffer;
import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.w3c.dom.Element;
/**
@@ -111,12 +108,7 @@
{
try
{
- CharsetDecoder decoder = UTF8.newDecoder();
- decoder.onMalformedInput(CodingErrorAction.REPORT);
- decoder.onUnmappableCharacter(CodingErrorAction.REPORT);
- decoder.reset();
- CharBuffer chars = decoder.decode(bs.asByteBuffer());
- return chars.toString();
+ return new String(bs.toCharArray());
}
catch (Exception e)
{
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java
index d052c70..d759b6a 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.dsml.protocol;
@@ -40,7 +40,7 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.tools.LDAPConnection;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.LDAPException;
import org.opends.server.types.RawAttribute;
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
index 4ae3e41..7e3121d 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.dsml.protocol;
@@ -38,7 +38,7 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.tools.LDAPConnection;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.LDAPException;
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java
index a603fb7..204ba7d 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.dsml.protocol;
@@ -38,7 +38,7 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.tools.LDAPConnection;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.LDAPException;
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java
index 92f7e87..0445170 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.dsml.protocol;
@@ -39,7 +39,7 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.tools.LDAPConnection;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.LDAPException;
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
index 60857d8..c494b69 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.dsml.protocol;
@@ -38,7 +38,7 @@
import org.opends.server.protocols.ldap.ModifyDNRequestProtocolOp;
import org.opends.server.protocols.ldap.ModifyDNResponseProtocolOp;
import org.opends.server.protocols.ldap.ProtocolOp;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.LDAPException;
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java
index cc8eafb..61fd61c 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.dsml.protocol;
@@ -41,7 +41,7 @@
import org.opends.server.protocols.ldap.ModifyResponseProtocolOp;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.tools.LDAPConnection;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.LDAPException;
import org.opends.server.types.ModificationType;
import org.opends.server.types.RawModification;
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index 114fd5d..22945b3 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.dsml.protocol;
@@ -47,7 +47,7 @@
import org.opends.server.protocols.ldap.SearchResultDoneProtocolOp;
import org.opends.server.protocols.ldap.SearchResultEntryProtocolOp;
import org.opends.server.tools.LDAPConnection;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.LDAPException;
import org.opends.server.types.RawFilter;
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index 4db34f1..55b68e7 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.dsml.protocol;
@@ -81,7 +81,7 @@
import org.opends.server.tools.LDAPConnectionOptions;
import org.opends.server.tools.SSLConnectionException;
import org.opends.server.tools.SSLConnectionFactory;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.LDAPException;
import org.opends.server.types.SearchScope;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
index 8f861a7..84632a1 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
@@ -51,7 +51,7 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index 8c50432..2194981 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -63,6 +63,7 @@
import org.opends.server.config.ConfigConstants;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* The task that is called when we must modify an entry.
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java
index 9e52ddd..232430d 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java
@@ -58,7 +58,7 @@
import org.opends.messages.Message;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.UserData;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Schema;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
index b42971e..eeaf71f 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
@@ -81,7 +81,7 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
index 8621177..fccef8c 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.util;
@@ -44,7 +44,7 @@
import org.opends.server.schema.AttributeTypeSyntax;
import org.opends.server.schema.ObjectClassSyntax;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/ACIPropertyDefinition.java b/opendj3-server-dev/src/server/org/opends/server/admin/ACIPropertyDefinition.java
index d567430..6c20f4b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/ACIPropertyDefinition.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/ACIPropertyDefinition.java
@@ -30,7 +30,7 @@
import org.opends.server.authorization.dseecompat.Aci;
import org.opends.server.authorization.dseecompat.AciException;
import org.opends.server.types.DN;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.forgerock.util.Reject.ifNull;
import java.util.EnumSet;
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 8df9344..28afc5f 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
@@ -40,7 +40,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
index b51e81f..066b204 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -29,8 +30,8 @@
import java.util.Collection;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/ApproximateMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/ApproximateMatchingRule.java
index 6e2278f..31118fd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/ApproximateMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/ApproximateMatchingRule.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
import org.opends.server.types.ConditionResult;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java
index 6828084..d7ad807 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.api;
import org.opends.messages.Message;
@@ -34,7 +34,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.types.InitializationException;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.messages.MessageBuilder;
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 b851b7a..3b115e3 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
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
* Portions Copyright 2014 ForgeRock AS
*/
@@ -43,6 +43,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java b/opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java
index 482745f..78b075f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.api;
@@ -52,9 +52,9 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteSequenceReader;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/EqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/EqualityMatchingRule.java
index 9c59066..3b45ec0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/EqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/EqualityMatchingRule.java
@@ -22,12 +22,14 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteSequence;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/ExtensibleMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/ExtensibleMatchingRule.java
index dcc727d..13865a6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/ExtensibleMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/ExtensibleMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -29,7 +30,7 @@
import java.util.Collection;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.IndexConfig;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/IndexQueryFactory.java b/opendj3-server-dev/src/server/org/opends/server/api/IndexQueryFactory.java
index 1386082..d0a6f1a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/IndexQueryFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/IndexQueryFactory.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -29,7 +30,7 @@
import java.util.Collection;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
index 6b9f576..fbf953b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -29,8 +30,8 @@
import java.util.Collection;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/OrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/OrderingMatchingRule.java
index b712af2..b9d641e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/OrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/OrderingMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -29,7 +30,7 @@
import java.io.Serializable;
import java.util.Comparator;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/PasswordGenerator.java b/opendj3-server-dev/src/server/org/opends/server/api/PasswordGenerator.java
index 22fe354..28d6f73 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/PasswordGenerator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/PasswordGenerator.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
import org.opends.messages.Message;
@@ -33,6 +34,7 @@
import org.opends.server.admin.std.server.PasswordGeneratorCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/api/PasswordStorageScheme.java
index 662429f..eca9a8a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/PasswordStorageScheme.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
import org.opends.messages.Message;
@@ -33,6 +34,8 @@
import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/PasswordValidator.java b/opendj3-server-dev/src/server/org/opends/server/api/PasswordValidator.java
index 69a65e5..7da98c8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/PasswordValidator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/PasswordValidator.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
import org.opends.messages.Message;
@@ -34,7 +35,7 @@
import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.messages.MessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/SubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/SubstringMatchingRule.java
index 8858dbe..b09ba43 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/SubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/SubstringMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -30,6 +31,8 @@
import java.util.List;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java
index b2f87f7..aaad731 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -37,7 +37,8 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.debug.DebugLogger.*;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Aci.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Aci.java
index 2658bed..5b04e08 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Aci.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/Aci.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2013 ForgeRock AS
+ * Portions Copyright 2010-2014 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -34,7 +34,7 @@
import java.util.regex.Pattern;
import org.opends.messages.Message;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.DN;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
index ba2647c..eaf65f4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
@@ -30,7 +30,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
index d1ba811..3a7d8e5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
@@ -37,6 +37,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.DITCacheMap;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* The AciList class performs caching of the ACI attribute values
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 f2455df..710f879 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
@@ -47,7 +47,6 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
import static org.opends.messages.AccessControlMessages.*;
import org.opends.server.core.DirectoryServer;
import static org.opends.server.util.ServerConstants.*;
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 52c4eb4..8e4bdcd 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.opends.messages.Message;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.messages.AccessControlMessages.*;
import static org.opends.server.util.StaticUtils.isDigit;
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 25bac05..ee20971 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
@@ -22,12 +22,14 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
import org.opends.messages.Message;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.core.DirectoryServer;
import org.opends.server.api.EqualityMatchingRule;
import static org.opends.messages.AccessControlMessages.
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 3bccd20..e9b4744 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
@@ -45,6 +45,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.schema.BooleanSyntax;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.forgerock.util.Reject;
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 32a6f88..2c93d17 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
@@ -82,6 +82,7 @@
import org.opends.server.schema.NameFormSyntax;
import org.opends.server.schema.ObjectClassSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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 0ce39f9..489018f 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
@@ -76,6 +76,7 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.CertificateManager;
import org.opends.server.util.SetupUtils;
import org.forgerock.util.Reject;
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 f63eb58..fefd983 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -40,6 +40,7 @@
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.admin.std.server.LocalDBIndexCfg;
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
import org.opends.server.admin.server.ConfigurationChangeListener;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
index 859016c..1bc5cdc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java
@@ -51,7 +51,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.Entry;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.loggers.ErrorLogger.logError;
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 f97594e..a257c1d 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
@@ -56,6 +56,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
@@ -1267,7 +1268,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- String str = pageRequest.getCookie().toHex();
+ String str = pageRequest.getCookie().toHexString();
Message msg = ERR_JEB_INVALID_PAGED_RESULTS_COOKIE.get(str);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
msg, e);
@@ -1460,7 +1461,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- String str = pageRequest.getCookie().toHex();
+ String str = pageRequest.getCookie().toHexString();
Message msg = ERR_JEB_INVALID_PAGED_RESULTS_COOKIE.get(str);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
msg, e);
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 a2af3fa..d168dfd 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -40,7 +40,6 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
-
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.StaticUtils.*;
import com.sleepycat.je.LockMode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java
index 7603eb1..b61f349 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ExportJob.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -41,6 +41,7 @@
import java.util.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
index faadc5b..2cdddde 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -31,11 +31,15 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
+
import static org.opends.messages.JebMessages.*;
+import com.forgerock.opendj.util.StaticUtils;
import com.sleepycat.je.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.asn1.ASN1;
@@ -44,7 +48,10 @@
import org.opends.server.api.CompressedSchema;
import java.io.IOException;
+import java.io.OutputStream;
import java.util.zip.DataFormatException;
+import java.util.zip.DeflaterOutputStream;
+import java.util.zip.InflaterOutputStream;
/**
* Represents the database containing the LDAP entries. The database key is
@@ -161,10 +168,17 @@
{
// It was compressed.
reader.readOctetString(compressedEntryBuffer);
- CryptoManager cryptoManager = DirectoryServer.getCryptoManager();
- // TODO: Should handle the case where uncompress returns < 0
- compressedEntryBuffer.uncompress(entryBuffer, cryptoManager,
- uncompressedSize);
+
+ OutputStream decompressor = null;
+ try
+ {
+ // TODO: Should handle the case where uncompress fails
+ decompressor = new InflaterOutputStream(entryBuffer.asOutputStream());
+ compressedEntryBuffer.copyTo(decompressor);
+ }
+ finally {
+ StaticUtils.closeSilently(decompressor);
+ }
// Since we are used the cached buffers (ByteStringBuilders),
// the decoded attribute values will not refer back to the
@@ -209,11 +223,18 @@
// Then start the ASN1 sequence.
writer.writeStartSequence(JebFormat.TAG_DATABASE_ENTRY);
- // Do optional compression.
- CryptoManager cryptoManager = DirectoryServer.getCryptoManager();
- if (dataConfig.isCompressed() && cryptoManager != null &&
- entryBuffer.compress(compressedEntryBuffer, cryptoManager))
+ if (dataConfig.isCompressed())
{
+ OutputStream compressor = null;
+ try {
+ compressor = new DeflaterOutputStream(
+ compressedEntryBuffer.asOutputStream());
+ entryBuffer.copyTo(compressor);
+ }
+ finally {
+ StaticUtils.closeSilently(compressor);
+ }
+
// Compression needed and successful.
writer.writeInteger(entryBuffer.length());
writer.writeOctetString(compressedEntryBuffer);
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
index 9003909..8fe101b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -36,7 +37,7 @@
import org.opends.messages.Message;
import org.opends.server.api.IndexQueryFactory;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.JebMessages.
INFO_JEB_INDEX_FILTER_INDEX_LIMIT_EXCEEDED;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JECompressedSchema.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JECompressedSchema.java
index 7f849ea..efeb696 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JECompressedSchema.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JECompressedSchema.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.backends.jeb;
@@ -45,7 +45,7 @@
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java
index da7327d..c414a21 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/JebFormat.java
@@ -30,7 +30,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DN;
import org.opends.server.types.RDN;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SortValuesSet.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SortValuesSet.java
index 7f9dd04..482914e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SortValuesSet.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SortValuesSet.java
@@ -22,11 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import com.sleepycat.je.DatabaseException;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
index 67c8c06..16b6121 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
@@ -22,13 +22,13 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
import java.util.*;
import org.opends.server.api.SubstringMatchingRule;
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 9914f77..9de740c 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
@@ -30,6 +30,9 @@
import com.sleepycat.je.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.admin.std.server.LocalDBVLVIndexCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.core.DirectoryServer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java
index ee7886c..35b4454 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVKeyComparator.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Comparator;
import java.io.Serializable;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index e60dbf4..f65bdef 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -40,7 +40,7 @@
import org.opends.server.util.ServerConstants;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.JebMessages.*;
import java.util.*;
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 6551bfa..a11a0c9 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
@@ -58,6 +58,7 @@
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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/config/BooleanConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java
index 2057ff7..995b26a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
import org.opends.messages.Message;
@@ -42,7 +43,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.messages.ConfigMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
index bef00b5..31db274 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
@@ -39,7 +39,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java
index 776720b..094d2cc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/DNConfigAttribute.java
@@ -41,7 +41,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
index 7d90c16..fa11660 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/IntegerConfigAttribute.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
import org.opends.messages.Message;
@@ -40,7 +41,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
index c0ec0e0..44e09c3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
import org.opends.messages.Message;
@@ -41,7 +42,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
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 df0c880..46ef609 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
@@ -22,7 +22,7 @@
*
*
* Portions Copyright 2006-2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.config;
@@ -62,7 +62,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.ByteString;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
index 5df7245..6659fec 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
import org.opends.messages.Message;
@@ -40,7 +41,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
index caba06a..8269eb9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
import org.opends.messages.Message;
@@ -39,7 +40,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.AttributeValues;
import static org.opends.server.config.ConfigConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java
index 8c347cc..e5c7b01 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
import org.opends.messages.Message;
@@ -40,7 +41,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
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 65d8f9d..f544b3f 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -29,7 +30,7 @@
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
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 e86779e..7aff445 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -33,7 +34,7 @@
import static org.opends.server.protocols.asn1.ASN1Constants.
UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ProtocolMessages.*;
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 30d78ec..e3d6d3c 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -30,7 +31,7 @@
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
-
+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/ControlDecoder.java b/opendj3-server-dev/src/server/org/opends/server/controls/ControlDecoder.java
index e7331d1..b0a44bb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/ControlDecoder.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/ControlDecoder.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
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 b9ffc57..1d7d8ce 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
@@ -36,7 +36,7 @@
import static org.opends.server.protocols.asn1.ASN1Constants.
UNIVERSAL_INTEGER_TYPE;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ProtocolMessages.*;
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 f8f5437..97e437c 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import static org.opends.messages.ProtocolMessages.ERR_ECLN_CANNOT_DECODE_VALUE;
@@ -39,7 +40,7 @@
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
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 0be8b0f..32813d8 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.controls;
import static org.opends.messages.ProtocolMessages.*;
@@ -37,7 +37,7 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.replication.common.MultiDomainServerState;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
@@ -90,7 +90,7 @@
{
Message message =
ERR_CANNOT_DECODE_CONTROL_VALUE.get(
- getOID() + " x=" + value.toHex() + " v="
+ getOID() + " x=" + value.toHexString() + " v="
+ mdssValue , getExceptionMessage(e).toString());
throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message, e);
}
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 1033d4b..1966745 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
@@ -29,6 +29,7 @@
import org.opends.messages.Message;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.protocols.asn1.*;
import static org.opends.server.protocols.asn1.ASN1Constants.
UNIVERSAL_OCTET_STRING_TYPE;
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 5e08548..d9e9167 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -32,7 +33,7 @@
UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
-
+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/LDAPPostReadRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
index f8e7f34..7e97cb9 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.controls;
@@ -42,7 +42,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+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/LDAPPostReadResponseControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
index b46e3c8..21839e3 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -32,7 +33,7 @@
UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.protocols.ldap.*;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ProtocolMessages.*;
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 a6d4c7f..5872708 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.controls;
@@ -40,7 +40,7 @@
import static org.opends.server.plugins.LDAPADListPlugin.*;
import static org.opends.server.protocols.asn1.ASN1Constants.*;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ProtocolMessages.*;
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 460f050..d63ab01 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -33,7 +34,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.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ProtocolMessages.*;
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 25a7cce..7e13739 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -35,7 +36,7 @@
import static org.opends.server.protocols.asn1.ASN1Constants.
UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ProtocolMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java b/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java
index 99977e7..e25239b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java
@@ -46,6 +46,8 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.util.StaticUtils.*;
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 fc9c320..82762b9 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -35,7 +36,7 @@
import static org.opends.server.protocols.asn1.ASN1Constants.
UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import java.io.IOException;
/**
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 ff2b175..afbc1ee 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -29,7 +30,7 @@
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
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 6f2b421..c6a4756 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -30,7 +31,7 @@
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ProtocolMessages.*;
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 16bc7b8..336a606 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -29,7 +30,7 @@
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
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 9592e66..f483c87 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -37,7 +37,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
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/controls/PersistentSearchControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/PersistentSearchControl.java
index 33834e7..9a407e2 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -36,7 +37,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
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/controls/ProxiedAuthV1Control.java b/opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
index 679b1c0..5fec084 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,7 +38,7 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.protocols.asn1.ASN1Constants.*;
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 58f00dc..ec19049 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,7 +39,7 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 b7c4ca8..3374f9b 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -39,7 +40,7 @@
UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
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/controls/ServerSideSortResponseControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortResponseControl.java
index 5d39b07..bd94405 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -34,7 +35,7 @@
UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
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 1596782..ba8c6c9 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -31,7 +32,7 @@
import org.opends.server.protocols.asn1.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.protocols.asn1.ASN1Constants.
UNIVERSAL_OCTET_STRING_TYPE;
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 c7616b8..dafefe3 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
@@ -34,7 +35,7 @@
import org.opends.messages.Message;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.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 aeed457..3bbd3ee 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -34,7 +35,7 @@
UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ResultCode;
import static org.opends.messages.ProtocolMessages.*;
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 0575f7f..202879b 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
import org.opends.messages.Message;
@@ -33,7 +34,7 @@
import static org.opends.server.protocols.asn1.ASN1Constants.
UNIVERSAL_OCTET_STRING_TYPE;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
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/core/AddOperation.java b/opendj3-server-dev/src/server/org/opends/server/core/AddOperation.java
index fd208ab..169b958 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AddOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AddOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
@@ -29,6 +30,7 @@
import java.util.Map;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This interface defines an operation that may be used to add a new entry to
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 7a884ef..0e5e9ec 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
@@ -45,6 +45,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.ByteString;
import org.opends.server.types.operation.PostResponseAddOperation;
import org.opends.server.types.operation.PreParseAddOperation;
import org.opends.server.workflowelement.localbackend.LocalBackendAddOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AddOperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/AddOperationWrapper.java
index 585f567..296eeff 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AddOperationWrapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AddOperationWrapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.core;
@@ -30,6 +30,7 @@
import java.util.Map;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/BindOperation.java b/opendj3-server-dev/src/server/org/opends/server/core/BindOperation.java
index 15827a5..4f45633 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/BindOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/BindOperation.java
@@ -22,11 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
import org.opends.messages.Message;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
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 91463a1..75ec140 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
@@ -41,6 +41,7 @@
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PreParseBindOperation;
import org.opends.server.workflowelement.localbackend.LocalBackendBindOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/BindOperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/BindOperationWrapper.java
index 68869e7..efb682d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/BindOperationWrapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/BindOperationWrapper.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.core;
import org.opends.messages.Message;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/CompareOperation.java b/opendj3-server-dev/src/server/org/opends/server/core/CompareOperation.java
index 0aca96c..bf8cf92 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/CompareOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/CompareOperation.java
@@ -22,12 +22,14 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
import java.util.Set;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
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 b38a830..cf6dbf8 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.core;
@@ -42,6 +42,7 @@
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseCompareOperation;
import org.opends.server.types.operation.PreParseCompareOperation;
import org.opends.server.workflowelement.localbackend.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/CompareOperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/CompareOperationWrapper.java
index 740809c..70efa1c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/CompareOperationWrapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/CompareOperationWrapper.java
@@ -22,14 +22,14 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.core;
import java.util.Set;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
/**
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 a6c453c..8175608 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.core;
@@ -38,7 +38,6 @@
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
-
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/DefaultCompressedSchema.java b/opendj3-server-dev/src/server/org/opends/server/core/DefaultCompressedSchema.java
index 521ed5d..74b1de2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DefaultCompressedSchema.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DefaultCompressedSchema.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.core;
@@ -48,7 +48,7 @@
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperation.java b/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperation.java
index 9fc6b21..1857b3a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperation.java
@@ -22,10 +22,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Operation;
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 b71c619..ab8acef 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.core;
@@ -39,6 +39,7 @@
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseDeleteOperation;
import org.opends.server.types.operation.PreParseDeleteOperation;
import org.opends.server.workflowelement.localbackend.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationWrapper.java
index 9eaa17a..30d8a99 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationWrapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DeleteOperationWrapper.java
@@ -22,12 +22,12 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.core;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperation.java
index 656444e..3ebff93 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperation.java
@@ -22,11 +22,12 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
import org.opends.server.types.Operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
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 2d9a1f5..0cd4545 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.core;
@@ -41,6 +41,7 @@
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostOperationExtendedOperation;
import org.opends.server.types.operation.PostResponseExtendedOperation;
import org.opends.server.types.operation.PreOperationExtendedOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationWrapper.java
index c30193b..c4112b8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationWrapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ExtendedOperationWrapper.java
@@ -21,11 +21,11 @@
* CDDL HEADER END
*
*
- * Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.core;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This abstract class wraps/decorates a given extended operation. This class
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperation.java b/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperation.java
index 4b775ac..f1a3148 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperation.java
@@ -22,12 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
import java.util.List;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.SubordinateModifyDNOperation;
/**
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 eb29825..e0dca96 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
@@ -39,6 +39,7 @@
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.loggers.debug.DebugTracer;
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.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationWrapper.java
index 002276c..ca4394e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationWrapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ModifyDNOperationWrapper.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.core;
import java.util.List;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This abstract class wraps/decorates a given moddn operation.
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperation.java b/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperation.java
index 150393b..6ff7c6b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperation.java
@@ -22,12 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
import java.util.List;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This interface defines an operation used to modify an entry in
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 53cb579..b0277c1 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.core;
@@ -42,6 +42,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.ByteString;
import org.opends.server.types.operation.PostResponseModifyOperation;
import org.opends.server.types.operation.PreParseModifyOperation;
import org.opends.server.workflowelement.localbackend.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationWrapper.java
index ea9305d..43a76c3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationWrapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/ModifyOperationWrapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.core;
@@ -30,6 +30,7 @@
import java.util.List;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
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 ae3fc61..273b5bb 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.core;
@@ -50,6 +50,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
+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 2f02f0a..22d2771 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
@@ -43,7 +43,7 @@
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java
index b94cc35..f2f1a56 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.core;
@@ -31,6 +31,7 @@
import org.opends.server.controls.MatchedValuesControl;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This interface defines an operation used to search for entries
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 62cd5f5..b4fba3c 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.core;
@@ -40,6 +40,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostResponseSearchOperation;
import org.opends.server.types.operation.PreParseSearchOperation;
import org.opends.server.types.operation.SearchEntrySearchOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java b/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java
index 882e388..3ab9c61 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SearchOperationWrapper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.core;
@@ -31,6 +31,7 @@
import org.opends.server.controls.MatchedValuesControl;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This abstract class wraps/decorates a given search operation.
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 02f5576..532e21e 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
@@ -45,7 +45,6 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
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 372f3af..de48420 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core.networkgroups;
@@ -40,7 +41,7 @@
import org.opends.server.api.QOSPolicyFactory;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.InitializationException;
import org.opends.server.types.RawFilter;
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 3f10e85..e4b7fa3 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
@@ -86,6 +86,7 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
This class implements the Directory Server cryptographic framework,
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 ece43cc..269dba4 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.crypto;
@@ -42,6 +42,8 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
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 0d4f8c4..3049460 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock, AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -35,6 +35,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import java.util.Arrays;
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 2ba8fc1..1b5715a 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -34,7 +34,7 @@
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
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 4a0983a..c8f7851 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock, AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -38,7 +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.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.opends.messages.MessageBuilder;
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 229bba1..663094d 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -33,6 +34,8 @@
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import static org.opends.messages.ExtensionMessages.*;
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 9d5ad25..1472aaa 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -35,6 +35,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import java.util.Arrays;
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 2afc227..30cdd83 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,7 +47,7 @@
import org.opends.server.core.PasswordPolicyState;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 37cdc29..f58054b 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -36,7 +36,7 @@
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
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 1631916..1538d50 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -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.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.opends.messages.MessageBuilder;
import static org.opends.server.util.StaticUtils.*;
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 5309a90..f7c6b50 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -32,7 +33,8 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
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 d475e1a..da8eed1 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -38,7 +38,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
-
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 876039f..7663bf4 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
@@ -66,6 +66,7 @@
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.tools.LDIFModify;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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/extensions/CryptPasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
index e94d4e9..4a0d552 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2013 ForgeRock AS
+ * Portions Copyright 2010-2014 ForgeRock AS
* Portions Copyright 2012 Dariusz Janny <dariusz.janny@gmail.com>
*/
package org.opends.server.extensions;
@@ -40,6 +40,8 @@
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.util.BSDMD5Crypt;
import org.opends.server.util.Crypt;
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 d2a7d91..899ddad 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
@@ -23,6 +23,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2011 profiq, s.r.o.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -43,7 +44,7 @@
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ExtensionMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
index 307e08e..121300b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -34,7 +35,6 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
import static org.opends.messages.CoreMessages.
ERR_DISK_SPACE_MONITOR_UPDATE_FAILED;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
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 f19a5d7..c301758 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
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -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.ByteString;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
index a9ee1c7..71aed76 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProvider.java
@@ -34,7 +34,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
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 24b0e3c..fbeeadf 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
@@ -37,7 +37,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
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 c62dd75..6596237 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -46,7 +47,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
-
import static org.opends.messages.ExtensionMessages.*;
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 093a70d..5e8b2c2 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,7 +43,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.ldap.LDAPClientConnection;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 7200776..f79625e 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
@@ -70,6 +70,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.ServerConstants;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
index 1cfcc6a..a739404 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
@@ -25,7 +25,7 @@
* Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.messages.Message;
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 fb22ef1..a638002 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -37,7 +37,8 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 9fe1b3c..ad9da8a 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
@@ -37,7 +37,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
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 a6781a3..0009bb3 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
@@ -38,7 +38,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
index 346bf69..f96b0c0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -35,7 +35,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
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 a693f63..119cd8a 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
@@ -57,6 +57,7 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.TimeThread;
import static org.opends.messages.ExtensionMessages.*;
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 af6f725..e700356 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -37,7 +38,7 @@
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.opends.messages.MessageBuilder;
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 1a19594..1d5fa9d 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -38,6 +38,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import static org.opends.messages.ExtensionMessages.*;
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 fad987d..f45d603 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
@@ -44,7 +44,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DebugLogLevel;
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 a56a371..c4ddf3a 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
@@ -38,7 +38,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 70dc632..bfe205f 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
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -43,6 +43,8 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import static org.opends.messages.ExtensionMessages.*;
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 6d0265a..33b45ef 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
@@ -40,7 +40,6 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
-
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 7536f71..f6f8190 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
@@ -54,7 +54,8 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
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 71dae79..e01a24a 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -47,7 +47,8 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 f9ba3d6..2ee166f 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
@@ -39,7 +39,6 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 92b18b2..7200d3b 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
@@ -51,6 +51,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+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 064d5e9..c1164c4 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -35,6 +35,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import java.util.Arrays;
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 d668382..7d9c6a4 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -42,7 +43,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 78efbf2..3c1fa69 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -48,7 +49,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
-
import static org.opends.messages.ExtensionMessages.*;
import org.opends.messages.Message;
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 18d9ba5..91fb635 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -37,7 +38,7 @@
RepeatedCharactersPasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.opends.messages.MessageBuilder;
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 ae30059..0ea2cb3 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
@@ -55,6 +55,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.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 3d85902..67d2421 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -38,6 +38,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
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 a8db68e..69fa3eb 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -40,6 +40,8 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import static org.opends.messages.ExtensionMessages.*;
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 b57cd39..aee8d86 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2010-2013 ForgeRock AS.
+ * Portions Copyright 2010-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -40,6 +40,8 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import static org.opends.messages.ExtensionMessages.*;
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 78991fd..8a6510f 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2013 ForgeRock AS.
+ * Portions Copyright 2010-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -40,6 +40,8 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import static org.opends.messages.ExtensionMessages.*;
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 d116a57..b0af529 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2013 ForgeRock AS.
+ * Portions Copyright 2010-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -40,6 +40,8 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import static org.opends.messages.ExtensionMessages.*;
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 fde5f60..229c5a4 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010-2013 ForgeRock AS.
+ * Portions Copyright 2010-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -40,6 +40,8 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import static org.opends.messages.ExtensionMessages.*;
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 f74fe3a..2956f44 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -32,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.ByteString;
import org.opends.server.util.LevenshteinDistance;
import org.opends.server.admin.std.server.SimilarityBasedPasswordValidatorCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
index 20a9ddf..46c31d4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
@@ -33,7 +33,7 @@
import java.util.ArrayList;
import java.util.Set;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
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 fd3a659..722d99b 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
@@ -49,7 +49,7 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryConfig;
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 9170e18..2670d75 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -36,7 +36,7 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
/**
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 d72cb85..3cbd68f 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,7 +41,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 fa3412d..a4d9340 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -36,7 +36,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
/**
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 0d32758..ddfaa4c 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -35,6 +35,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import java.util.Arrays;
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 87c5391..e68fbbf 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
import org.opends.messages.Message;
@@ -37,7 +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.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import org.opends.messages.MessageBuilder;
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 ca43666..b5258d5 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -38,7 +38,7 @@
import org.opends.server.core.ExtendedOperation;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
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 c80aa8c..8d9ec9d 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
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.loggers;
@@ -53,6 +53,7 @@
import org.opends.server.core.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This class provides the base implementation of the access loggers used by the
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 909ec1f..6767efd 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.ByteString;
import org.opends.server.util.TimeThread;
import static org.opends.messages.ConfigMessages.*;
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 fa52389..bd4e3f3 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.loggers;
@@ -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.ByteSequence;
import org.opends.server.util.Base64;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
diff --git a/opendj3-server-dev/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java b/opendj3-server-dev/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
index 4496a61..953563d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.monitors;
@@ -45,7 +46,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
import com.sleepycat.je.DatabaseException;
import com.sleepycat.je.EnvironmentStats;
import com.sleepycat.je.JEVersion;
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 341e454..602bc96 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
@@ -43,6 +43,7 @@
import org.opends.server.api.plugin.*;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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/LastModPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
index bffd910..7016221 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -42,6 +43,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PreOperationAddOperation;
import org.opends.server.types.operation.PreOperationModifyOperation;
import org.opends.server.types.operation.PreOperationModifyDNOperation;
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 0597ef9..83ce524 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
@@ -62,6 +62,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
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 f148ad2..4a88ca1 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
@@ -61,6 +61,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.ByteString;
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 e216f74..df62be9 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,8 @@
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.operation.PreParseAddOperation;
import org.opends.server.types.operation.PreParseModifyOperation;
import org.opends.server.types.operation.PreParseModifyDNOperation;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1.java
index 8596fb9..61415d8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.protocols.asn1;
@@ -34,10 +34,10 @@
import java.io.OutputStream;
import java.nio.channels.ReadableByteChannel;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
-import org.opends.server.types.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReader.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReader.java
index a149f78..205919e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReader.java
@@ -22,13 +22,13 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.protocols.asn1;
-import org.opends.server.types.ByteSequenceReader;
-import org.opends.server.types.ByteStringBuilder;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
import java.nio.ByteBuffer;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.IllegalBlockingModeException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java
index 8d586e9..d6f09cb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReader.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 Forgerock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.protocols.asn1;
@@ -33,9 +33,9 @@
import java.io.IOException;
import org.opends.messages.Message;
-import org.opends.server.types.ByteSequenceReader;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Exception.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
index df665bd..f234a28 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
@@ -22,8 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.asn1;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java
index 1f32c50..be4371f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.protocols.asn1;
@@ -36,8 +36,8 @@
import org.opends.messages.Message;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.util.SizeLimitInputStream;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriter.java
index 2f4991d..3e7eb97 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriter.java
@@ -22,18 +22,19 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.protocols.asn1;
+
import static org.opends.server.protocols.asn1.ASN1Constants.*;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.util.StaticUtils;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Reader.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
index d14d8f9..0568e07 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
@@ -22,17 +22,18 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 Forgerock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.protocols.asn1;
+
import java.io.Closeable;
import java.io.IOException;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Writer.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
index 35f496e..4a400c8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
@@ -22,12 +22,14 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.asn1;
-import org.opends.server.types.ByteSequence;
+
+import org.forgerock.opendj.ldap.ByteSequence;
import java.io.Closeable;
import java.io.IOException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ByteSequenceOutputStream.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ByteSequenceOutputStream.java
index 9e47cfb..64eb844 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ByteSequenceOutputStream.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ByteSequenceOutputStream.java
@@ -22,11 +22,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.protocols.asn1;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import java.io.OutputStream;
import java.io.IOException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/package-info.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/package-info.java
index 1fa6663..ac6f57f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/package-info.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/package-info.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
@@ -47,3 +48,4 @@
stability=org.opends.server.types.StabilityLevel.UNCOMMITTED)
package org.opends.server.protocols.asn1;
+
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 26dc3a3..17c21ea 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
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.protocols.http;
@@ -93,7 +93,7 @@
import org.opends.server.protocols.ldap.SearchRequestProtocolOp;
import org.opends.server.protocols.ldap.UnbindRequestProtocolOp;
import org.opends.server.types.AuthenticationInfo;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DisconnectReason;
import org.opends.server.types.Operation;
@@ -269,7 +269,7 @@
final int messageID = nextMessageID.getAndIncrement();
AddOperationBasis operation =
new AddOperationBasis(clientConnection, messageID, messageID,
- to(request.getControls()), to(valueOf(request.getName())),
+ to(request.getControls()), valueOf(request.getName()),
to(request.getAllAttributes()));
return enqueueOperation(operation, resultHandler);
@@ -293,8 +293,8 @@
byte[] password = ((SimpleBindRequest) request).getPassword();
BindOperationBasis operation =
new BindOperationBasis(clientConnection, messageID, messageID,
- to(request.getControls()), "3", to(userName), ByteString
- .wrap(password));
+ to(request.getControls()), "3", ByteString.valueOf(userName),
+ ByteString.wrap(password));
return enqueueOperation(operation, resultHandler);
}
@@ -336,9 +336,9 @@
final int messageID = nextMessageID.getAndIncrement();
CompareOperationBasis operation =
new CompareOperationBasis(clientConnection, messageID, messageID,
- to(request.getControls()), to(valueOf(request.getName())),
+ to(request.getControls()), valueOf(request.getName()),
request.getAttributeDescription().getAttributeType().getOID(),
- to(request.getAssertionValue()));
+ request.getAssertionValue());
return enqueueOperation(operation, resultHandler);
}
@@ -352,7 +352,7 @@
final int messageID = nextMessageID.getAndIncrement();
DeleteOperationBasis operation =
new DeleteOperationBasis(clientConnection, messageID, messageID,
- to(request.getControls()), to(valueOf(request.getName())));
+ to(request.getControls()), valueOf(request.getName()));
return enqueueOperation(operation, resultHandler);
}
@@ -368,7 +368,7 @@
ExtendedOperationBasis operation =
new ExtendedOperationBasis(this.clientConnection, messageID, messageID,
to(request.getControls()), request.getOID(),
- to(request.getValue()));
+ request.getValue());
return enqueueOperation(operation, resultHandler);
}
@@ -444,7 +444,7 @@
final int messageID = nextMessageID.getAndIncrement();
SearchOperationBasis operation =
new SearchOperationBasis(clientConnection, messageID, messageID,
- to(request.getControls()), to(valueOf(request.getName())),
+ to(request.getControls()), valueOf(request.getName()),
to(request.getScope()), to(request.getDereferenceAliasesPolicy()),
request.getSizeLimit(), request.getTimeLimit(),
request.isTypesOnly(), to(request.getFilter()),
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 d03023c..3434b0b 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
@@ -38,6 +38,7 @@
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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/InternalLDAPInputStream.java b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPInputStream.java
index d0e6a78..c0db00b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPInputStream.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalLDAPInputStream.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.internal;
@@ -34,8 +35,8 @@
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.ldap.LDAPMessage;
-import org.opends.server.types.ByteSequenceReader;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
/**
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 ba08f81..8138db3 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.internal;
@@ -38,6 +39,9 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.ldap.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
index 881de72..98e98cf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.protocols.internal;
@@ -33,6 +33,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.core.SearchOperationBasis;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This class defines a subclass of the core search operation that is
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 dc62882..9481a04 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
@@ -44,7 +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.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 cf6c911..fdc716a 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
@@ -44,6 +44,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* A <code>RMIAuthenticator</code> manages authentication for the secure
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
index 38798d8..f8c6c42 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -33,7 +33,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.RawAttribute;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
index 989e80a..9ce7349 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -30,7 +31,7 @@
import org.opends.server.protocols.asn1.*;
import org.opends.server.types.AuthenticationType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
@@ -335,7 +336,7 @@
buffer.append(indentBuf);
buffer.append(" SASL Credentials:");
buffer.append(EOL);
- saslCredentials.toHexPlusAscii(buffer, indent+4);
+ buffer.append(saslCredentials.toHexPlusAsciiString(indent+4));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
index dfe7d62..00a9475 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.opends.messages.Message;
@@ -33,7 +34,7 @@
import org.opends.server.protocols.asn1.*;
import org.opends.server.types.DN;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
@@ -399,7 +400,7 @@
buffer.append(" Server SASL Credentials:");
buffer.append(EOL);
- serverSASLCredentials.toHexPlusAscii(buffer, indent+4);
+ buffer.append(serverSASLCredentials.toHexPlusAsciiString(indent+4));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
index ff4dc61..17ba68c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -29,7 +30,7 @@
import java.io.IOException;
import org.opends.server.protocols.asn1.*;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
@@ -209,7 +210,7 @@
buffer.append(indentBuf);
buffer.append(" Assertion Value:");
buffer.append(EOL);
- assertionValue.toHexPlusAscii(buffer, indent+4);
+ buffer.append(assertionValue.toHexPlusAsciiString(indent+4));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
index 54fb5f8..f90a7ed 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
index 735d661..8f7aa42 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -29,7 +30,7 @@
import java.io.IOException;
import org.opends.server.protocols.asn1.*;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
@@ -206,7 +207,7 @@
buffer.append(indentBuf);
buffer.append(" Value:");
buffer.append(EOL);
- value.toHexPlusAscii(buffer, indent+4);
+ buffer.append(value.toHexPlusAsciiString(indent+4));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
index de4c43e..34ced77 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.opends.messages.Message;
@@ -33,7 +34,7 @@
import org.opends.server.protocols.asn1.*;
import org.opends.server.types.DN;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
index 2bd26dc..d1cb241 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -29,7 +30,7 @@
import java.io.IOException;
import org.opends.server.protocols.asn1.*;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
@@ -214,7 +215,7 @@
buffer.append(indentBuf);
buffer.append(" Value:");
buffer.append(EOL);
- value.toHexPlusAscii(buffer, indent+4);
+ buffer.append(value.toHexPlusAsciiString(indent+4));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
index 835385e..1308adf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -35,6 +35,7 @@
import org.opends.messages.Message;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This class defines the data structures and methods to use when interacting
@@ -352,7 +353,7 @@
for (ByteString value : values)
{
- value.toHexPlusAscii(buffer, indent+4);
+ buffer.append(value.toHexPlusAsciiString(indent+4));
}
}
}
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 ff867f7..e0ebed6 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2010-2013 ForgeRock AS.
+ * Portions Copyright 2010-2014 ForgeRock AS.
*/
package org.opends.server.protocols.ldap;
@@ -70,6 +70,8 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.TimeThread;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPControl.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPControl.java
index 346b8d0..b12109f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPControl.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -30,7 +31,7 @@
import org.opends.server.protocols.asn1.*;
import org.opends.server.types.Control;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.util.ServerConstants.*;
@@ -142,7 +143,7 @@
if (value != null)
{
buffer.append(", value=");
- value.toHexPlusAscii(buffer, 4);
+ buffer.append(value.toHexPlusAsciiString(4));
}
buffer.append(")");
@@ -183,7 +184,7 @@
{
buffer.append(indentBuf);
buffer.append(" Value:");
- value.toHexPlusAscii(buffer, indent+4);
+ buffer.append(value.toHexPlusAsciiString(indent+4));
}
}
}
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 25579aa..e611815 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.opends.messages.Message;
@@ -37,7 +38,8 @@
import org.opends.server.api.MatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.ProtocolMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
index 6f3da7a..5b9775e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
@@ -29,6 +29,7 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
index 3fd3443..fcd702f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -29,7 +30,7 @@
import java.io.IOException;
import org.opends.server.protocols.asn1.*;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
index 321e5c5..6a71140 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -33,7 +33,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.RawModification;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
index 58b8fc0..8695f6e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -33,7 +33,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.RawFilter;
import org.opends.server.types.SearchScope;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
index 5c87526..e6cf8af 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
@@ -46,7 +46,7 @@
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LDAPException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/common/CSN.java b/opendj3-server-dev/src/server/org/opends/server/replication/common/CSN.java
index 0460b7e..932cb1e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/common/CSN.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/common/CSN.java
@@ -22,17 +22,17 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.replication.common;
import java.io.Serializable;
import java.util.Date;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteSequenceReader;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
/**
* Class used to represent Change Sequence Numbers.
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 885bcc9..d03e4a4 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.common;
@@ -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.ByteString;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.ExtensionMessages.*;
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 f2be9b8..c7e9bdd 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.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
import static org.opends.messages.ExtensionMessages.*;
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 ba11c9b..11fcadd 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.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
import static org.opends.messages.ExtensionMessages.*;
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 2f70c47..014133c 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.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/ServerState.java b/opendj3-server-dev/src/server/org/opends/server/replication/common/ServerState.java
index 81cb59d..d24f54f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/common/ServerState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/common/ServerState.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.common;
@@ -36,7 +36,7 @@
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.replication.protocol.ProtocolVersion;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.StaticUtils;
/**
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 288c209..b90eeeb 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
@@ -39,7 +39,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.plugin.LDAPReplicationDomain.*;
import org.opends.server.types.*;
-
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.replication.plugin.LDAPReplicationDomain.*;
import static org.opends.server.util.StaticUtils.*;
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 5acd6b1..fee0b3d 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -35,6 +35,9 @@
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequence;
/**
* Used to establish an order between historical information and index them.
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 e13e9ea..efbbc3d 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
@@ -67,6 +67,7 @@
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
import org.opends.server.tasks.TaskUtils;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.*;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.TimeThread;
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 d1797cc..d266070 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
@@ -41,7 +41,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.ByteString;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
index e5784cf..a02ac36 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
@@ -22,12 +22,12 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.opends.server.controls.ControlDecoder;
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 50017ae..cd4fb84 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -43,6 +43,8 @@
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/protocol/ChangeTimeHeartbeatMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ChangeTimeHeartbeatMsg.java
index f702e8b..d2a9d7f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ChangeTimeHeartbeatMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ChangeTimeHeartbeatMsg.java
@@ -22,16 +22,16 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.replication.protocol;
import java.util.zip.DataFormatException;
import org.opends.server.replication.common.CSN;
-import org.opends.server.types.ByteSequenceReader;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
/**
* Class that define messages sent by a replication domain (DS) to the
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java
index 8018215..daba2f5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java
@@ -40,6 +40,9 @@
import org.opends.server.replication.common.AssuredMode;
import org.opends.server.replication.common.CSN;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
import org.opends.server.types.operation.*;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyCommonMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyCommonMsg.java
index 9b930ba..1b3ef2a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyCommonMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyCommonMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -38,6 +38,7 @@
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.plugin.EntryHistorical;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
/**
* This class holds every common code for the modify messages (mod, moddn).
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
index ade8077..ca2e247 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
@@ -36,6 +36,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.common.CSN;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostOperationModifyDNOperation;
import static org.opends.server.replication.protocol.OperationContext.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyMsg.java
index aac9cbd..e9c5dc3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ModifyMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -36,6 +36,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.replication.common.CSN;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostOperationModifyOperation;
import static org.opends.server.replication.protocol.OperationContext.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java
index 9b55637..5376e52 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.replication.protocol;
@@ -39,9 +39,9 @@
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.types.ByteSequenceReader;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
/**
* This message is part of the replication protocol.
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/StartSessionMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/StartSessionMsg.java
index 87913ce..960cd6c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/StartSessionMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/StartSessionMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -37,9 +37,9 @@
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.replication.common.AssuredMode;
import org.opends.server.replication.common.ServerStatus;
-import org.opends.server.types.ByteSequenceReader;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.StaticUtils;
/**
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 d1264a1..13197d6 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -33,7 +33,6 @@
import org.opends.server.replication.common.*;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
-
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 e0a4e76..f749d9d 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -42,7 +42,6 @@
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.types.*;
-
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 b9990c7..8361052 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
@@ -52,6 +52,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.ByteString;
import org.opends.server.util.*;
import org.forgerock.util.Reject;
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 9121ec8..86fed9b 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -49,7 +49,6 @@
import org.opends.server.replication.server.changelog.api.DBCursor;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.types.*;
-
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 c5d2213..f857883 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -39,7 +39,6 @@
import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
-
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 c7efe83..639a822 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -43,7 +43,6 @@
import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.*;
import org.opends.server.types.*;
-
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
index 5f1b63e..db87b8f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
@@ -46,7 +46,6 @@
import org.opends.server.replication.server.changelog.api.*;
import org.opends.server.replication.server.changelog.je.DraftCNDB.*;
import org.opends.server.types.*;
-
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
index a0554ff..2c4de2d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
@@ -40,7 +40,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 05e1ac5..14d7a59 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -48,6 +48,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
index 2f123b3..cfee022 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -37,8 +38,8 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
index 2d8e565..6c80e72 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -37,8 +38,8 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
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 c5fc51a..306fe35 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -41,7 +41,7 @@
import org.opends.server.types.ResultCode;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
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 bee9485..10d390a 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -33,7 +33,8 @@
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 static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
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 888463e..f778e3a 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -37,8 +38,8 @@
import org.opends.messages.Message;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
index 0f92a20..286e42e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
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 9e56414..804b3bd 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -37,8 +38,8 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
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 547161a..9881018 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -41,7 +41,8 @@
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
index 0df66bc..5119ab3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
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 a7d82bc..63ff83f 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,8 +39,8 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
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 7a0f744..81a3a3a 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -37,8 +38,8 @@
import org.opends.messages.Message;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
index 74a8f59..2e4bfec 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -35,8 +36,8 @@
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
index e21d322..365b1f4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
index 1cd531e..47e3601 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
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 10c1e1e..dde1334 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,8 +39,8 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
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 3f2cec6..3f265c4 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,8 +39,8 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
index 5deae9f..75e251d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
index 5fee581..71f1cd5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
index db3584d..e3d028b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -35,8 +36,8 @@
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
index e257d0e..a698dc5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
index 0eedc24..8465fb9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
index 9c52346..df0fc50 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
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 93285aa..188255a 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 Forgerock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -39,7 +39,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.ResultCode;
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 00b87de..d2a4d5b 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -58,8 +58,8 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
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 4700f0f..c2c1400 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
* Portions Copyright 2012 Manuel Gaupp
*/
package org.opends.server.schema;
@@ -39,7 +39,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.ResultCode;
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 f3998ab..ce0dfbf 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -46,6 +46,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
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 f4d4259..a7db6c7 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -46,6 +46,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
index 689dd11..b62453d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -39,7 +39,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
index 3f95a46..8931ef2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
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 adc71d5..9c32450 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -44,7 +44,7 @@
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
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 8021045..c0c0b34 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
@@ -41,8 +41,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.AcceptRejectWarn;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
index 7a03cf3..6b336f6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -42,6 +42,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
index a787cb3..448e167 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -35,8 +36,8 @@
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
index e24b984..04fe97f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
index 712ebd6..8600cf5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,7 +38,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
index f2cd269..8e1ab4c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
index bfd4689..0e8690c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -37,8 +38,8 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
index 52c38a9..cfd8b23 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,8 +39,8 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
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 89c14ea..d4c6c93 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
@@ -23,7 +23,7 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
* Portions Copyright 2009 D. J. Hagberg, Millibits Consulting, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -46,7 +46,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
index 1480cdc..c9b699d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
index 37ba96a..19f1841 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -37,7 +37,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
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 37eaf89..40a2e9b 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -37,8 +38,8 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
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 69f3334..2690c39 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,8 +39,8 @@
import org.opends.messages.Message;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
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 385b73a..1ec0718 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,8 +39,8 @@
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
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 e7322d5..466f1b9 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -41,7 +41,8 @@
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
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 4e26338..e13da64 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*
*/
package org.opends.server.schema;
@@ -40,7 +40,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.ResultCode;
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 24715a4..911c7a8 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -47,12 +47,12 @@
import org.opends.messages.Message;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.messages.MessageBuilder;
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.config.ConfigException;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
import org.opends.server.types.CommonSchemaElements;
import org.opends.server.types.DirectoryException;
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 39c64d3..4e3913f 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -43,6 +43,7 @@
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
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 23be07c..b2714e5 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -47,6 +47,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index 53135dd..c2f6ed4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -44,7 +44,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.loggers.ErrorLogger.*;
import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
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 62763aa..9228738 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -46,6 +46,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
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 3e9eb80..f1a8d0f 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -39,8 +40,8 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
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 4bd14b2..870e860 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -40,8 +41,8 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;
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 6e061a3..4e5c534 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -39,8 +40,8 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
index b0ab3d4..c756145 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
index 9d12949..3c95f62 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
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 c509b8e..84f424b 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -48,7 +48,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
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 6dc99ec..f0f59e5 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -41,8 +42,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.NameForm;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
index 25bc5b3..4d48e2f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,8 +39,8 @@
import org.opends.server.api.MatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.NameForm;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
index bfa1ae5..31c2d2a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -33,8 +34,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
index 6ab3cf7..616ca51 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import org.opends.server.api.AbstractMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
index 1b13653..16a4d59 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -33,8 +34,8 @@
import java.util.Collections;
import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
index 3939623..976d77e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
index 9378d3d..fdbff3c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
index b6ca2a5..85ed1aa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
index 18bbf75..1086863 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
index bb91ab9..c0372ab 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
index 491499c..e2a5e05 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
index 5e65c0b..d31b320 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
index 7842062..83a4d14 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/StringPrepProfile.java b/opendj3-server-dev/src/server/org/opends/server/schema/StringPrepProfile.java
index 50147d6..1286fda 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/StringPrepProfile.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/StringPrepProfile.java
@@ -32,7 +32,7 @@
import java.util.HashSet;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.forgerock.util.Reject.*;
import org.opends.server.util.Platform;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
index cbe1a28..4a65e13 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
index f7a617d..c16b9cd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.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.ByteSequence;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
index 8d9d38d..8bca200 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
index 6526acc..6e89c1a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
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 62d2e79..b117f15 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,8 +36,8 @@
import org.opends.messages.Message;
import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
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 66d5b03..ae844a8 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -44,7 +44,7 @@
import org.opends.server.types.ResultCode;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index f3b59ad..7956c87 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,7 +38,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
index e1ba724..455c4b4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
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 22de3b0..6d18aa3 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
@@ -52,9 +52,9 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.IndexConfig;
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 498def2..0efa7c3 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -45,7 +45,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.loggers.ErrorLogger.*;
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 d99124e..8eaf177 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -37,8 +38,8 @@
import org.opends.messages.Message;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
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 318c573..20cbb20 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -38,8 +39,8 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
index f827d61..7f92e36 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -36,7 +36,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
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 75cdbcc..ef95f32 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
@@ -41,8 +41,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
index 29d35a9..255001d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -37,8 +38,8 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
index b39169d..cf980da 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -33,8 +34,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.StaticUtils;
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 ed3d9c3..66e2686 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.messages.Message;
@@ -40,7 +40,7 @@
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
index 5bd0f44..c2cf579 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -34,8 +35,8 @@
import java.util.Collections;
import org.opends.server.api.EqualityMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
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 6ff846d..52c1cb1 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,7 +43,6 @@
import org.opends.server.core.SchemaConfigManager;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
-
import static org.opends.messages.TaskMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
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 92ae741..8d068ac 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tasks;
import org.opends.messages.Message;
@@ -34,7 +35,6 @@
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
import static org.opends.messages.TaskMessages.*;
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 d944520..b6b7d8d 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,7 +36,6 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.types.*;
-
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/LeaveLockdownModeTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/LeaveLockdownModeTask.java
index 5b2f5b0..59ca19f 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tasks;
import org.opends.messages.Message;
@@ -34,7 +35,6 @@
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
import static org.opends.messages.TaskMessages.*;
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 d9dc606..0c00547 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
@@ -57,6 +57,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.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
index 887a63b..ea63095 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.tools;
@@ -57,7 +57,7 @@
import org.opends.server.tools.tasks.TaskTool;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java b/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java
index 27588e8..7341ff6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java
@@ -44,6 +44,8 @@
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.args.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java b/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
index 9f57408..e34b0c9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
@@ -56,6 +56,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.args.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
index 5f0596f..943e619 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
@@ -48,6 +48,7 @@
import org.opends.server.loggers.debug.TextDebugLogPublisher;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
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 02b9af6..f8f2aca 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
@@ -62,7 +62,7 @@
import org.opends.server.tools.makeldif.TemplateFile;
import org.opends.server.tools.tasks.TaskTool;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ExistingFileBehavior;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
index 013c85e..8d7323d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.tools;
import org.opends.messages.Message;
@@ -65,8 +65,8 @@
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.LDAPException;
import org.opends.server.types.Control;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.Base64;
import org.opends.server.util.PasswordReader;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
index a63e0ee..d012a82 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.tools;
import java.io.BufferedReader;
@@ -48,6 +48,7 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.Base64;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.PasswordReader;
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 1ac22af..3e49937 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.tools;
import java.io.IOException;
@@ -49,7 +49,7 @@
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.UnbindRequestProtocolOp;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
index 0590538..f450312 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.tools;
import org.opends.admin.ads.util.ConnectionUtils;
@@ -45,6 +45,7 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.ProtocolOp;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.PasswordReader;
import org.opends.server.util.args.ArgumentException;
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 4131f40..86969d7 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
@@ -23,7 +23,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2012 profiq, s.r.o.
- * Portions Copyright 2012-2013 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.tools;
import org.opends.admin.ads.util.ConnectionUtils;
@@ -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.ByteString;
import org.opends.server.util.AddChangeRecordEntry;
import org.opends.server.util.ChangeRecordEntry;
import org.opends.server.util.EmbeddedUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
index 1756ac0..d59931c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -45,6 +45,8 @@
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.protocols.ldap.UnbindRequestProtocolOp;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.ArgumentParser;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java
index c7f2ddd..902e729 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -31,7 +32,7 @@
import org.opends.server.types.LDAPException;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.RecordingInputStream;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import org.opends.server.loggers.debug.DebugTracer;
@@ -111,7 +112,7 @@
builder.append(bytesRead.length());
builder.append("):");
builder.append(ServerConstants.EOL);
- bytesRead.toHexPlusAscii(builder, 4);
+ builder.append(bytesRead.toHexPlusAsciiString(4));
TRACER.debugProtocolElement(DebugLogLevel.VERBOSE, builder.toString());
TRACER.debugProtocolElement(DebugLogLevel.VERBOSE, message.toString());
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
index 54c2259..3ac40f2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -51,7 +51,7 @@
import org.opends.server.util.args.StringArgument;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPToolUtils.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPToolUtils.java
index 0bb532e..c545168 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPToolUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPToolUtils.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.tools;
import org.opends.messages.Message;
@@ -37,7 +37,7 @@
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.DN;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPWriter.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPWriter.java
index 8f50cee..28fd875 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPWriter.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -34,7 +35,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.RecordingOutputStream;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.ServerConstants;
import java.net.Socket;
@@ -106,7 +107,7 @@
builder.append(bytesRead.length());
builder.append("):");
builder.append(ServerConstants.EOL);
- bytesRead.toHexPlusAscii(builder, 4);
+ builder.append(bytesRead.toHexPlusAsciiString(4));
TRACER.debugProtocolElement(DebugLogLevel.VERBOSE, builder.toString());
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java b/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java
index 639a251..20d5f1e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -45,7 +45,7 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.NullOutputStream;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.args.Argument;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
index 7806018..162e4f7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
@@ -57,6 +57,7 @@
import org.opends.server.tasks.RebuildTask;
import org.opends.server.tools.tasks.TaskTool;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.api.Backend;
import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.api.DebugLogPublisher;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
index 4717755..f1c939f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.tools;
import org.opends.messages.Message;
@@ -53,6 +53,7 @@
import org.opends.server.loggers.debug.TextDebugLogPublisher;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java b/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
index 421be6d..a9b1cbb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.tools;
@@ -54,6 +54,7 @@
import org.opends.server.tasks.ShutdownTask;
import org.opends.server.tools.tasks.TaskTool;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.args.Argument;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.ArgumentParser;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java
index 7b1f2817..87c7924 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalScheduleInformation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools.dsreplication;
@@ -34,7 +35,7 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.tools.tasks.TaskScheduleInformation;
import org.opends.server.tools.tasks.TaskScheduleUserData;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.RawAttribute;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java
index ae25d15..bbc5bd6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/PurgeHistoricalUserData.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools.dsreplication;
@@ -38,7 +39,7 @@
import org.opends.server.admin.client.cli.TaskScheduleArgs;
import org.opends.server.tools.tasks.TaskClient;
import org.opends.server.tools.tasks.TaskScheduleUserData;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.RawAttribute;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/TemplateEntry.java b/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
index f5b492e..42b1139 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
@@ -36,6 +36,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.LDIFException;
import static org.opends.server.util.LDIFWriter.appendLDIFSeparatorAndValue;
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 f699ada..5b947ec 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.tools.tasks;
@@ -62,7 +63,7 @@
import org.opends.server.tools.LDAPConnection;
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AbstractAttribute.java b/opendj3-server-dev/src/server/org/opends/server/types/AbstractAttribute.java
index 6aeeb28..17c219e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AbstractAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AbstractAttribute.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import static org.opends.server.util.StaticUtils.*;
import java.util.Collection;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java b/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java
index 9037672..41596ef 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotification.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.types;
-
-
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationProperty.java b/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationProperty.java
index a85cf49..6fd6076 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationProperty.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationProperty.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.types;
-
-
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationType.java b/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationType.java
index f743324..81d8c5e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationType.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AccountStatusNotificationType.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AdditionalLogItem.java b/opendj3-server-dev/src/server/org/opends/server/types/AdditionalLogItem.java
index 283db76..3d7dd14 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AdditionalLogItem.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AdditionalLogItem.java
@@ -25,8 +25,6 @@
*/
package org.opends.server.types;
-
-
import org.forgerock.util.Reject;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AddressMask.java b/opendj3-server-dev/src/server/org/opends/server/types/AddressMask.java
index db1b1ea..7548b52 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AddressMask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AddressMask.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import static org.opends.messages.ProtocolMessages.*;
import java.net.Inet6Address;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Attribute.java b/opendj3-server-dev/src/server/org/opends/server/types/Attribute.java
index f2b9d64..1a94067 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Attribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/Attribute.java
@@ -22,11 +22,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java b/opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java
index d4ce5d6..9e7a001 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java
@@ -26,7 +26,8 @@
*/
package org.opends.server.types;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AttributeType.java b/opendj3-server-dev/src/server/org/opends/server/types/AttributeType.java
index 911e96f..6d9da79 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AttributeType.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AttributeType.java
@@ -26,7 +26,7 @@
*/
package org.opends.server.types;
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Collection;
import java.util.List;
import java.util.Map;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AttributeValue.java b/opendj3-server-dev/src/server/org/opends/server/types/AttributeValue.java
index a7f73f6..ec331de 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AttributeValue.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AttributeValue.java
@@ -22,9 +22,12 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
+
/**
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 fddce64..7502ec8 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
@@ -22,9 +22,13 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
+
+
import static org.opends.messages.CoreMessages.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Attributes.java b/opendj3-server-dev/src/server/org/opends/server/types/Attributes.java
index 8cd90f0..ea422d5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Attributes.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/Attributes.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import static org.opends.server.util.StaticUtils.*;
import java.util.Collection;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java b/opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java
index 05a8a8e..e9a92d9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/AuthenticationInfo.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
import static org.forgerock.util.Reject.*;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/BackupDirectory.java b/opendj3-server-dev/src/server/org/opends/server/types/BackupDirectory.java
index 8197d62..29f992f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/BackupDirectory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/BackupDirectory.java
@@ -25,6 +25,7 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/BackupInfo.java b/opendj3-server-dev/src/server/org/opends/server/types/BackupInfo.java
index 8ac63ea..7029229 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/BackupInfo.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/BackupInfo.java
@@ -22,8 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/ByteSequence.java b/opendj3-server-dev/src/server/org/opends/server/types/ByteSequence.java
index 177d93d..0c22dc1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/ByteSequence.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/ByteSequence.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.types;
+
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/ByteSequenceReader.java b/opendj3-server-dev/src/server/org/opends/server/types/ByteSequenceReader.java
index 3113b15..a3deed3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/ByteSequenceReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/ByteSequenceReader.java
@@ -22,11 +22,13 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
/**
* An interface for iteratively reading date from a
* {@link ByteSequence}. {@code ByteSequenceReader} must be created
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/ByteString.java b/opendj3-server-dev/src/server/org/opends/server/types/ByteString.java
index d7a2e9f..9e4e36e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/ByteString.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/ByteString.java
@@ -22,15 +22,12 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.types;
-
import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.util.ServerConstants.*;
-
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
@@ -617,7 +614,7 @@
* @return A string representation of the contents of this byte
* sequence using hexadecimal characters.
*/
- public String toHex()
+ public String toHexString()
{
StringBuilder builder = new StringBuilder((length - 1) * 3 + 2);
builder.append(StaticUtils.byteToHex(buffer[offset]));
@@ -631,104 +628,6 @@
return builder.toString();
}
-
-
- /**
- * Appends a string representation of the data in this byte sequence
- * to the given buffer using the specified indent.
- * <p>
- * The data will be formatted with sixteen hex bytes in a row
- * followed by the ASCII representation, then wrapping to a new line
- * as necessary. The state of the byte buffer is not changed.
- *
- * @param builder
- * The buffer to which the information is to be appended.
- * @param indent
- * The number of spaces to indent the output.
- */
- public void toHexPlusAscii(StringBuilder builder, int indent)
- {
- StringBuilder indentBuf = new StringBuilder(indent);
- for (int i = 0; i < indent; i++)
- {
- indentBuf.append(' ');
- }
-
- int pos = 0;
- while ((length - pos) >= 16)
- {
- StringBuilder asciiBuf = new StringBuilder(17);
-
- byte currentByte = buffer[offset + pos];
- builder.append(indentBuf);
- builder.append(StaticUtils.byteToHex(currentByte));
- asciiBuf.append(StaticUtils.byteToASCII(currentByte));
- pos++;
-
- for (int i = 1; i < 16; i++, pos++)
- {
- currentByte = buffer[offset + pos];
- builder.append(' ');
- builder.append(StaticUtils.byteToHex(currentByte));
- asciiBuf.append(StaticUtils.byteToASCII(currentByte));
-
- if (i == 7)
- {
- builder.append(" ");
- asciiBuf.append(' ');
- }
- }
-
- builder.append(" ");
- builder.append(asciiBuf);
- builder.append(EOL);
- }
-
- int remaining = (length - pos);
- if (remaining > 0)
- {
- StringBuilder asciiBuf = new StringBuilder(remaining + 1);
-
- byte currentByte = buffer[offset + pos];
- builder.append(indentBuf);
- builder.append(StaticUtils.byteToHex(currentByte));
- asciiBuf.append(StaticUtils.byteToASCII(currentByte));
- pos++;
-
- for (int i = 1; i < 16; i++, pos++)
- {
- builder.append(' ');
-
- if (i < remaining)
- {
- currentByte = buffer[offset + pos];
- builder.append(StaticUtils.byteToHex(currentByte));
- asciiBuf.append(StaticUtils.byteToASCII(currentByte));
- }
- else
- {
- builder.append(" ");
- }
-
- if (i == 7)
- {
- builder.append(" ");
-
- if (i < remaining)
- {
- asciiBuf.append(' ');
- }
- }
- }
-
- builder.append(" ");
- builder.append(asciiBuf);
- builder.append(EOL);
- }
- }
-
-
-
/**
* Returns the integer value represented by the first four bytes of
* this byte string in big-endian order.
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/ByteStringBuilder.java b/opendj3-server-dev/src/server/org/opends/server/types/ByteStringBuilder.java
index e6010a3..e097dc1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/ByteStringBuilder.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/ByteStringBuilder.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.types;
+
import static org.opends.server.loggers.debug.DebugLogger.*;
import java.io.IOException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java b/opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java
index b9b7083..9faab0a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/CacheEntry.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.types;
-
-
import org.opends.server.api.Backend;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/CancelRequest.java b/opendj3-server-dev/src/server/org/opends/server/types/CancelRequest.java
index 0901b6a..9268bb8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/CancelRequest.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/CancelRequest.java
@@ -22,8 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/CanceledOperationException.java b/opendj3-server-dev/src/server/org/opends/server/types/CanceledOperationException.java
index cb972dc..7fc4ba0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/CanceledOperationException.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/CanceledOperationException.java
@@ -22,8 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/CollectiveVirtualAttribute.java b/opendj3-server-dev/src/server/org/opends/server/types/CollectiveVirtualAttribute.java
index bcc2211..d4684fc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/CollectiveVirtualAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/CollectiveVirtualAttribute.java
@@ -22,10 +22,12 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
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 0b9b87e..9e7fff2 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
@@ -22,8 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/DITContentRule.java b/opendj3-server-dev/src/server/org/opends/server/types/DITContentRule.java
index be8bcbf..fcdeeee 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/DITContentRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/DITContentRule.java
@@ -26,8 +26,7 @@
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/DITStructureRule.java b/opendj3-server-dev/src/server/org/opends/server/types/DITStructureRule.java
index 4a4c2f9..a664526 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/DITStructureRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/DITStructureRule.java
@@ -26,8 +26,7 @@
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
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 40d38e3..5eec0aa 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
@@ -26,6 +26,10 @@
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+
import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/DereferencePolicy.java b/opendj3-server-dev/src/server/org/opends/server/types/DereferencePolicy.java
index c9af069..09cbe67 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/DereferencePolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/DereferencePolicy.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import org.opends.server.protocols.ldap.LDAPConstants;
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 3b86cba..1a9e20e 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
@@ -22,9 +22,10 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types;
+
import java.util.List;
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/DisconnectReason.java b/opendj3-server-dev/src/server/org/opends/server/types/DisconnectReason.java
index 0002831..059d230 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/DisconnectReason.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/DisconnectReason.java
@@ -22,9 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
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 2cd60d7..d2390ea 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
@@ -26,6 +26,11 @@
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+
import java.io.BufferedWriter;
import java.io.IOException;
import java.util.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/EntryEncodeConfig.java b/opendj3-server-dev/src/server/org/opends/server/types/EntryEncodeConfig.java
index 7e227f4..cbf690e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/EntryEncodeConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/EntryEncodeConfig.java
@@ -22,10 +22,13 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+
import org.opends.messages.Message;
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 4d8ad40..dd3117e 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
@@ -22,9 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock, AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/FilterType.java b/opendj3-server-dev/src/server/org/opends/server/types/FilterType.java
index fc3a408..279c82b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/FilterType.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/FilterType.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import static org.opends.server.protocols.ldap.LDAPConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/IdentifiedException.java b/opendj3-server-dev/src/server/org/opends/server/types/IdentifiedException.java
index de83d53..bb1d31b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/IdentifiedException.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/IdentifiedException.java
@@ -22,8 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/IndexType.java b/opendj3-server-dev/src/server/org/opends/server/types/IndexType.java
index 7ac13e5..aac5500 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/IndexType.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/IndexType.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/InitializationException.java b/opendj3-server-dev/src/server/org/opends/server/types/InitializationException.java
index 1c505c6..a1f3755 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/InitializationException.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/InitializationException.java
@@ -22,8 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/IntermediateResponse.java b/opendj3-server-dev/src/server/org/opends/server/types/IntermediateResponse.java
index 83532cc..a2435d9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/IntermediateResponse.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/IntermediateResponse.java
@@ -22,11 +22,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/InvokableMethod.java b/opendj3-server-dev/src/server/org/opends/server/types/InvokableMethod.java
index 09a11bc..9ad4a32 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/InvokableMethod.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/InvokableMethod.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import javax.management.Attribute;
import javax.management.MBeanException;
import javax.management.MBeanOperationInfo;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/LDAPException.java b/opendj3-server-dev/src/server/org/opends/server/types/LDAPException.java
index 21bd0f2..bc9eae9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/LDAPException.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/LDAPException.java
@@ -22,8 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/LDAPSyntaxDescription.java b/opendj3-server-dev/src/server/org/opends/server/types/LDAPSyntaxDescription.java
index 245c9d6..f3bc646 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/LDAPSyntaxDescription.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/LDAPSyntaxDescription.java
@@ -28,7 +28,7 @@
package org.opends.server.types;
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
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 00a8d57..c903c12 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
@@ -25,6 +25,7 @@
* Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.types;
+
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/LDIFImportConfig.java b/opendj3-server-dev/src/server/org/opends/server/types/LDIFImportConfig.java
index 65403cd..db5f13c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/LDIFImportConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/LDIFImportConfig.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import java.io.*;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/MatchingRuleUse.java b/opendj3-server-dev/src/server/org/opends/server/types/MatchingRuleUse.java
index dbd1d04..daac402 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/MatchingRuleUse.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/MatchingRuleUse.java
@@ -26,8 +26,7 @@
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/MembershipException.java b/opendj3-server-dev/src/server/org/opends/server/types/MembershipException.java
index b15d746..9ba26c4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/MembershipException.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/MembershipException.java
@@ -22,8 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/NameForm.java b/opendj3-server-dev/src/server/org/opends/server/types/NameForm.java
index e60e7f2..00e6c30 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/NameForm.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/NameForm.java
@@ -26,8 +26,7 @@
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/NamedCharacterSet.java b/opendj3-server-dev/src/server/org/opends/server/types/NamedCharacterSet.java
index 14177d2..17840a6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/NamedCharacterSet.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/NamedCharacterSet.java
@@ -22,8 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java b/opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java
index d429e9c..5f4f37a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/ObjectClass.java
@@ -26,8 +26,7 @@
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/OpenDsException.java b/opendj3-server-dev/src/server/org/opends/server/types/OpenDsException.java
index 2c5a896..9b71218 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/OpenDsException.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/OpenDsException.java
@@ -22,9 +22,11 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/OperatingSystem.java b/opendj3-server-dev/src/server/org/opends/server/types/OperatingSystem.java
index b436ccd..7958ef5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/OperatingSystem.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/OperatingSystem.java
@@ -22,9 +22,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
/**
* This class defines an enumeration that may be used to identify
* the operating system on which the JVM is running.
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java b/opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java
index a42c416..4d814da 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java
@@ -22,12 +22,14 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.types;
+
+
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
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 f96c25f..5cef8dd 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
@@ -22,10 +22,13 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+
import java.util.*;
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/RawAttribute.java b/opendj3-server-dev/src/server/org/opends/server/types/RawAttribute.java
index 98ffbca..4552cb2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/RawAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/RawAttribute.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/RawFilter.java b/opendj3-server-dev/src/server/org/opends/server/types/RawFilter.java
index 4e1e940..c33832b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/RawFilter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/RawFilter.java
@@ -22,9 +22,11 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.types;
+
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/RawModification.java b/opendj3-server-dev/src/server/org/opends/server/types/RawModification.java
index a117c94..f136e02 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/RawModification.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/RawModification.java
@@ -22,9 +22,11 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/RecordingInputStream.java b/opendj3-server-dev/src/server/org/opends/server/types/RecordingInputStream.java
index 8437ae0..279985a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/RecordingInputStream.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/RecordingInputStream.java
@@ -22,9 +22,13 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+
import java.io.InputStream;
import java.io.IOException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/RecordingOutputStream.java b/opendj3-server-dev/src/server/org/opends/server/types/RecordingOutputStream.java
index 74bafcd..d516de0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/RecordingOutputStream.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/RecordingOutputStream.java
@@ -22,9 +22,13 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+
import java.io.OutputStream;
import java.io.IOException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/ResultCode.java b/opendj3-server-dev/src/server/org/opends/server/types/ResultCode.java
index 22fe4c7..4dc0242 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/ResultCode.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/ResultCode.java
@@ -25,6 +25,7 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
import org.opends.messages.Message;
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 3c3ad1c..da85046 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
@@ -22,12 +22,11 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.io.*;
import java.util.ArrayList;
import java.util.Collections;
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 a896eb2..0772ad0 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
@@ -25,6 +25,9 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java b/opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java
index 94311cb..79577bd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SearchResultEntry.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.types;
-
-
import java.util.ArrayList;
import java.util.List;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SearchResultReference.java b/opendj3-server-dev/src/server/org/opends/server/types/SearchResultReference.java
index 46f1ad2..cc3710e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SearchResultReference.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SearchResultReference.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java b/opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java
index 8eaad3b..c4a0152 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SearchScope.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import org.opends.server.protocols.ldap.LDAPConstants;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SortKey.java b/opendj3-server-dev/src/server/org/opends/server/types/SortKey.java
index 7eec227..0b9ec9a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SortKey.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SortKey.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import org.opends.server.api.OrderingMatchingRule;
import static org.opends.server.loggers.debug.DebugLogger.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/StabilityLevel.java b/opendj3-server-dev/src/server/org/opends/server/types/StabilityLevel.java
index 29a485c..a329cd9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/StabilityLevel.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/StabilityLevel.java
@@ -22,11 +22,14 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+
+
/**
* This class implements an enumeration whose values may be used to
* indicate the stability level of API classes and/or methods. Code
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 ca1eb51..ef3a1df 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,8 +26,6 @@
*/
package org.opends.server.types;
-
-
import static org.opends.messages.SchemaMessages.*;
import java.util.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecificationSet.java b/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecificationSet.java
index e0f8c7b..a223fbf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecificationSet.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecificationSet.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import java.util.AbstractSet;
import java.util.Collection;
import java.util.HashSet;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttribute.java b/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttribute.java
index 2b7c382..7d74fbd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/VirtualAttribute.java
@@ -22,12 +22,11 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/WritabilityMode.java b/opendj3-server-dev/src/server/org/opends/server/types/WritabilityMode.java
index bb464ec..6037bba 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/WritabilityMode.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/WritabilityMode.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import static org.opends.server.util.StaticUtils.*;
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 1fbcbeb..b54a852 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.types.operation;
import org.opends.messages.Message;
@@ -32,7 +32,6 @@
import java.util.List;
import org.opends.server.types.*;
-
import org.opends.messages.MessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationAddOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationAddOperation.java
index 8c99513..116a2d5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationAddOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationAddOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -32,7 +33,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationBindOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationBindOperation.java
index 40754aa..b9fb0d9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationBindOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationBindOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
import org.opends.messages.Message;
@@ -29,7 +30,7 @@
import org.opends.server.types.AuthenticationType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java
index 104e028..6f29eff 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java
index cdfa133..33cd499 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java
index 067eac2..d28d44c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java
index 419aa00..997bc8d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -29,7 +30,7 @@
import java.util.List;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java
index 70982d6..fe67e29 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -30,7 +31,7 @@
import java.util.List;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
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 c241a4e..c7b2c49 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.types.operation;
import org.opends.messages.Message;
@@ -32,7 +32,6 @@
import java.util.List;
import org.opends.server.types.*;
-
import org.opends.messages.MessageBuilder;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
index 2015c7c..fd692e8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types.operation;
@@ -30,7 +30,7 @@
import java.util.Set;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DN;
import org.opends.server.types.RawFilter;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseAddOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseAddOperation.java
index 4437f62..876a2ca 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseAddOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseAddOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -31,6 +32,7 @@
import java.util.Map;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseBindOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseBindOperation.java
index 46356bc..1a2e057 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseBindOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseBindOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
import org.opends.messages.Message;
@@ -29,7 +30,7 @@
import org.opends.server.types.AuthenticationType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java
index c53ec74..6d7f0c5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java
@@ -22,12 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java
index b23c162..fa400a8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java
index 17c4cd0..812623c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java
index cdf9db3..f7205b3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -30,6 +31,7 @@
import java.util.List;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java
index 82efd84..d683496 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -30,6 +31,7 @@
import java.util.List;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
index a5714c1..2987b5f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types.operation;
@@ -31,6 +31,7 @@
import java.util.Set;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationAddOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationAddOperation.java
index a866325..65dd328 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationAddOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationAddOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -32,7 +33,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java
index eac67a4..522e309 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java
index 17282ea..8ef71ce 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -29,7 +30,7 @@
import java.util.List;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyOperation.java
index 39e21a1..6277b7b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PostSynchronizationModifyOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -30,7 +31,7 @@
import java.util.List;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationAddOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationAddOperation.java
index a80c45d..fcb29c4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationAddOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationAddOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -32,7 +33,7 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationBindOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationBindOperation.java
index f492ddc..fbbb476 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationBindOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationBindOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
import org.opends.messages.Message;
@@ -29,7 +30,7 @@
import org.opends.server.types.AuthenticationType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java
index ac1e64f..b101929 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java
index dbc234d..805c753 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java
index 4173fc9..efce4db 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java
index 0e35c2d..269e81e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -29,7 +30,7 @@
import java.util.List;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java
index 3e9a156..caba830 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -30,7 +31,7 @@
import java.util.List;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
index 7259022..8148753 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types.operation;
@@ -31,7 +31,7 @@
import java.util.List;
import java.util.Set;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DN;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseAddOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseAddOperation.java
index 766c5c2..a9e61dc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseAddOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseAddOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -29,7 +30,7 @@
import java.util.List;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.RawAttribute;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseBindOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseBindOperation.java
index ad52641..6f40fda 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseBindOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseBindOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
import org.opends.messages.Message;
@@ -29,7 +30,7 @@
import org.opends.server.types.AuthenticationType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseCompareOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseCompareOperation.java
index 20d9eee..a3dcefb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseCompareOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseCompareOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java
index 4cff063..d6879ad 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java
index 3f11341..11a6cce 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java
index 34b40d6..036d1d9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyOperation.java
index 2301afe..fd4e5a1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseModifyOperation.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
@@ -29,7 +30,7 @@
import java.util.List;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.RawModification;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
index 401e6d9..59af40f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types.operation;
@@ -32,6 +32,7 @@
import java.util.Set;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
index e381673..223eaf0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types.operation;
@@ -31,6 +31,7 @@
import java.util.Set;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
index 7f51df1..7b7762f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.types.operation;
@@ -31,6 +31,7 @@
import java.util.Set;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/operation/SubordinateModifyDNOperation.java b/opendj3-server-dev/src/server/org/opends/server/types/operation/SubordinateModifyDNOperation.java
index d3f7354..48a4eb2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/operation/SubordinateModifyDNOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/operation/SubordinateModifyDNOperation.java
@@ -22,12 +22,14 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types.operation;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/BSDMD5Crypt.java b/opendj3-server-dev/src/server/org/opends/server/util/BSDMD5Crypt.java
index 1d568a9..04df57e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/BSDMD5Crypt.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/BSDMD5Crypt.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2010-2013 ForgeRock AS
+ * Portions Copyright 2010-2014 ForgeRock AS
*
* BSD-compatible md5 password crypt
* Ported to Java from C based on crypt-md5.c by Poul-Henning Kamp,
@@ -35,8 +35,8 @@
*/
package org.opends.server.util;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import java.security.MessageDigest;
import java.security.SecureRandom;
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/Base64.java b/opendj3-server-dev/src/server/org/opends/server/util/Base64.java
index 304f84a..7f95add 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/Base64.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/Base64.java
@@ -47,7 +47,7 @@
import org.opends.messages.MessageBuilder;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.NullOutputStream;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
import org.opends.server.util.args.StringArgument;
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
index 3793e70..dbb0a79 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
@@ -50,6 +50,8 @@
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java
index e9050ac..51057b6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFWriter.java
@@ -37,7 +37,8 @@
import org.opends.messages.Message;
import org.opends.server.tools.makeldif.TemplateEntry;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.server.util.StaticUtils.*;
import static org.forgerock.util.Reject.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/ServerConstants.java b/opendj3-server-dev/src/server/org/opends/server/util/ServerConstants.java
index 96dec3c..bf7169a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/ServerConstants.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/ServerConstants.java
@@ -22,11 +22,11 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2010-2013 ForgeRock AS
+ * Portions Copyright 2010-2014 ForgeRock AS
*/
package org.opends.server.util;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
/**
* This class defines a set of constants that may be referenced throughout the
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 00916bb..df327d4 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
@@ -52,6 +52,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.util.args.Argument;
import org.opends.server.util.args.ArgumentException;
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 4385cca..fe7002f 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
@@ -45,6 +45,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.ByteString;
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 0531cb0..f7f1dde 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
@@ -49,6 +49,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostOperationAddOperation;
import org.opends.server.types.operation.PostResponseAddOperation;
import org.opends.server.types.operation.PostSynchronizationAddOperation;
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 3658be0..54b1fb7 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.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.PostOperationBindOperation;
import org.opends.server.types.operation.PostResponseBindOperation;
import org.opends.server.types.operation.PreOperationBindOperation;
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 769acdb..cba1bac 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
@@ -48,6 +48,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java
index e7ef8cb..a3bbb56 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java
@@ -22,8 +22,9 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
-
+
package org.opends.messages;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java
index 844b862..c9cd062 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java
@@ -22,8 +22,9 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
-
+
package org.opends.messages;
import static org.testng.Assert.*;
@@ -77,7 +78,7 @@
/**
* Tests that messages don't end with a period (.) excluding those that end
* with an ellipsis (...)
- *
+ *
* @param messagesClass containing definitions of MessageDescriptor objects
* @throws IllegalAccessException if there is a problem accessing the
* class through reflection
@@ -96,7 +97,7 @@
boolean bad = fmtString.endsWith(".") && !fmtString.endsWith("...");
assertFalse(bad,
"Format string for message descriptor " + f.getName() +
- " obtained through key " + md.getKey() +
+ " obtained through key " + md.getKey() +
" defined in class " + messagesClass.getName() +
" \'" + md.getFormatString(Locale.getDefault()) +
"\' ends with a '.'");
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
index eccbae6..7adefac 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.quicksetup;
@@ -36,7 +36,7 @@
import org.opends.quicksetup.util.ServerController;
import org.opends.quicksetup.util.ZipExtractor;
import org.opends.server.TestCaseUtils;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.OperatingSystem;
@SuppressWarnings("javadoc")
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java
index 2c513ac..d194c55 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.quicksetup.util;
@@ -410,7 +411,7 @@
File copiedSource = new File(dest, "source");
assertTrue(copiedSource.exists());
- assertTrue(count == countSelfAndAllChildren(copiedSource));
+ assertTrue(count == countSelfAndAllChildren(copiedSource));
}
/**
@@ -455,7 +456,7 @@
assertTrue(copiedD2.exists());
assertTrue(countSelfAndAllChildren(copiedD2) == 3);
assertTrue(copiedD2b.exists());
- assertTrue(countSelfAndAllChildren(copiedD2b) == 2);
+ assertTrue(countSelfAndAllChildren(copiedD2b) == 2);
assertTrue(copiedF2b1.exists());
}
@@ -481,7 +482,7 @@
final File copiedF2b1 = new File(d2b, "f2b1");
String ORIGINAL = "original";
writeContents(copiedF2b1, ORIGINAL);
-
+
// Test that using a filter to delete one file works
FileFilter copyChildFileFilter = new FileFilter() {
public boolean accept(File f) {
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
index 9efeafb..d8c7393 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server;
@@ -30,7 +31,7 @@
/**
* This class wraps TestNG so that we can force the process to exit if there
- * is an uncaught exception (e.g. OutOfMemoryError).
+ * is an uncaught exception (e.g. OutOfMemoryError).
*/
public class SuiteRunner {
public static void main(String[] args) {
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 1888f48..587b70c 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
@@ -64,6 +64,7 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.dsconfig.DSConfig;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.FilePermission;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.EmbeddedUtils;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java
index f4ee3bc..31c1d9c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java
@@ -22,9 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
-package org.opends.server.admin;
+package org.opends.server.admin;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
index 9554b65..475f873 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
@@ -299,26 +299,26 @@
assertTrue(child2.matches(child2));
assertTrue(child1.matches(child2));
assertTrue(child2.matches(child1));
-
+
assertTrue(child1.equals(child1));
assertTrue(child2.equals(child2));
assertFalse(child1.equals(child2));
assertFalse(child2.equals(child1));
-
+
assertFalse(child1.matches(child3));
assertFalse(child2.matches(child3));
assertFalse(child3.matches(child1));
assertFalse(child3.matches(child2));
-
+
assertFalse(child1.equals(child3));
assertFalse(child2.equals(child3));
assertFalse(child3.equals(child1));
assertFalse(child3.equals(child2));
}
-
+
/**
* Tests toDN method.
- *
+ *
* @throws Exception
* If an unexpected error occurred.
*/
@@ -342,12 +342,12 @@
.getConnectionHandlersRelationDefinition(),
LDAPConnectionHandlerCfgDefn.getInstance(),
"Another LDAP connection handler");
-
+
DN expectedEmpty = DN.rootDN();
DN expectedChild1 = DN.valueOf("cn=LDAP connection handler,cn=connection handlers,cn=config");
DN expectedChild2 = DN.valueOf("cn=LDAP connection handler,cn=connection handlers,cn=config");
DN expectedChild3 = DN.valueOf("cn=Another LDAP connection handler,cn=connection handlers,cn=config");
-
+
assertEquals(path.toDN(), expectedEmpty);
assertEquals(child1.toDN(), expectedChild1);
assertEquals(child2.toDN(), expectedChild2);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java
index 20f803c..6cb5688 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.admin;
@@ -184,7 +185,7 @@
public void testParseValue4(String value) {
SizeUnit.parseValue(value, SizeUnit.KILO_BYTES);
}
-
+
/**
* Creates data for testing fromBytes
*
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
index f7f8004..d79c7c3 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.admin;
@@ -32,7 +33,7 @@
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.core.DirectoryServer;
import org.opends.server.schema.ObjectClassSyntax;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ObjectClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java
index 0e1db51..65d80b5 100755
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.admin.client.cli;
@@ -77,7 +78,7 @@
}
}
-
+
/**
* Test if ADS errors are all associated with returncode.
*/
@@ -98,7 +99,7 @@
public void testServerGroupAttributeDisplayName()
{
DsFrameworkCliServerGroup cli = new DsFrameworkCliServerGroup();
-
+
try
{
cli.initializeCliGroup(new DsFrameworkCliParser(null, null, false),
@@ -114,7 +115,7 @@
+ prop.toString() + " has no display value");
}
}
-
+
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java
index a375585..ee27cd8 100755
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.admin.client.spi;
@@ -417,7 +418,7 @@
defaultValues.add(pd.decodeValue(sv));
}
}
-
+
Collection<T> activeValues = pp.getPropertyValues(pd);
ps.addProperty(pd, defaultValues, activeValues);
}
@@ -466,7 +467,7 @@
}
private class TestPropertyProvider<T> implements PropertyProvider {
-
+
PropertyDefinition<T> pd = null;
Collection<T> values = null;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
index 2eec165..92db23f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
@@ -88,10 +88,10 @@
ServerManagementContext context = ServerManagementContext.getInstance();
ServerManagedObject<? extends S> mo = context.decode(getPath(definition),
configEntry);
-
+
// Ensure constraints are satisfied.
mo.ensureIsUsable();
-
+
return mo.getConfiguration();
} catch (DefinitionDecodingException e) {
throw ConfigExceptionFactory.getInstance()
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 556d67e..9222d4f 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
@@ -458,7 +458,7 @@
TestChildCfg child = parent.getTestChild("test child 1");
TestCfg.addConstraint(constraint);
- ChangeListener listener = new ChangeListener();
+ ChangeListener listener = new ChangeListener();
child.addChangeListener(listener);
// Now modify it.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java
index bab30e0..778a6fe 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java
@@ -120,7 +120,7 @@
// First create the path.
ManagedObjectPath<? extends ConfigurationClient, ? extends Configuration> path = ManagedObjectPath
.emptyPath();
-
+
SingletonRelationDefinition.Builder<TestChildCfgClient, TestChildCfg> b =
new SingletonRelationDefinition.Builder<TestChildCfgClient, TestChildCfg>(
TestParentCfgDefn.getInstance(), "singleton-test-child",
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 ab4a6b8..6e1c130 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
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.api;
@@ -38,6 +38,8 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
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/api/PasswordValidatorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
index 74c4118..cb9e3a6 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
@@ -49,7 +49,7 @@
import org.opends.server.protocols.ldap.ModifyResponseProtocolOp;
import org.opends.server.tools.LDAPPasswordModify;
import org.opends.server.tools.LDAPWriter;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Entry;
import org.opends.server.types.ModificationType;
import org.opends.server.types.RawModification;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
index 86fbcf2..b2344d9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
@@ -29,7 +29,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import static org.opends.server.config.ConfigConstants.ATTR_AUTHZ_GLOBAL_ACI;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
index 0c594b1..406d25c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends;
@@ -32,8 +33,8 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.schema.CaseIgnoreEqualityMatchingRuleFactory;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
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 cb0eaaa..ea6bfa3 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
@@ -55,34 +55,34 @@
public abstract class JebTestCase extends DirectoryServerTestCase {
private TreeMap<DN,Entry> entryTreeMap = new TreeMap<DN,Entry>();
int numEntries;
-
+
/**
* This method takes an MakeLDIF template and a number of entries to create
* and adds the created entries into server.
- *
+ *
* @param template MakeLDIF template to use.
* @param numEntries Number of entries to create and add.
* @throws Exception if the entries cannot be created or if the add
* fails.
*/
- protected void
+ protected void
createLoadEntries(String[] template, int numEntries) throws Exception {
InternalClientConnection connection =
InternalClientConnection.getRootConnection();
- String makeLDIFPath =
+ String makeLDIFPath =
System.getProperty(TestCaseUtils.PROPERTY_BUILD_ROOT) +
File.separator + "resource"+File.separator+"MakeLDIF";
- TemplateFile templateFile =
+ TemplateFile templateFile =
new TemplateFile(makeLDIFPath, new Random());
ArrayList<Message> warnings = new ArrayList<Message>();
templateFile.parse(template, warnings);
- MakeLDIFInputStream ldifEntryStream =
+ MakeLDIFInputStream ldifEntryStream =
new MakeLDIFInputStream(templateFile);
- LDIFReader reader =
+ LDIFReader reader =
new LDIFReader(new LDIFImportConfig(ldifEntryStream));
for(int i =0; i<numEntries;i++) {
Entry entry = reader.readEntry(false);
- entryTreeMap.put(entry.getName(), entry);
+ entryTreeMap.put(entry.getName(), entry);
AddOperation addOperation =
connection.processAdd(entry.getName(),
entry.getObjectClasses(),
@@ -94,12 +94,12 @@
reader.close();
this.numEntries=numEntries;
}
-
+
/**This method should be used to remove the entries created in the
* above loadEntries method.
* Note that it starts at the last key and works backwards so that the leaf
* entries are removed first before the top level nodes.
- *
+ *
* @throws Exception if the entries cannot be removed.
*/
protected void
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
index ac30245..d8651a0 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
@@ -37,6 +37,8 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.StaticUtils;
import static org.opends.server.util.StaticUtils.getBytes;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
index 151fc2d..0ed065f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
@@ -38,7 +38,6 @@
import static org.opends.server.util.ServerConstants.OC_EXTENSIBLE_OBJECT;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
-
import java.util.List;
import java.util.HashMap;
import java.util.LinkedHashMap;
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 72c4006..67bdd8a 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
@@ -40,6 +40,7 @@
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.testng.annotations.AfterClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
index 4858255..d09eeb8 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
@@ -29,6 +29,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.TestCaseUtils;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.StaticUtils;
import static org.opends.server.util.ServerConstants.OC_TOP;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
index 24307ef..8fdd443 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
@@ -32,7 +33,7 @@
import org.testng.annotations.BeforeClass;
/**
- * An abstract class that all control unit test should extend.
+ * An abstract class that all control unit test should extend.
*/
@Test(groups = { "precommit", "controls" }, sequential = true)
public abstract class ControlsTestCase extends DirectoryServerTestCase
@@ -40,7 +41,7 @@
/**
* Set up the environment for performing the tests in this suite.
- *
+ *
* @throws Exception
* If the environment could not be set up.
*/
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java
index 00cca02..34c63e7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
@@ -30,7 +31,7 @@
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPReader;
import org.opends.server.replication.common.MultiDomainServerState;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
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/MatchedValuesControlTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
index f90ae5a..bff9dde 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
@@ -35,6 +36,8 @@
import org.opends.server.schema.DistinguishedNameEqualityMatchingRuleFactory;
import org.opends.server.schema.IntegerEqualityMatchingRuleFactory;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.asn1.ASN1;
import org.testng.annotations.DataProvider;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
index a1f74ae..e92479c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.controls;
@@ -31,6 +32,8 @@
import java.util.Set;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPReader;
import org.opends.server.protocols.asn1.ASN1;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
index b2254d0..433564e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.controls;
@@ -40,6 +40,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.ldap.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import 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/controls/PersistentSearchControlTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
index fbed063..0875f1a 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
@@ -41,6 +41,8 @@
import org.opends.server.protocols.ldap.LDAPReader;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
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/ProxiedAuthV1ControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
index e91fdcd..1e1833d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
@@ -36,7 +36,8 @@
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
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/ProxiedAuthV2ControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
index ebf38c4..62559cf 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
@@ -36,7 +36,8 @@
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
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/ServerSideSortControlTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
index 0dfc948..68d47b3 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
@@ -779,8 +779,8 @@
internalSearch.run();
assertFalse(internalSearch.getResultCode() == ResultCode.SUCCESS);
}
-
-
+
+
/**
* Tests performing an internal search using the non-critical server-side
* sort control to sort the entries
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 c1e14d7..84969fb 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
@@ -49,6 +49,8 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Constants;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
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 3824b20..fe8adcf 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
@@ -44,6 +44,7 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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 1697f60..33957f7 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.ByteString;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.DataProvider;
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 1722425..02d527e 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
@@ -44,6 +44,7 @@
import org.opends.server.tools.*;
import org.opends.server.tools.LDAPReader;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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 a0f0fe9..7009795 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.ByteString;
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/core/DeleteOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
index 04281bb..43bb3c6 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.ByteString;
import org.opends.server.util.StaticUtils;
import org.opends.server.workflowelement.localbackend.LocalBackendDeleteOperation;
import org.testng.annotations.AfterMethod;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
index 0a7721f..7c1d746 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.core;
@@ -34,7 +34,7 @@
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.protocols.ldap.*;
import org.opends.server.tools.LDAPWriter;
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 e8e8b2f..e446334 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
@@ -48,6 +48,7 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.Base64;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
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 2acfb1c..ebeb640 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.ByteString;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.UnbindRequestProtocolOp;
import org.opends.server.tools.*;
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 7cee911..9c1afe0 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
@@ -45,6 +45,7 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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 6b69ca2..aa5f863 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
@@ -40,6 +40,7 @@
import org.opends.server.tools.LDAPDelete;
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
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/TestModifyDNOperation.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
index 0011c8e..f4e6b8c 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.ByteString;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
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 38244ed..6deea7d 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
@@ -44,6 +44,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.ByteString;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.UtilTestCase;
import org.opends.server.workflowelement.localbackend.LocalBackendWorkflowElement;
@@ -80,7 +81,7 @@
private static final String workflowConfigModeAuto = "auto";
private static final String workflowConfigModeManual = "manual";
-
+
//===========================================================================
// B E F O R E C L A S S
@@ -136,7 +137,7 @@
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
-
+
/**
* Checks that test backend is accessible as well as config backend
* and rootDSE backend.
@@ -187,7 +188,7 @@
modifyOperation.run();
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
-
+
/**
* Sets the ds-cfg-workflow-configuration-mode attribute to 'auto'
@@ -204,7 +205,7 @@
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
-
+
/**
* Performs a search on a provided base DN.
*
@@ -236,7 +237,7 @@
searchOperation.run();
assertEquals(searchOperation.getResultCode(), expectedResultCode);
-
+
return searchOperation;
}
@@ -262,7 +263,7 @@
ArrayList<RawModification> ldapMods = new ArrayList<RawModification>();
ldapMods.add(new LDAPModification(modType, ldapAttr));
-
+
ModifyOperationBasis modifyOperation = new ModifyOperationBasis(
InternalClientConnection.getRootConnection(),
InternalClientConnection.nextOperationID(),
@@ -274,7 +275,7 @@
return modifyOperation;
}
-
+
/**
* Creates a workflow to handle a local backend. The internal network
* group is used.
@@ -290,25 +291,25 @@
// Get the backend
Backend backend = DirectoryServer.getBackend(backendID);
assertNotNull(backend);
-
+
// Create the workflow element that wraps the local backend
String workflowElementID = baseDN + "#" + backendID;
LocalBackendWorkflowElement workflowElement =
LocalBackendWorkflowElement.createAndRegister(workflowElementID, backend);
-
+
// Create a workflow and register it with the server
String workflowID = baseDN + "#" + backendID;
WorkflowImpl workflowImpl = new WorkflowImpl(
workflowID, DN.valueOf(baseDN), workflowElementID, workflowElement);
workflowImpl.register();
-
+
// Register the workflow with the internal network group
NetworkGroup.getInternalNetworkGroup().registerWorkflow(workflowImpl);
-
+
return workflowImpl;
}
-
-
+
+
/**
* Removes a workflow.
*
@@ -329,8 +330,8 @@
WorkflowImpl workflowImpl = (WorkflowImpl) workflow;
workflowImpl.deregister();
}
-
-
+
+
/**
* Adds a new suffix in a backend.
*
@@ -354,8 +355,8 @@
modifyOperation.run();
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
-
-
+
+
/**
* Create a base entry for a new suffix.
*
@@ -380,8 +381,8 @@
addOperation.run();
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
-
-
+
+
/**
* Removes a new suffix in a backend.
*
@@ -408,8 +409,8 @@
modifyOperation.run();
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
-
-
+
+
/**
* Elaborates a DN for a backend config entry.
*
@@ -422,7 +423,7 @@
return backendDN;
}
-
+
//===========================================================================
// U T I L S using dsconfig
//===========================================================================
@@ -452,7 +453,7 @@
"--set", "base-dn:" + baseDN,
"--set", "writability-mode:enabled",
"--set", "enabled:true");
-
+
Backend backend = DirectoryServer.getBackend(backendID);
if (createBaseEntry)
{
@@ -462,7 +463,7 @@
return backend;
}
-
+
/**
* Remove a backend.
*
@@ -515,7 +516,7 @@
checkBackendIsAccessible(testBaseDN);
}
-
+
/**
* This test checks the basic operation routing when configuration
* mode is 'manual'. Few workflows are configured for the test.
@@ -537,23 +538,23 @@
// workflows) so searches on the test backend should fail.
setModeManual();
checkBackendIsNotAccessible(testBaseDN);
-
+
// Create a workflow to handle o=test backend then check that test
// backend is now accessible
createWorkflow(testBaseDN, testBackendID);
checkBackendIsAccessible(testBaseDN);
-
+
// Remove the workflow and check that searches are failing.
removeWorkflow(testBaseDN, testBackendID);
checkBackendIsNotAccessible(testBaseDN);
-
+
// Change workflow configuration mode back to auto and check that
// test backend is still accessible
setModeAuto();
checkBackendIsAccessible(testBaseDN);
}
-
+
/**
* This test checks the add/remove of suffix in a backend in manual
* configuration mode.
@@ -601,13 +602,13 @@
// is no more accessible.
removeWorkflow(testBaseDN3, testBackendID2);
removeSuffix(testBaseDN3, testBackendID2);
- checkBackendIsNotAccessible(testBaseDN3);
-
+ checkBackendIsNotAccessible(testBaseDN3);
+
// Back to the original configuration mode
setModeAuto();
}
-
+
/**
* This test checks the add/remove of a backend in manual configuration
* mode.
@@ -620,29 +621,29 @@
String backendID2 = "addRemoveBackend_2";
String baseDN1 = "o=addRemoveBackendBaseDN_1";
String baseDN2 = "o=addRemoveBackendBaseDN_2";
-
+
// Make sure we are in auto mode and check the suffix is not accessible
setModeAuto();
checkBackendIsNotAccessible(baseDN1);
-
+
// Create a backend and check that the base entry is accessible.
dsconfigCreateMemoryBackend(backendID1, baseDN1, true);
checkBackendIsAccessible(baseDN1);
-
+
// Remove the backend and check that the suffix is no more accessible.
dsconfigRemoveMemoryBackend(backendID1);
checkBackendIsNotAccessible(baseDN1);
-
+
// Now move to the manual mode
setModeManual();
checkBackendIsNotAccessible(baseDN2);
-
+
// Create a backend and create a workflow to route operations to that
// new backend. Then check that the base entry is accessible.
dsconfigCreateMemoryBackend(backendID2, baseDN2, true);
createWorkflow(baseDN2, backendID2);
checkBackendIsAccessible(baseDN2);
-
+
// Remove the workflow and the backend and check that the base entry
// is no more accessible.
removeWorkflow(baseDN2, backendID2);
@@ -667,13 +668,13 @@
// Move to the manual mode
setModeManual();
-
+
// Create a route for o=test suffix in the internal network group.
// Search on o=test should succeed.
WorkflowImpl workflowImpl = createWorkflow(baseDN, backendID);
InternalSearchOperation searchOperation =
doSearch(baseDN, SearchScope.BASE_OBJECT, ResultCode.SUCCESS);
-
+
// Create a network group and store it in the client connection.
// As the network group is empty, all searches should fail with a
// no such object result code.
@@ -683,19 +684,19 @@
clientConnection.setNetworkGroup(networkGroup);
searchOperation.run();
assertEquals(searchOperation.getResultCode(), ResultCode.NO_SUCH_OBJECT);
-
+
// Now register the o=test workflow and search again. The search
// should succeed.
networkGroup.registerWorkflow(workflowImpl);
searchOperation.run();
assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
-
+
// Put back the internal network group in the client connection
// and check that searches are still working.
clientConnection.setNetworkGroup(NetworkGroup.getInternalNetworkGroup());
searchOperation.run();
assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
-
+
// Back to the original configuration mode
setModeAuto();
}
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 0e6acd9..18b72a1 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
@@ -33,6 +33,7 @@
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.util.ServerConstants;
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 aa2deec..8a8be615 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
@@ -40,7 +40,7 @@
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.ResultCode;
-import org.opends.server.types.ByteString;
+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/AttributeValuePasswordValidatorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
index df870e6..065beaf 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
@@ -45,7 +45,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
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 7bbc3d6..d882ad3 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,7 +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.ByteString;
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/extensions/CancelExtendedOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
index d2ec6dc..d8aba45 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
@@ -64,8 +64,8 @@
import org.opends.server.protocols.ldap.ModifyResponseProtocolOp;
import org.opends.server.protocols.ldap.SearchRequestProtocolOp;
import org.opends.server.protocols.ldap.SearchResultDoneProtocolOp;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Entry;
import org.opends.server.types.ModificationType;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
index a1f7f79..76d228b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
@@ -45,7 +45,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
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 1d3d3ba..c9ff20c 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
@@ -46,7 +46,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
@@ -221,7 +221,7 @@
}
scheme.isStorageSchemeSecure();
-
+
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
index 041eef3..10127e2 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
@@ -47,7 +47,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
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 dcd920a..991135f 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,7 +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.ByteString;
import static org.testng.Assert.*;
import static org.opends.server.util.ServerConstants.*;
@@ -73,18 +73,18 @@
{
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",
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 139781a..3fcc211 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
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -69,7 +69,7 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index eeb7c9f..6546493 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -45,6 +45,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.ByteString;
import org.opends.server.workflowelement.localbackend.LocalBackendSearchOperation;
import static org.testng.Assert.*;
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 803d647..9d4cc3e 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
@@ -47,7 +47,6 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.*;
-
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/extensions/ExactMatchIdentityMapperTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
index 5073110..1383e56 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
@@ -48,7 +48,7 @@
import org.opends.server.protocols.ldap.LDAPModification;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
-
+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/ExternalSASLMechanismHandlerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
index af8362b..eb57cb4 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.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.Base64;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
@@ -505,7 +506,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- String Certificate =
+ String Certificate =
"MIICpTCCAg6gAwIBAgIJALeoA6I3ZC/cMA0GCSqGSIb3DQEBBQUAMFYxCzAJBgNV" +
"BAYTAlVTMRMwEQYDVQQHEwpDdXBlcnRpb25lMRwwGgYDVQQLExNQcm9kdWN0IERl" +
"dmVsb3BtZW50MRQwEgYDVQQDEwtCYWJzIEplbnNlbjAeFw0xMjA1MDIxNjM0MzVa" +
@@ -657,7 +658,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- String Certificate =
+ String Certificate =
"MIICpTCCAg6gAwIBAgIJALeoA6I3ZC/cMA0GCSqGSIb3DQEBBQUAMFYxCzAJBgNV" +
"BAYTAlVTMRMwEQYDVQQHEwpDdXBlcnRpb25lMRwwGgYDVQQLExNQcm9kdWN0IERl" +
"dmVsb3BtZW50MRQwEgYDVQQDEwtCYWJzIEplbnNlbjAeFw0xMjA1MDIxNjM0MzVa" +
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
index a61bc45..be0caf8 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
@@ -27,6 +27,7 @@
package org.opends.server.extensions;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;
import static org.opends.server.util.StaticUtils.*;
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 760b720..91272b7 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
@@ -47,7 +47,7 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
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 d5d4915..5914626 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
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2011-2013 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -58,6 +58,8 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
import org.testng.annotations.BeforeClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
index 696ea5e..6c4c5ce 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
@@ -43,7 +43,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index 6e16421..909c937 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -27,6 +27,7 @@
package org.opends.server.extensions;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.protocols.internal.InternalClientConnection;
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 61c8297..e731a21 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
@@ -42,7 +42,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
-
import static org.testng.Assert.*;
public class PasswordExpirationTimeVirtualAttributeProviderTestCase
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 cc66087..2349fdf 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
@@ -50,7 +50,8 @@
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.tools.LDAPPasswordModify;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.testng.Assert.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
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 38c79f7..0175ac8 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
@@ -42,7 +42,7 @@
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
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 5487b47..0bf21e3 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
@@ -43,7 +43,8 @@
import org.opends.server.schema.SchemaConstants;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
index 2a0187d..3c6ebb7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
@@ -82,7 +82,7 @@
"cn=config");
ConfigEntry configEntry = DirectoryServer.getConfigEntry(dn);
assertNotNull(configEntry);
-
+
RandomPasswordGeneratorCfg configuration =
AdminTestCaseUtils.getConfiguration(
RandomPasswordGeneratorCfgDefn.getInstance(),
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 144b6ea..ea24e83 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
@@ -48,7 +48,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
index 0757117..c6485b1 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -34,7 +35,7 @@
import org.opends.server.admin.std.server.SaltedSHA1PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.schema.UserPasswordSyntax;
-import org.opends.server.types.ByteString;
+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/SimilarityBasedPasswordValidatorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
index 73f791e..d186220 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
@@ -40,7 +40,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -185,7 +185,7 @@
"ds-cfg-enabled: true",
// "ds-cfg-min-password-difference: -1", // error here
"",
-
+
"dn: cn=Similarity-Based Password Validator,cn=Password Validators," +
"cn=config",
"objectClass: top",
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
index 4940704..dc1bab2 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -32,6 +33,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.ByteString;
import org.opends.messages.MessageBuilder;
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 1c9d7be..c4a2f50 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
@@ -48,7 +48,7 @@
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
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 9ddbf03..e44cc99 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
@@ -41,7 +41,6 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.*;
-
import static org.testng.Assert.*;
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 6631a82..3ee1674 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
@@ -44,7 +44,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
-
import static org.testng.Assert.*;
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 078ce2f..151169e 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,7 +51,7 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
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/monitors/InternalSearchMonitorTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
index 736c791..15826ac 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
@@ -40,7 +40,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
-
import static org.testng.Assert.*;
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 31ec3f5..9631250 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2011 profiq s.r.o.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -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.ByteString;
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 df42a97..b644985 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -43,6 +44,7 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.*;
import static org.opends.server.protocols.asn1.ASN1Constants.*;
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 bcc2760..a029c21 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -42,6 +43,7 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.*;
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 08816df..2d7823c 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
@@ -42,7 +42,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.*;
-
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
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 011399f..86a7dc1 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
@@ -50,6 +50,7 @@
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.ServerConstants;
import org.testng.annotations.*;
@@ -581,7 +582,7 @@
Entry entry = DirectoryServer.getEntry(testEntry.getName());
assertNotNull(entry);
-
+
List<Attribute> sambaAttribute = entry.getAttribute("sambantpassword");
assertNull(sambaAttribute);
@@ -700,7 +701,7 @@
"sn: User",
"sambaSID: 123",
"userPassword: password");
-
+
try
{
plugin.setTimeStampProvider(testTimeStampProvider);
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 44e0227..1d1db7e 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.plugins;
@@ -45,6 +46,7 @@
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.*;
import static org.opends.server.protocols.asn1.ASN1Constants.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
index 1f8b141..8c8ca3f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols;
@@ -355,7 +356,7 @@
"set-connection-handler-prop",
"--handler-name", "LDIF Connection Handler",
"--set", "enabled:true");
-
+
// Get the connection handler from the server.
LDIFConnectionHandler connHandler = null;
for (ConnectionHandler handler : DirectoryServer.getConnectionHandlers())
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java
index 2cb7a6a..3d4889b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java
@@ -22,11 +22,12 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.asn1;
-import org.opends.server.types.ByteSequenceReader;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequenceReader;
+import org.forgerock.opendj.ldap.ByteString;
/**
* Test class for ASN1ByteSequenceReaderTestCase
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java
index 246aadd..5b8eb13 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java
@@ -22,10 +22,11 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.protocols.asn1;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java
index 4152253..ab370fb 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java
@@ -22,14 +22,16 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.asn1;
+
import org.testng.annotations.Test;
import org.testng.annotations.DataProvider;
import static org.testng.Assert.*;
-import org.opends.server.types.ByteStringBuilder;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.DirectoryServerTestCase;
import java.io.IOException;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java
index 26e4d87..b72cd75 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java
@@ -22,14 +22,16 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.asn1;
+
import org.opends.server.DirectoryServerTestCase;
import static org.opends.server.protocols.asn1.ASN1Constants.*;
import org.opends.server.util.StaticUtils;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.testng.annotations.Test;
import org.testng.annotations.DataProvider;
import static org.testng.Assert.assertEquals;
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 f8dc26a..cd1d59f 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
@@ -51,6 +51,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.ByteString;
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/InternalLDAPSocketTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
index a09c625..f08d7ad 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
@@ -50,7 +50,7 @@
import org.opends.server.tools.LDAPReader;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
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/protocols/internal/InternalSearchOperationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
index 22ac47b..e861e25 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
@@ -36,7 +36,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.*;
-
+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/protocols/jmx/JmxPrivilegeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
index 5f2cf37..2968a9f 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
@@ -65,6 +65,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.ByteString;
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/ldap/LDAPBinaryOptionTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
index 5a6a2e1..941ac6b 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 Forgerock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -42,6 +42,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.tools.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.Base64;
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/ldap/LDAPv2TestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
index 49bb4b3..75def74 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2010 ForgeRock AS.
+ * Portions Copyright 2010-2014 ForgeRock AS.
*/
package org.opends.server.protocols.ldap ;
@@ -37,7 +37,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
-
+import org.forgerock.opendj.ldap.ByteString;
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/protocols/ldap/TestAbandonRequestProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
index 78ad388..0930e2e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
@@ -22,11 +22,12 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.testng.annotations.Test;
import static org.opends.server.protocols.ldap.LDAPConstants.OP_TYPE_ABANDON_REQUEST;
import org.opends.server.protocols.asn1.ASN1;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
index 3f2ce9a..4e8e64d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -37,8 +37,8 @@
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.LDAPException;
import org.opends.server.types.RawAttribute;
import org.opends.server.util.Base64;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
index f5da364..a41e03b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
@@ -29,6 +29,7 @@
import org.opends.server.protocols.asn1.*;
import static org.opends.server.util.ServerConstants.EOL;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.core.DirectoryServer;
import org.opends.server.DirectoryServerTestCase;
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
index 7bdf96a..b11c288 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.testng.annotations.Test;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import org.opends.server.protocols.asn1.ASN1;
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 8e9a6d7..15f28b1 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,6 +36,8 @@
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.types.*;
+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.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
index 100f74e..7f8c761 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
@@ -22,12 +22,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.opends.server.util.ServerConstants.EOL;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.asn1.ASN1;
@@ -304,7 +305,7 @@
key.append(indentBuf);
key.append(" Assertion Value:");
key.append(EOL);
- assertionValue.toHexPlusAscii(key, indent+4);
+ key.append(assertionValue.toHexPlusAsciiString(indent+4));
assertEquals(buffer.toString(), key.toString());
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
index 4019039..a00f16a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
@@ -29,6 +29,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.opends.server.util.ServerConstants.EOL;
import org.opends.messages.Message;
import org.testng.annotations.BeforeClass;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
index 13a8ee7..473c7df 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -29,8 +30,8 @@
import org.testng.annotations.*;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.opends.server.util.ServerConstants.EOL;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.asn1.ASN1;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
index aeef923..e22b813 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
@@ -30,6 +30,7 @@
import org.testng.annotations.*;
import org.opends.server.protocols.asn1.*;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.core.DirectoryServer;
import static org.opends.server.util.ServerConstants.EOL;
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
index 0935db0..9665d88 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -32,6 +32,8 @@
import org.testng.annotations.Test;
import org.testng.annotations.BeforeTest;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.asn1.ASN1;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
index 381ddfe..197e7ce 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.opends.server.protocols.asn1.*;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import static org.opends.server.util.ServerConstants.EOL;
import org.opends.server.DirectoryServerTestCase;
import org.testng.annotations.Test;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
index 5c0bfc6..3f79922 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
@@ -27,6 +27,7 @@
package org.opends.server.protocols.ldap;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.*;
import static org.opends.server.util.ServerConstants.EOL;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
index 67ec40a..73234da 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -35,8 +35,8 @@
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.types.LDAPException;
import org.opends.server.types.ModificationType;
import org.opends.server.types.RawModification;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
index 27c388e..ec9ca2d 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
@@ -27,6 +27,7 @@
package org.opends.server.protocols.ldap;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.*;
import static org.opends.server.util.ServerConstants.EOL;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
index 71b7c83..5f1ac1a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
@@ -29,6 +30,8 @@
import org.testng.annotations.Test;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.protocols.asn1.*;
import static org.opends.server.protocols.asn1.ASN1Constants.UNIVERSAL_OCTET_STRING_TYPE;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
index a077ed8..996e4be 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
@@ -29,6 +29,7 @@
package org.opends.server.protocols.ldap;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.asn1.*;
import static org.opends.server.protocols.ldap.LDAPConstants.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
index fd21d0d..da639d7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
import org.opends.server.protocols.asn1.ASN1Writer;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
-import org.opends.server.types.ByteStringBuilder;
+import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
@@ -46,11 +47,11 @@
assertTrue(reqOp.getProtocolOpName() == req.getProtocolOpName());
assertTrue(reqOp.getType() == req.getType());
}
-
+
@Test ()
public void testUnbindRequestToString() throws Exception
{
- UnbindRequestProtocolOp r =
+ UnbindRequestProtocolOp r =
new UnbindRequestProtocolOp();
toString(r);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
index 39a518d..a5109a7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
@@ -71,7 +71,7 @@
{
TEST_ROOT_DN = DN.valueOf(TEST_ROOT_DN_STRING);
}
-
+
/**
* Check that a sequence of dependents adds and mods is correctly ordered:
* Using a deep dit :
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
index 0027e40..1e3b7ca 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
@@ -47,6 +47,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.ByteString;
import org.opends.server.util.TimeThread;
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 cc5c92e..c9da0c0 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
@@ -489,7 +489,7 @@
addEntriesWithHistorical(1, entryCnt);
// leave a little delay between adding/modifying test entries
- // and configuring the purge delay.
+ // and configuring the purge delay.
Thread.sleep(10);
// set the purge delay to 1 minute
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 3c0b85c..7010130 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
@@ -62,6 +62,7 @@
import org.opends.server.tools.LDAPSearch;
import org.opends.server.tools.LDAPWriter;
import org.opends.server.types.*;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.LDIFWriter;
import org.opends.server.util.TimeThread;
import org.opends.server.workflowelement.externalchangelog.ECLSearchOperation;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
index bc1c170..33da154 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
@@ -435,7 +435,7 @@
{
return ieContext.getLeftEntryCount();
}
- return 0; // import/export is finished
+ return 0; // import/export is finished
}
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
index 0caa73b..ef1f78b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
import static org.testng.Assert.*;
import org.opends.server.api.ApproximateMatchingRule;
-import org.opends.server.types.ByteString;
+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/AttributeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
index 5ad2306..d0e9c81 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
@@ -22,14 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
import static org.testng.Assert.*;
import org.opends.server.api.AttributeSyntax;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.messages.MessageBuilder;
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/AttributeTypeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
index 30d0d80..8183266 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -32,7 +32,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.messages.MessageBuilder;
import java.util.ArrayList;
import org.opends.server.TestCaseUtils;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
index f22addd..931be27 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
@@ -33,7 +33,7 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.SaltedMD5PasswordStorageScheme;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.testng.annotations.DataProvider;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
index 8402784..eb32b2b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
@@ -22,14 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 Forgerock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
import static org.testng.Assert.*;
import org.opends.server.api.AttributeSyntax;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.messages.MessageBuilder;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -40,8 +40,8 @@
* Create data for the testAcceptableValues test.
* This should be a table of tables with 2 elements.
* The first one should be the value to test, the second the expected
- * result of the test.
- *
+ * result of the test.
+ *
* @return a table containing data for the testAcceptableValues Test.
*/
@DataProvider(name="acceptableValues")
@@ -49,7 +49,7 @@
/**
* Get an instance of the attribute syntax that muste be tested.
- *
+ *
* @return An instance of the attribute syntax that muste be tested.
*/
protected abstract AttributeSyntax getRule();
@@ -68,9 +68,9 @@
// test the valueIsAcceptable method
Boolean liveResult =
syntax.valueIsAcceptable(value, reason);
-
+
if (liveResult != result)
- fail(syntax + ".valueIsAcceptable gave bad result for " + value.toString() +
+ fail(syntax + ".valueIsAcceptable gave bad result for " + value.toString() +
"reason : " + reason);
// call the getters
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
index 7acae79..da10765 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
import static org.testng.Assert.*;
import org.opends.server.api.AttributeSyntax;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.messages.MessageBuilder;
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/BooleanEqualityMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java
index cca3de6..c92143e 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -41,7 +42,7 @@
@Override
@DataProvider(name= "equalitymatchingrules")
public Object[][] createEqualityMatchingRuleTest()
- {
+ {
return new Object[][] {
{"TRUE", "true", true},
{"YES", "true", true},
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java
index 1396c82..91fd4e8 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 Forgerock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -32,7 +32,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.config.ConfigException;
import org.testng.annotations.DataProvider;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.util.Base64;
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 8ac376c..63ac41f 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
@@ -40,7 +40,7 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.tools.LDAPModify;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
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 de9a50b..75f3c12 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -40,7 +41,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.ResultCode;
-import org.opends.server.types.ByteString;
+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/DistinguishedNameEqualityMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java
index 233a7ec..1aee3b3 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -43,7 +44,7 @@
public Object[][] createEqualityMatchingRuleInvalidValues()
{
return new Object[][] {
-
+
};
}
@@ -59,7 +60,7 @@
* DN with correct syntax, just do a few such tests and then
* do more tests with invalid DNs
*/
-
+
return new Object[][] {
// valid DNs
{ "", "" , true},
@@ -73,7 +74,7 @@
{ "dc=example ,dc=com", "dc=example,dc=com", true },
};
}
-
+
/**
* {@inheritDoc}
*/
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
index 75a8710..74cfa78 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -33,8 +34,8 @@
import java.util.Collections;
import org.opends.server.api.ApproximateMatchingRule;
-import org.opends.server.types.ByteSequence;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
index a541842..ad317ca 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
@@ -22,13 +22,14 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AcceptRejectWarn;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
import org.testng.annotations.DataProvider;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java
index fdf0ae4..c887d05 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -58,7 +59,7 @@
@DataProvider(name="equalitymatchingrules")
public Object[][] createEqualityMatchingRuleTest()
{
- return new Object[][] {
+ return new Object[][] {
{"1234567890", "1234567890", true},
{"-1", "-1", true},
{"-9876543210", "-9876543210", true},
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java
index facd8a8..50c7d47 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -30,7 +30,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.admin.std.server.JPEGAttributeSyntaxCfg;
import org.opends.server.config.ConfigException;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.util.Base64;
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 e52128e..88af8e3 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
@@ -39,7 +39,7 @@
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.Entry;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
index d99591f..1aeb8b3 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -30,7 +31,7 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AcceptRejectWarn;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DirectoryException;
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/SchemaTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
index 8252d95..7ce52b0 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -31,7 +32,7 @@
import org.testng.annotations.Test;
/**
-* An abstract class that all schema unit test should extend.
+* An abstract class that all schema unit test should extend.
*/
@Test(groups = { "precommit", "schema" }, sequential = true)
public abstract class SchemaTestCase extends DirectoryServerTestCase
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 85e829f..948dd99 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
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
@@ -36,7 +37,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchResultEntry;
@@ -146,7 +147,7 @@
assertEquals(result, liveResult);
}
-
+
//Generates data for case exact matching rules.
@DataProvider(name="exactRuleData")
private Object[][] createExactRuleData()
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
index 403d9ec..be61b53 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -29,8 +30,8 @@
import java.util.List;
import org.opends.server.api.SubstringMatchingRule;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
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/TimeBasedMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
index 8b29547..0de72af 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
@@ -41,7 +41,7 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
index be7ca5a..c5db71f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*
*/
package org.opends.server.schema;
@@ -33,7 +33,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.types.AttributeValue;
-import org.opends.server.types.ByteString;
+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/UUIDOrderingMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java
index 142977d..6238602 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -58,7 +59,7 @@
public Object[][] createOrderingMatchingRuleTestData()
{
return new Object[][] {
- {"12345678-9ABC-DEF0-1234-1234567890ab",
+ {"12345678-9ABC-DEF0-1234-1234567890ab",
"12345678-9abc-def0-1234-1234567890ab", 0},
{"12345678-9abc-def0-1234-1234567890ab",
"12345678-9abc-def0-1234-1234567890ab", 0},
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java
index cb92aac..407b405 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.schema;
@@ -41,7 +42,7 @@
@Override
@DataProvider(name="equalityMatchingRuleInvalidValues")
public Object[][] createEqualityMatchingRuleInvalidValues()
- {
+ {
return new Object[][] {
{"1.3.6.1.4.1.1466.0=#04024869,O=Test,C=GB#'123'B"},
{"1.3.6.1.4.1.1466.01"}
@@ -55,7 +56,7 @@
@DataProvider(name="equalitymatchingrules")
public Object[][] createEqualityMatchingRuleTest()
{
- return new Object [][] {
+ return new Object [][] {
{"1.3.6.1.4.1.1466.0=#04024869,O=Test,C=GB#'0101'B",
"1.3.6.1.4.1.1466.0=#04024869,O=Test,C=GB#'0101'B", true},
{"1.3.6.1.4.1.1466.0=#04024869,O=Test,C=GB#'0101'B",
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
index 7ba8479..3348bbd 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
@@ -33,7 +33,7 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.SaltedMD5PasswordStorageScheme;
-import org.opends.server.types.ByteString;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.testng.annotations.DataProvider;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
index d447b1a..76211f0 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions copyright 2014 ForgeRock AS
*/
package org.opends.server.snmp;
@@ -267,7 +268,7 @@
ModifyOperationBasis op = new ModifyOperationBasis(conn, conn
.nextOperationID(), conn.nextMessageID(), new ArrayList<Control>(), DN
- .decode("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
+ .valueOf("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
mods);
op.run();
@@ -278,7 +279,7 @@
op = new ModifyOperationBasis(conn, conn.nextOperationID(), conn
.nextMessageID(), new ArrayList<Control>(), DN
- .decode("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
+ .valueOf("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
mods);
op.run();
@@ -303,7 +304,7 @@
ModifyOperationBasis op = new ModifyOperationBasis(conn, conn
.nextOperationID(), conn.nextMessageID(), new ArrayList<Control>(), DN
- .decode("cn=JMX Connection Handler,cn=Connection Handlers,cn=config"),
+ .valueOf("cn=JMX Connection Handler,cn=Connection Handlers,cn=config"),
mods);
op.run();
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
index 77a6f5f..c377c55 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
@@ -40,7 +40,7 @@
import org.opends.server.extensions.GetConnectionIDExtendedOperation;
import org.opends.server.protocols.ldap.*;
import org.opends.server.types.DN;
-import org.opends.server.types.ByteString;
+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/tasks/TasksTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
index cfda3c9..46e5bb7 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
@@ -43,7 +43,6 @@
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.backends.task.*;
import org.opends.server.types.*;
-
import java.util.ArrayList;
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java
index 94327e3..d035360 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.tasks;
@@ -85,7 +85,7 @@
@AfterClass
public void cleanUp() throws Exception {
- TestCaseUtils.disableBackend("rebuildRoot");
+ TestCaseUtils.disableBackend("rebuildRoot");
}
@DataProvider(name = "taskentry")
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 d56e0fe..e7308134 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,7 +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.ByteString;
import static org.testng.Assert.*;
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 508afa2..a0c20ba 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
@@ -53,9 +53,9 @@
public class RebuildIndexTestCase
extends ToolsTestCase
{
-
+
private String configFilePath;
-
+
private String userRootDN = "ds-cfg-backend-id=userRoot,cn=Backends,cn=config";
private String baseDN = "o=airius.com";
@@ -71,7 +71,7 @@
{
TestCaseUtils.startServer();
configFilePath = DirectoryServer.getConfigFile();
-
+
// Add the airius.com suffix to userRoot
final InternalClientConnection rootConnection =
InternalClientConnection.getRootConnection();
@@ -86,7 +86,7 @@
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
-
+
/**
* Performs necessary cleanup.
*
@@ -122,7 +122,7 @@
};
assertEquals(RebuildIndex.mainRebuildIndex(args, false, null, null), 1);
}
-
+
/**
* Tries to rebuild a valid index.
*/
@@ -135,5 +135,5 @@
"-i", "ds-sync-hist"
};
assertEquals(RebuildIndex.mainRebuildIndex(args, false, null, null), 0);
- }
+ }
}
\ No newline at end of file
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 866b692..8af6c64 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
@@ -53,7 +53,7 @@
public class VerifyIndexTestCase
extends ToolsTestCase
{
-
+
private String configFilePath ;
/**
@@ -68,7 +68,7 @@
{
TestCaseUtils.startServer();
configFilePath = DirectoryServer.getConfigFile();
-
+
// Add the airius.com suffix to userRoot
InternalClientConnection rootConnection =
InternalClientConnection.getRootConnection();
@@ -81,7 +81,7 @@
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
-
+
/**
* Performs necessary cleanup.
*
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
index 8402e9e..636622f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
@@ -20,7 +20,7 @@
*
* CDDL HEADER END
*
- * Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.tools.dsconfig;
@@ -38,7 +38,7 @@
*/
@SuppressWarnings("javadoc")
public class DsconfigOptionsTestCase extends DirectoryServerTestCase {
-
+
/**
* Ensures that the Directory Server is running and performs other necessary
* setup.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java
index 50c75ed..d81c3e4 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java
@@ -21,12 +21,13 @@
* CDDL HEADER END
*
*
- * Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.types;
+
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
index 2f27196..8b9d8aa 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
@@ -22,10 +22,12 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS.
+ * Portions Copyright 2011-2014 ForgeRock AS.
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
+
import static org.testng.Assert.*;
import java.util.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java
index 9775e03..b44b5c8 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import java.util.LinkedList;
import java.util.List;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceReaderTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceReaderTest.java
deleted file mode 100644
index 8875ba4..0000000
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceReaderTest.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2009 Sun Microsystems, Inc.
- */
-
-package org.opends.server.types;
-
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
-import org.testng.Assert;
-
-import java.util.Arrays;
-
-/**
- * Test class for ByteSequenceReader
- */
-public class ByteSequenceReaderTest extends TypesTestCase
-{
- private static final byte[] eightBytes =
- new byte[]{ (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
- (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08 };
-
- @DataProvider(name = "readerProvider")
- public Object[][] byteSequenceReaderProvider()
- {
- return new Object[][] {
- { ByteString.wrap(eightBytes).asReader(), eightBytes },
- { new ByteStringBuilder().append(eightBytes).asReader(), eightBytes },
- { new ByteStringBuilder().append(eightBytes).
- subSequence(0, 8).asReader(), eightBytes }
- };
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testGet(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- for(int i = 0; i < ba.length; i++)
- {
- Assert.assertEquals(reader.get(), ba[i]);
- }
-
- // The next get should result in IOB exception.
- reader.get();
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testBulkGet(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- int remaining = ba.length;
-
- while(remaining > 0)
- {
- int length = remaining / 2;
- if(length == 0)
- {
- length = remaining % 2;
- }
-
- byte[] readArray = new byte[length];
- reader.get(readArray);
- byte[] subArray = new byte[length];
- System.arraycopy(ba, ba.length - remaining, subArray, 0, length);
- Assert.assertTrue(Arrays.equals(readArray, subArray));
-
- remaining -= length;
- }
-
- // Any more gets should result in IOB exception.
- reader.get(new byte[1]);
- }
-
- @Test(dataProvider = "readerProvider")
- public void testBulkGetWithOffset(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- int remaining = ba.length;
- byte[] readArray = new byte[ba.length];
-
- while(remaining > 0)
- {
- int length = remaining / 2;
- if(length == 0)
- {
- length = remaining % 2;
- }
-
- reader.get(readArray, ba.length - remaining, length);
-
- remaining -= length;
- }
-
- Assert.assertTrue(Arrays.equals(readArray, ba));
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testNegativeOffsetBulkGet(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- byte[] array = new byte[ba.length];
- reader.get(array, -1, ba.length);
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testNegativeLengthBulkGet(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- byte[] array = new byte[ba.length];
- reader.get(array, 0, -1);
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testBadOffLenBulkGet(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- byte[] array = new byte[ba.length];
- reader.get(array, 3, ba.length);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testGetBERLength()
- {
- ByteSequenceReader reader = ByteString.wrap(new byte[]{
- (byte) 0x00, (byte) 0x01, (byte) 0x0F, (byte) 0x10,
- (byte) 0x7F,
-
- (byte) 0x81, (byte) 0xFF,
-
- (byte) 0x82, (byte) 0x01, (byte) 0x00,
- (byte) 0x82, (byte) 0x0F, (byte) 0xFF, (byte) 0x82, (byte) 0x10,
- (byte) 0x00, (byte) 0x82, (byte) 0xFF, (byte) 0xFF,
-
- (byte) 0x83, (byte) 0x01, (byte) 0x00, (byte) 0x00,
- (byte) 0x83, (byte) 0x0F, (byte) 0xFF, (byte) 0xFF,
- (byte) 0x83, (byte) 0x10, (byte) 0x00, (byte) 0x00,
- (byte) 0x83, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
-
- (byte) 0x84, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x84, (byte) 0x0F, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
- (byte) 0x84, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x84, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
-
- (byte) 0x84, (byte) 0x10, (byte) 0x00
- }).asReader();
-
- int[] expectedLength = new int[]{
- 0x00000000, 0x00000001, 0x0000000F, 0x00000010,
- 0x0000007F,
-
- 0x000000FF,
-
- 0x00000100, 0x00000FFF, 0x00001000, 0x0000FFFF,
-
- 0x00010000, 0x000FFFFF, 0x00100000, 0x00FFFFFF,
-
- 0x01000000, 0x0FFFFFFF, 0x10000000, 0xFFFFFFFF
- };
-
- for(int i = 0; i < expectedLength.length; i++)
- {
- Assert.assertEquals(reader.getBERLength(), expectedLength[i]);
- }
-
- // Last one is incomplete and should throw error
- reader.getBERLength();
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testOversizedGetBERLength()
- {
- ByteSequenceReader reader = ByteString.wrap(new byte[]{
- (byte) 0x85, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x00 }).asReader();
-
- // Shouldn't be able to reader over a 4 byte length.
- reader.getBERLength();
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testUndersizedGetBERLength()
- {
- ByteSequenceReader reader = ByteString.wrap(new byte[0]).asReader();
-
- // Shouldn't be able to reader over a 4 byte length.
- reader.getBERLength();
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testGetByteSequence(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- int remaining = ba.length;
-
- while(remaining > 0)
- {
- int length = remaining / 2;
- if(length == 0)
- {
- length = remaining % 2;
- }
-
- ByteSequence readSequence = reader.getByteSequence(length);
- byte[] subArray = new byte[length];
- System.arraycopy(ba, ba.length - remaining, subArray, 0, length);
- Assert.assertTrue(Arrays.equals(readSequence.toByteArray(), subArray));
-
- remaining -= length;
- }
-
- // Any more gets should result in IOB exception.
- reader.getByteSequence(1);
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testGetByteString(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- int remaining = ba.length;
-
- while(remaining > 0)
- {
- int length = remaining / 2;
- if(length == 0)
- {
- length = remaining % 2;
- }
-
- ByteString readSequence = reader.getByteString(length);
- byte[] subArray = new byte[length];
- System.arraycopy(ba, ba.length - remaining, subArray, 0, length);
- Assert.assertTrue(Arrays.equals(readSequence.toByteArray(), subArray));
-
- remaining -= length;
- }
-
- // Any more gets should result in IOB exception.
- reader.getByteString(1);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testGetShort()
- {
- ByteSequenceReader reader = ByteString.wrap(new byte[]{
- (byte) 0x80, (byte) 0x00, (byte) 0x7F, (byte) 0xFF, (byte) 0xFF
- }).asReader();
-
- Assert.assertEquals(reader.getShort(), Short.MIN_VALUE);
- Assert.assertEquals(reader.getShort(), Short.MAX_VALUE);
-
- // Any more gets should result in IOB exception.
- reader.getShort();
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testGetInt()
- {
- ByteSequenceReader reader = ByteString.wrap(new byte[]{
- (byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7F,
- (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF }).asReader();
-
- Assert.assertEquals(reader.getInt(), Integer.MIN_VALUE);
- Assert.assertEquals(reader.getInt(), Integer.MAX_VALUE);
-
- // Any more gets should result in IOB exception.
- reader.getInt();
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testGetLong()
- {
- ByteSequenceReader reader = ByteString.wrap(new byte[]{
- (byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7F, (byte) 0xFF,
- (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
- (byte) 0xFF, (byte) 0xFF }).asReader();
-
- Assert.assertEquals(reader.getLong(), Long.MIN_VALUE);
- Assert.assertEquals(reader.getLong(), Long.MAX_VALUE);
-
- // Any more gets should result in IOB exception.
- reader.getLong();
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testGetString(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- int remaining = ba.length;
-
- while(remaining > 0)
- {
- int length = remaining / 2;
- if(length == 0)
- {
- length = remaining % 2;
- }
-
- String readString = reader.getString(length);
- String subString = new String(ba, ba.length - remaining, length);
- Assert.assertTrue(readString.equals(subString));
-
- remaining -= length;
- }
-
- // Any more gets should result in IOB exception.
- reader.getString(1);
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testSetPosition(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
-
- for(int i = 0; i < ba.length; i++)
- {
- reader.position(i);
- String readString = reader.getString(ba.length - i);
- String subString = new String(ba, i, ba.length - i);
- Assert.assertTrue(readString.equals(subString));
- }
-
- // Setting an invalid position should result in IOB exception.
- reader.position(ba.length+1);
- }
-
- @Test(dataProvider = "readerProvider")
- public void testRemaining(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
-
- for(int i = 0; i < ba.length; i++)
- {
- reader.position(i);
- Assert.assertEquals(reader.remaining(), ba.length - i);
- }
- }
-
- @Test(dataProvider = "readerProvider")
- public void testRewind(ByteSequenceReader reader, byte[] ba)
- {
- reader.position(ba.length - 1);
- reader.rewind();
- Assert.assertEquals(reader.position(), 0);
- }
-
- @Test(dataProvider = "readerProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testSkip(ByteSequenceReader reader, byte[] ba)
- {
- reader.rewind();
- int remaining = ba.length;
-
- while(remaining > 0)
- {
- int length = remaining / 2;
- if(length == 0)
- {
- length = remaining % 2;
- }
-
- reader.skip(length);
- remaining -= length;
-
- Assert.assertEquals(reader.position(), ba.length - remaining);
- }
-
- // Any more skips should result in IOB exception.
- reader.skip(1);
- }
-}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceTest.java
deleted file mode 100644
index 43b3484..0000000
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceTest.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
- */
-
-package org.opends.server.types;
-
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
-import org.testng.Assert;
-
-import java.util.Arrays;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.channels.WritableByteChannel;
-
-/**
- * Abstract test case for the ByteSequence interface.
- */
-public abstract class ByteSequenceTest extends TypesTestCase
-{
- /**
- * ByteSequence data provider that gets the ByteSequence implementation
- * from the abstract method.
- *
- * @return The array of ByteStrings and the bytes it should contain.
- */
- @DataProvider(name = "byteSequenceProvider")
- public Object[][] concreteByteSequenceProvider() throws Exception
- {
- return byteSequenceProvider();
- }
-
- protected abstract Object[][] byteSequenceProvider() throws Exception;
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testByteAt(ByteSequence bs, byte[] ba)
- {
- for(int i = 0; i < ba.length; i++)
- {
- Assert.assertEquals(bs.byteAt(i),ba[i]);
- }
- }
-
- @Test(dataProvider = "byteSequenceProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testByteAtBadIndex1(ByteSequence bs, byte[] ba)
- {
- bs.byteAt(ba.length);
- }
-
- @Test(dataProvider = "byteSequenceProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testByteAtBadIndex2(ByteSequence bs, byte[] ba)
- {
- bs.byteAt(-1);
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testCopyTo(ByteSequence bs, byte[] ba)
- {
- byte[] newBa = new byte[ba.length];
- bs.copyTo(newBa);
- Assert.assertTrue(Arrays.equals(newBa, ba));
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testCopyToWithOffset(ByteSequence bs, byte[] ba)
- {
- for(int i = 0; i < ba.length * 2; i++)
- {
- byte[] newBa = new byte[ba.length * 2];
- bs.copyTo(newBa, i);
-
- byte[] resultBa = new byte[ba.length * 2];
- System.arraycopy(ba, 0, resultBa, i,
- Math.min(ba.length, ba.length * 2 - i));
- Assert.assertTrue(Arrays.equals(newBa, resultBa));
- }
- }
-
- @Test(dataProvider = "byteSequenceProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testCopyToWithBadOffset(ByteSequence bs, byte[] ba)
- {
- bs.copyTo(new byte[0], -1);
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testCopyToByteSequenceBuilder(ByteSequence bs, byte[] ba)
- {
- ByteStringBuilder builder = new ByteStringBuilder();
- bs.copyTo(builder);
- Assert.assertTrue(Arrays.equals(builder.toByteArray(), ba));
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testCopyToOutputStream(ByteSequence bs, byte[] ba) throws Exception
- {
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- bs.copyTo(stream);
- Assert.assertTrue(Arrays.equals(stream.toByteArray(), ba));
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testCopyToWritableByteChannel(ByteSequence bs, byte[] ba) throws Exception
- {
- final ByteStringBuilder dst = new ByteStringBuilder();
- WritableByteChannel channel = new WritableByteChannel()
- {
- public boolean isOpen() { return true; }
- public void close() throws IOException { }
- public int write(ByteBuffer src) throws IOException
- {
- dst.append(src, src.remaining());
- return dst.length();
- }
- };
- bs.copyTo(channel);
- Assert.assertEquals(bs, dst);
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testEquals(ByteSequence bs, byte[] ba) throws Exception
- {
- Assert.assertTrue(bs.equals(ByteString.wrap(ba)));
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testLength(ByteSequence bs, byte[] ba) throws Exception
- {
- Assert.assertEquals(bs.length(), ba.length);
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testSubSequence(ByteSequence bs, byte[] ba)
- {
- ByteSequence bsSub = bs.subSequence(0, bs.length()/2);
- byte[] baSub = new byte[ba.length/2];
- System.arraycopy(ba, 0, baSub, 0, baSub.length);
- Assert.assertTrue(Arrays.equals(bsSub.toByteArray(), baSub));
-
- bsSub = bs.subSequence(ba.length/4, (bs.length()/4)*3);
- baSub = new byte[(bs.length()/4)*3 - ba.length/4];
- System.arraycopy(ba, ba.length/4, baSub, 0, baSub.length);
- Assert.assertTrue(Arrays.equals(bsSub.toByteArray(), baSub));
-
- bsSub = bs.subSequence(ba.length/2, bs.length());
- baSub = new byte[bs.length() - ba.length/2];
- System.arraycopy(ba, ba.length/2, baSub, 0, baSub.length);
- Assert.assertTrue(Arrays.equals(bsSub.toByteArray(), baSub));
-
- bsSub = bs.subSequence(0, bs.length());
- Assert.assertTrue(Arrays.equals(bsSub.toByteArray(), ba));
- }
-
- @Test(dataProvider = "byteSequenceProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testSubSequenceBadStartEnd1(ByteSequence bs, byte[] ba)
- {
- bs.subSequence(-1, bs.length());
- }
-
- @Test(dataProvider = "byteSequenceProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testSubSequenceBadStartEnd2(ByteSequence bs, byte[] ba)
- {
- bs.subSequence(0, bs.length()+1);
- }
-
- @Test(dataProvider = "byteSequenceProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testSubSequenceBadStartEnd3(ByteSequence bs, byte[] ba)
- {
- bs.subSequence(-1, bs.length()+1);
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testToByteArray(ByteSequence bs, byte[] ba)
- {
- Assert.assertTrue(Arrays.equals(bs.toByteArray(), ba));
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testToByteSequence(ByteSequence bs, byte[] ba)
- {
- Assert.assertTrue(Arrays.equals(bs.toByteString().toByteArray(), ba));
- }
-
- @Test(dataProvider = "byteSequenceProvider")
- public void testToString(ByteSequence bs, byte[] ba)
- {
- String str;
- try
- {
- str = new String(ba, "UTF-8");
- }
- catch(UnsupportedEncodingException uee)
- {
- str = new String(ba);
- }
-
- Assert.assertTrue(bs.toString().equals(str));
- }
-
-}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringBuilderTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringBuilderTest.java
deleted file mode 100644
index 8ff07a4..0000000
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringBuilderTest.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
- */
-
-package org.opends.server.types;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.Assert;
-
-import java.nio.ByteBuffer;
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.util.Arrays;
-
-/**
- * Test case for ByteStringBuilder.
- */
-public class ByteStringBuilderTest extends ByteSequenceTest
-{
- private static final byte[] eightBytes =
- new byte[]{ (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
- (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08 };
-
- /**
- * ByteSequence data provider.
- *
- * @return The array of ByteStrings and the bytes it should contain.
- */
- @DataProvider(name = "byteSequenceProvider")
- public Object[][] byteSequenceProvider() throws Exception {
- Object[][] builders = byteStringBuilderProvider();
- Object[][] addlSequences = new Object[builders.length+1][];
- System.arraycopy(builders, 0, addlSequences, 0, builders.length);
- addlSequences[builders.length] = new Object[]
- { new ByteStringBuilder().append(eightBytes).subSequence(2, 6),
- new byte[]{ (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06 } };
-
- return addlSequences;
- }
-
- @DataProvider(name = "builderProvider")
- private Object[][] byteStringBuilderProvider() throws Exception
- {
- ByteBuffer testBuffer = ByteBuffer.wrap(eightBytes);
- ByteString testByteString = ByteString.wrap(eightBytes);
- ByteSequenceReader testByteReader = testByteString.asReader();
- InputStream testStream = new ByteArrayInputStream(eightBytes);
- ByteStringBuilder testBuilderFromStream = new ByteStringBuilder(8);
- testBuilderFromStream.append(testStream, 8);
-
- return new Object[][]
- {
- { new ByteStringBuilder().append((byte) 0x00).append((byte) 0x01),
- new byte[]{ (byte) 0x00, (byte) 0x01 } },
- { new ByteStringBuilder(5).append(new byte[]{ (byte) 0x01, (byte) 0x02,
- (byte) 0x03, (byte) 0x04 }).append(new byte[]{ (byte) 0x05,
- (byte) 0x06, (byte) 0x07, (byte) 0x08 }) , eightBytes },
- { new ByteStringBuilder(3).append(eightBytes, 0, 3).append(
- eightBytes, 3, 5), eightBytes },
- { new ByteStringBuilder().append(testBuffer, 3).append(testBuffer, 5),
- eightBytes },
- { new ByteStringBuilder(2).append(testByteString), eightBytes },
- { new ByteStringBuilder().append(testByteReader, 5).append(
- testByteReader, 3), eightBytes },
- { testBuilderFromStream, eightBytes },
- { new ByteStringBuilder().append(Short.MIN_VALUE).append(Short.MAX_VALUE),
- new byte[]{(byte) 0x80, (byte) 0x00, (byte) 0x7F, (byte) 0xFF } },
- { new ByteStringBuilder(5).append(
- Integer.MIN_VALUE).append(Integer.MAX_VALUE),
- new byte[]{(byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x7F, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF } },
- { new ByteStringBuilder().append(
- Long.MIN_VALUE).append(Long.MAX_VALUE),
- new byte[]{(byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7F,
- (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
- (byte) 0xFF, (byte) 0xFF } },
- { new ByteStringBuilder(11).append("this is a").append(" test"),
- "this is a test".getBytes("UTF-8") },
- { new ByteStringBuilder().appendBERLength(0x00000000).
- appendBERLength(0x00000001).appendBERLength(0x0000000F).
- appendBERLength(0x00000010).appendBERLength(0x0000007F).
-
- appendBERLength(0x000000FF).
-
- appendBERLength(0x00000100).appendBERLength(0x00000FFF).
- appendBERLength(0x00001000).appendBERLength(0x0000FFFF).
-
- appendBERLength(0x00010000).appendBERLength(0x000FFFFF).
- appendBERLength(0x00100000).appendBERLength(0x00FFFFFF).
-
- appendBERLength(0x01000000).appendBERLength(0x0FFFFFFF).
- appendBERLength(0x10000000).appendBERLength(0xFFFFFFFF),
-
- new byte[]{(byte) 0x00, (byte) 0x01, (byte) 0x0F, (byte) 0x10,
- (byte) 0x7F,
-
- (byte) 0x81, (byte) 0xFF,
-
- (byte) 0x82, (byte) 0x01, (byte) 0x00,
- (byte) 0x82, (byte) 0x0F, (byte) 0xFF, (byte) 0x82, (byte) 0x10,
- (byte) 0x00, (byte) 0x82, (byte) 0xFF, (byte) 0xFF,
-
- (byte) 0x83, (byte) 0x01, (byte) 0x00, (byte) 0x00,
- (byte) 0x83, (byte) 0x0F, (byte) 0xFF, (byte) 0xFF,
- (byte) 0x83, (byte) 0x10, (byte) 0x00, (byte) 0x00,
- (byte) 0x83, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
-
- (byte) 0x84, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x84, (byte) 0x0F, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
- (byte) 0x84, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x84, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF}},
-
- };
- }
-
- @Test(expectedExceptions = IllegalArgumentException.class)
- public void testInvalidCapacity()
- {
- new ByteStringBuilder(-1);
- }
-
- @Test(dataProvider = "builderProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testClear(ByteStringBuilder bs, byte[] ba)
- {
- bs.clear();
- Assert.assertEquals(bs.length(), 0);
- bs.byteAt(0);
- }
-
- @Test(dataProvider = "builderProvider",
- expectedExceptions = IndexOutOfBoundsException.class)
- public void testClearWithNewCapacity(ByteStringBuilder bs, byte[] ba)
- {
- bs.clear(123);
- Assert.assertEquals(bs.length(), 0);
- Assert.assertEquals(bs.capacity(), 123);
- bs.byteAt(0);
- }
-
- @Test
- public void testEnsureAdditionalCapacity()
- {
- ByteStringBuilder bsb = new ByteStringBuilder(8);
- Assert.assertEquals(bsb.getBackingArray().length, 8);
- bsb.ensureAdditionalCapacity(43);
- bsb.ensureAdditionalCapacity(2);
- Assert.assertTrue(bsb.getBackingArray().length >= 43);
- }
-
- @Test(dataProvider = "builderProvider")
- public void testGetBackingArray(ByteStringBuilder bs, byte[] ba)
- {
- byte[] trimmedArray = new byte[bs.length()];
- System.arraycopy(bs.getBackingArray(), 0, trimmedArray, 0, bs.length());
- Assert.assertTrue(Arrays.equals(trimmedArray, ba));
- }
-
- @Test
- public void testTrimToSize()
- {
- ByteStringBuilder bsb = new ByteStringBuilder();
- bsb.append(eightBytes);
- Assert.assertTrue(bsb.capacity() > 8);
- bsb.trimToSize();
- Assert.assertEquals(bsb.capacity(), 8);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testAppendBadOffset1()
- {
- new ByteStringBuilder().append(new byte[5], -1, 3);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testAppendBadOffset2()
- {
- new ByteStringBuilder().append(new byte[5], 6, 0);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testAppendBadLength1()
- {
- new ByteStringBuilder().append(new byte[5], 0, 6);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testAppendBadLength2()
- {
- new ByteStringBuilder().append(new byte[5], 0, -1);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testAppendBadByteBufferLength1()
- {
- new ByteStringBuilder().append(ByteBuffer.wrap(new byte[5]), -1);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testAppendBadByteBufferLength2()
- {
- new ByteStringBuilder().append(ByteBuffer.wrap(new byte[5]), 6);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testAppendBadByteSequenceReaderLength1()
- {
- new ByteStringBuilder().append(ByteString.wrap(new byte[5]).asReader(), -1);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testAppendBadByteSequenceReaderLength2()
- {
- new ByteStringBuilder().append(ByteString.wrap(new byte[5]).asReader(), 6);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testAppendBadInputStreamLength() throws Exception
- {
- ByteArrayInputStream stream = new ByteArrayInputStream(new byte[5]);
- new ByteStringBuilder().append(stream, -1);
- }
-
- @Test
- public void testAppendInputStream() throws Exception
- {
- ByteStringBuilder bsb = new ByteStringBuilder();
- ByteArrayInputStream stream = new ByteArrayInputStream(new byte[5]);
- Assert.assertEquals(bsb.append(stream, 10), 5);
- }
-
- @Test
- public void testSetByteAt() throws Exception
- {
- ByteStringBuilder bsb = new ByteStringBuilder();
- bsb.append(0L);
- Assert.assertEquals(bsb.byteAt(0), 0);
- bsb.setByteAt(0, (byte) 0xff);
- Assert.assertEquals(bsb.byteAt(0), (byte) 0xff);
- }
-}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringTest.java
deleted file mode 100644
index 0e4ebc2..0000000
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2009 Sun Microsystems, Inc.
- */
-
-package org.opends.server.types;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.Assert;
-
-/**
- * This class defines a set of tests for the
- * org.opends.server.types.ByteString class.
- */
-public class ByteStringTest extends ByteSequenceTest
-{
- @DataProvider(name = "byteStringIntegerProvier")
- public Object[][] byteStringIntegerProvider()
- {
- return new Object[][]
- {
- { ByteString.valueOf(0), 0 },
- { ByteString.valueOf(1), 1 },
- { ByteString.valueOf(Integer.MAX_VALUE), Integer.MAX_VALUE },
- { ByteString.valueOf(Integer.MIN_VALUE), Integer.MIN_VALUE },
- };
- }
-
- @DataProvider(name = "byteStringLongProvier")
- public Object[][] byteStringLongProvider()
- {
- return new Object[][]
- {
- { ByteString.valueOf(0L), 0L },
- { ByteString.valueOf(1L), 1L },
- { ByteString.valueOf(Long.MAX_VALUE), Long.MAX_VALUE },
- { ByteString.valueOf(Long.MIN_VALUE), Long.MIN_VALUE }
- };
- }
-
- /**
- * ByteString data provider.
- *
- * @return The array of ByteStrings and the bytes it should contain.
- */
- @DataProvider(name = "byteSequenceProvider")
- public Object[][] byteSequenceProvider() throws Exception
- {
- return new Object[][]
- {
- { ByteString.empty(), new byte[0] },
- { ByteString.valueOf(1), new byte[]{ (byte) 0x00, (byte) 0x00,
- (byte) 0x00, (byte) 0x01 } },
- { ByteString.valueOf(Integer.MAX_VALUE), new byte[]{ (byte)0x7F,
- (byte) 0xFF, (byte) 0xFF, (byte) 0xFF} },
- { ByteString.valueOf(Integer.MIN_VALUE), new byte[]{ (byte) 0x80,
- (byte) 0x00, (byte) 0x00, (byte) 0x00} },
- { ByteString.valueOf(Long.MAX_VALUE), new byte[]{ (byte) 0x7F,
- (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
- (byte) 0xFF, (byte) 0xFF} },
- { ByteString.valueOf(Long.MIN_VALUE), new byte[]{ (byte) 0x80,
- (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
- (byte) 0x00, (byte) 0x00 } },
- { ByteString.valueOf("cn=testvalue"),
- "cn=testvalue".getBytes("UTF-8") },
- { ByteString.wrap(new byte[0]), new byte[0] },
- { ByteString.wrap(new byte[]{ (byte) 0x01, (byte) 0x02, (byte) 0x03,
- (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08 }),
- new byte[]{ (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
- (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08 } },
- { ByteString.wrap(new byte[]{ (byte) 0x01, (byte) 0x02, (byte) 0x03,
- (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08,
- (byte) 0x09, (byte) 0x10 }, 0, 8),
- new byte[]{ (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04,
- (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08 } },
- { ByteString.wrap(new byte[]{ (byte) 0x01, (byte) 0x02, (byte) 0x03,
- (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08,
- (byte) 0x09, (byte) 0x10 }, 1, 8),
- new byte[]{ (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05,
- (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09 } },
- { ByteString.wrap(new byte[]{ (byte) 0x01, (byte) 0x02, (byte) 0x03,
- (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08,
- (byte) 0x09, (byte) 0x10 }, 2, 8),
- new byte[]{ (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06,
- (byte) 0x07, (byte) 0x08, (byte) 0x09, (byte) 0x10 } },
- { ByteString.wrap(new byte[]{ (byte) 0x01, (byte) 0x02, (byte) 0x03,
- (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08 }
- , 3, 0), new byte[0] },
- };
- }
-
- @Test(dataProvider = "byteStringIntegerProvider")
- public void testToInteger(ByteString bs, int i)
- {
- Assert.assertEquals(bs.toInt(), i);
- }
-
- @Test(dataProvider = "byteStringLongProvider")
- public void testToLong(ByteString bs, long l)
- {
- Assert.assertEquals(bs.toLong(), l);
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testUndersizedToInteger()
- {
- ByteString.wrap(new byte[]{(byte)0x00, (byte)0x01}).toInt();
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testUndersizedToLong()
- {
- ByteString.wrap(new byte[]{(byte)0x00, (byte)0x01, (byte)0x02,
- (byte)0x03}).toLong();
- }
-
- @Test(expectedExceptions = IndexOutOfBoundsException.class)
- public void testInvalidWrapLength()
- {
- ByteString.wrap(new byte[]{(byte)0x00, (byte)0x01, (byte)0x02,
- (byte)0x03}, 2, 8);
- }
-}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java
index b47a676..be2dbb3 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import static org.testng.Assert.*;
import org.opends.server.TestCaseUtils;
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 98e12d0..ebc1ec3 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
@@ -26,8 +26,6 @@
*/
package org.opends.server.types;
-
-
import java.util.ArrayList;
import java.util.List;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
index 7337757..6c8c044 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import static org.opends.server.types.AcceptRejectWarn.*;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
index 43ce2e2..a7dffaa 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import org.testng.annotations.Test;
import org.opends.messages.Message;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java
index 7c34778..f9d6e89 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java
@@ -21,12 +21,10 @@
* CDDL HEADER END
*
*
- * Copyright 2012 ForgeRock AS.
+ * Portions Copyright 2012-2014 ForgeRock AS.
*/
package org.opends.server.types;
-
-
import static org.testng.Assert.assertEquals;
import org.opends.server.TestCaseUtils;
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 e7b37e2..6b41c67 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
@@ -26,6 +26,7 @@
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
index aa40f22..eefc4ac 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
@@ -22,9 +22,11 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.util.StaticUtils;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
index 623399c..c92e6f2 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java
index 237f52a..5a58c9a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java
@@ -22,9 +22,11 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.testng.Assert;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
index 67eff1d..915d054 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
index f396e9b..14c3e5b 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
@@ -26,8 +26,7 @@
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import java.util.ArrayList;
import static org.testng.Assert.*;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
index 7c2cd64..8062255 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.types;
+import org.forgerock.opendj.ldap.ByteString;
import static org.testng.Assert.*;
import java.util.ArrayList;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
index 1377d8c..91ebb66 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
index ae92069..42dbc22 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
import java.util.ArrayList;
import static org.testng.Assert.assertEquals;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
index 84ff116..57398b7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.types;
-
-
import java.util.Collections;
import java.util.LinkedHashSet;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
index 579ae38..7ee1aa9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
@@ -22,12 +22,11 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.types;
-
-
+import org.forgerock.opendj.ldap.ByteString;
import static org.testng.Assert.*;
import java.util.Collections;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
index 85ceec2..653da5f 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.util;
@@ -49,7 +50,7 @@
/**
* Base 64 valid test data provider.
- *
+ *
* @return Returns an array of decoded and valid encoded base64 data.
*/
@DataProvider(name = "validData")
@@ -94,7 +95,7 @@
/**
* Base 64 invalid test data provider.
- *
+ *
* @return Returns an array of invalid encoded base64 data.
*/
@DataProvider(name = "invalidData")
@@ -113,7 +114,7 @@
/**
* Tests the encode method.
- *
+ *
* @param hexData
* The decoded hex data.
* @param encodedData
@@ -131,7 +132,7 @@
/**
* Tests the decode method against valid data.
- *
+ *
* @param hexData
* The decoded hex data.
* @param encodedData
@@ -149,7 +150,7 @@
/**
* Tests the decode method against invalid data.
- *
+ *
* @param encodedData
* The invalid encoded data.
* @throws Exception
@@ -163,7 +164,7 @@
/**
* Decode a hex string to a byte-array.
- *
+ *
* @param hexData
* The string of hex.
* @return Returns the decoded byte array.
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java
index 890090c..b0ff0e8 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java
@@ -23,6 +23,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2007 Brighton Consulting, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.util;
@@ -45,7 +46,7 @@
/**
* Crypt valid test data provider. All crypts are variants of the password
* "password".
- *
+ *
* @return Returns an array of all salted version of "password".
*/
@DataProvider
@@ -69,7 +70,7 @@
* single parameter serves as an input parameter (the salt at the
* start of the parameter), as well as to validate that the parameter
* was properly encrypted.
- *
+ *
* @param saltedPassword
* A hashed value of "password".
*/
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
index eeb0921..fdf2625 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.util;
@@ -45,8 +45,8 @@
import java.util.List;
import org.opends.server.TestCaseUtils;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ByteSequence;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
--
Gitblit v1.10.0