From d34bf5be3b9fb0cfe6291f35d71bdef728d7120c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 May 2011 14:24:46 +0000
Subject: [PATCH] Partial fix for OPENDJ-39: Consider rebranding OpenDS -> OpenDJ in 3.0 tree
---
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnsupportedMessageException.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransport.java | 2
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java | 5
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java | 5
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Filter.java | 10
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Functions.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java | 2
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterators.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connections.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java | 6
opendj3/opendj-client-tools/src/main/assembly/bin/searchrate | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java | 10
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedRequestException.java | 2
opendj3/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPListenerImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPBindFutureResultImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java | 6
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Predicate.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java | 6
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entries.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java | 2
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java | 2
opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java | 2
opendj3/opendj-client-tools/src/main/assembly/bin/ldapmodify | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Modification.java | 2
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java | 6
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLFilter.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java | 8
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLEncoderTransformer.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java | 2
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/Base64TestCase.java | 7
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java | 2
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedResponseException.java | 2
opendj3/opendj-client-tools/src/main/assembly/bat/modrate.bat | 2
opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java | 2
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java | 2
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java | 2
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java | 2
opendj3/opendj-client-tools/src/main/assembly/bin/authrate | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLDecoderTransformer.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPFutureResultImpl.java | 2
opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java | 2
opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java | 4
opendj3/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterables.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java | 6
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java | 4
opendj3/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java | 2
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SubstringReader.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AVA.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java | 6
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPMessageHandler.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java | 6
opendj3/opendj-client-tools/src/main/assembly/bin/ldapcompare | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/TimeoutChecker.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java | 2
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java | 5
opendj3/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat | 2
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java | 2
opendj3/opendj-client-tools/src/main/assembly/bat/authrate.bat | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java | 6
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Collections2.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferReader.java | 9
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java | 8
opendj3/opendj-client-tools/src/main/assembly/bat/searchrate.bat | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPCompareFutureResultImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferWriter.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPSearchFutureResultImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java | 2
opendj3/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/DN.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/RDN.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java | 2
opendj3/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java | 6
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/package-info.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java | 4
opendj3/opendj-client-tools/src/main/assembly/bin/modrate | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPMessageHandler.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java | 2
opendj3/opendj-client-tools/src/main/assembly/bin/ldapsearch | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java | 8
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Function.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Base64.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java | 2
opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousConnectionDecorator.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java | 2
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java | 4
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransportTestCase.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java | 4
opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferReaderTestCase.java | 4
opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java | 8
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java | 8
opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java | 6
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPServerFilter.java | 8
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java | 6
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java | 4
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/package-info.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java | 2
opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Validator.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java | 4
opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java | 2
opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java | 2
283 files changed, 506 insertions(+), 491 deletions(-)
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bat/authrate.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/authrate.bat
index c8d5ffa..afbaea7 100644
--- a/opendj3/opendj-client-tools/src/main/assembly/bat/authrate.bat
+++ b/opendj3/opendj-client-tools/src/main/assembly/bat/authrate.bat
@@ -27,7 +27,7 @@
setlocal
-set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.AuthRate"
+set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.AuthRate"
set SCRIPT_NAME=authrate
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat
index 30310fe..d9752a5 100755
--- a/opendj3/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat
+++ b/opendj3/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat
@@ -27,7 +27,7 @@
setlocal
-set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPCompare"
+set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPCompare"
set SCRIPT_NAME=ldapcompare
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat
index 960e31d..a9adf2a 100755
--- a/opendj3/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat
+++ b/opendj3/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat
@@ -27,7 +27,7 @@
setlocal
-set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPModify"
+set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPModify"
set SCRIPT_NAME=ldapmodify
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat
index baf984a..7da6353 100755
--- a/opendj3/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat
+++ b/opendj3/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat
@@ -27,7 +27,7 @@
setlocal
-set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPPasswordModify"
+set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPPasswordModify"
set SCRIPT_NAME=ldappasswordmodify
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat
index 19577f2..7b12576 100755
--- a/opendj3/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat
+++ b/opendj3/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat
@@ -27,7 +27,7 @@
setlocal
-set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPSearch"
+set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPSearch"
set SCRIPT_NAME=ldapsearch
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bat/modrate.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/modrate.bat
index f4bffb8..ee0a005 100755
--- a/opendj3/opendj-client-tools/src/main/assembly/bat/modrate.bat
+++ b/opendj3/opendj-client-tools/src/main/assembly/bat/modrate.bat
@@ -27,7 +27,7 @@
setlocal
-set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.ModRate"
+set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.ModRate"
set SCRIPT_NAME=modrate
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bat/searchrate.bat b/opendj3/opendj-client-tools/src/main/assembly/bat/searchrate.bat
index a2f2014..794e8da 100755
--- a/opendj3/opendj-client-tools/src/main/assembly/bat/searchrate.bat
+++ b/opendj3/opendj-client-tools/src/main/assembly/bat/searchrate.bat
@@ -27,7 +27,7 @@
setlocal
-set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.SearchRate"
+set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.SearchRate"
set SCRIPT_NAME=searchrate
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bin/authrate b/opendj3/opendj-client-tools/src/main/assembly/bin/authrate
index a21440f..6695ad0 100644
--- a/opendj3/opendj-client-tools/src/main/assembly/bin/authrate
+++ b/opendj3/opendj-client-tools/src/main/assembly/bin/authrate
@@ -27,7 +27,7 @@
# This script may be used to measure auth performance.
-OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.AuthRate"
+OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.AuthRate"
export OPENDS_INVOKE_CLASS
SCRIPT_NAME="authrate"
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bin/ldapcompare b/opendj3/opendj-client-tools/src/main/assembly/bin/ldapcompare
index 2b42932..297cc76 100644
--- a/opendj3/opendj-client-tools/src/main/assembly/bin/ldapcompare
+++ b/opendj3/opendj-client-tools/src/main/assembly/bin/ldapcompare
@@ -27,7 +27,7 @@
# This script may be used to perform LDAP compare operations.
-OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPCompare"
+OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPCompare"
export OPENDS_INVOKE_CLASS
SCRIPT_NAME="ldapcompare"
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bin/ldapmodify b/opendj3/opendj-client-tools/src/main/assembly/bin/ldapmodify
index a42accf..6432fdb 100644
--- a/opendj3/opendj-client-tools/src/main/assembly/bin/ldapmodify
+++ b/opendj3/opendj-client-tools/src/main/assembly/bin/ldapmodify
@@ -28,7 +28,7 @@
# This script may be used to perform LDAP add, delete, modify, and modify DN
# operations.
-OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPModify"
+OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPModify"
export OPENDS_INVOKE_CLASS
SCRIPT_NAME="ldapmodify"
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify b/opendj3/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify
index 2156425..00a2dee 100644
--- a/opendj3/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify
+++ b/opendj3/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify
@@ -27,7 +27,7 @@
# This script may be used to perform LDAP password modify operations.
-OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPPasswordModify"
+OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPPasswordModify"
export OPENDS_INVOKE_CLASS
SCRIPT_NAME="ldappasswordmodify"
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bin/ldapsearch b/opendj3/opendj-client-tools/src/main/assembly/bin/ldapsearch
index f4c983d..fe50998 100644
--- a/opendj3/opendj-client-tools/src/main/assembly/bin/ldapsearch
+++ b/opendj3/opendj-client-tools/src/main/assembly/bin/ldapsearch
@@ -27,7 +27,7 @@
# This script may be used to perform LDAP search operations.
-OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPSearch"
+OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPSearch"
export OPENDS_INVOKE_CLASS
SCRIPT_NAME="ldapsearch"
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bin/modrate b/opendj3/opendj-client-tools/src/main/assembly/bin/modrate
index 4266c03..dcd4811 100644
--- a/opendj3/opendj-client-tools/src/main/assembly/bin/modrate
+++ b/opendj3/opendj-client-tools/src/main/assembly/bin/modrate
@@ -27,7 +27,7 @@
# This script may be used to perform LDAP search operations.
-OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.ModRate"
+OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.ModRate"
export OPENDS_INVOKE_CLASS
SCRIPT_NAME="modrate"
diff --git a/opendj3/opendj-client-tools/src/main/assembly/bin/searchrate b/opendj3/opendj-client-tools/src/main/assembly/bin/searchrate
index 250bf69..aca387e 100644
--- a/opendj3/opendj-client-tools/src/main/assembly/bin/searchrate
+++ b/opendj3/opendj-client-tools/src/main/assembly/bin/searchrate
@@ -27,7 +27,7 @@
# This script may be used to perform LDAP search operations.
-OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.SearchRate"
+OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.SearchRate"
export OPENDS_INVOKE_CLASS
SCRIPT_NAME="searchrate"
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java
index d7df3f0..369c754 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java
@@ -29,7 +29,7 @@
import static org.opends.sdk.CoreMessages.*;
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import java.util.Iterator;
import java.util.LinkedList;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java
index 24bcaaf..f22fc68 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java
@@ -29,13 +29,13 @@
import static org.opends.sdk.CoreMessages.*;
+import static com.forgerock.opendj.util.StaticUtils.EOL;
+import static com.forgerock.opendj.util.StaticUtils.getBytes;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static com.sun.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.Utils.PROPERTY_SCRIPT_NAME;
import static com.sun.opends.sdk.tools.Utils.wrapText;
-import static com.sun.opends.sdk.util.StaticUtils.EOL;
-import static com.sun.opends.sdk.util.StaticUtils.getBytes;
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import java.io.File;
import java.io.FileInputStream;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java
index 5e6a6b7..161c129 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java
@@ -49,7 +49,7 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.SearchResultEntry;
-import com.sun.opends.sdk.util.RecursiveFutureResult;
+import com.forgerock.opendj.util.RecursiveFutureResult;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
index 4735781..31c72d8 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
@@ -33,10 +33,10 @@
import org.opends.sdk.requests.BindRequest;
import org.opends.sdk.responses.BindResult;
-import com.sun.opends.sdk.util.AsynchronousConnectionDecorator;
-import com.sun.opends.sdk.util.FutureResultTransformer;
-import com.sun.opends.sdk.util.RecursiveFutureResult;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.AsynchronousConnectionDecorator;
+import com.forgerock.opendj.util.FutureResultTransformer;
+import com.forgerock.opendj.util.RecursiveFutureResult;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java
index b21828b..6b124c4 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java
@@ -34,8 +34,9 @@
import java.io.IOException;
import java.util.*;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
+
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java
index eb8d8ff..c309dce 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java
@@ -29,7 +29,7 @@
import static org.opends.sdk.CoreMessages.*;
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import java.io.BufferedReader;
import java.io.File;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java
index cf269f3..28116fc 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java
@@ -47,7 +47,7 @@
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
-import com.sun.opends.sdk.util.Base64;
+import com.forgerock.opendj.util.Base64;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java
index 6a20d33..dd2a117 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java
@@ -49,8 +49,8 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.responses.SearchResultReference;
-import com.sun.opends.sdk.controls.AccountUsabilityResponseControl;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.ldap.controls.AccountUsabilityResponseControl;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java
index eec24cb..746a876 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java
@@ -44,8 +44,8 @@
import org.opends.sdk.responses.ExtendedResult;
import org.opends.sdk.responses.Result;
+import com.forgerock.opendj.util.StaticUtils;
import com.sun.opends.sdk.tools.AuthenticatedConnectionFactory.AuthenticatedAsynchronousConnection;
-import com.sun.opends.sdk.util.StaticUtils;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java
index e9c209f..b350c10 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java
@@ -52,7 +52,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java
index 7c63fe8..b0487ee 100644
--- a/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java
+++ b/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java
@@ -29,7 +29,7 @@
import static org.opends.sdk.CoreMessages.*;
-import static com.sun.opends.sdk.util.StaticUtils.EOL;
+import static com.forgerock.opendj.util.StaticUtils.EOL;
import java.io.File;
import java.io.FileInputStream;
@@ -41,9 +41,9 @@
import org.opends.sdk.controls.*;
import org.opends.sdk.responses.BindResult;
-import com.sun.opends.sdk.controls.AccountUsabilityRequestControl;
+import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;
+import com.forgerock.opendj.util.StaticUtils;
import com.sun.opends.sdk.tools.AuthenticatedConnectionFactory.AuthenticatedConnection;
-import com.sun.opends.sdk.util.StaticUtils;
@@ -55,7 +55,7 @@
/**
* The name of a command-line script used to launch a tool.
*/
- static final String PROPERTY_SCRIPT_NAME = "com.sun.opends.sdk.tools.scriptName";
+ static final String PROPERTY_SCRIPT_NAME = "com.forgerock.opendj.ldap.tools.scriptName";
/**
* The column at which to wrap long lines of output in the command-line tools.
diff --git a/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java b/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
index a0a84de..2c256d1 100644
--- a/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
+++ b/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
@@ -36,7 +36,7 @@
/**
* An abstract class that all tools unit tests should extend. A tool represents
- * the classes found directly under the package com.sun.opends.sdk.tools.
+ * the classes found directly under the package com.forgerock.opendj.ldap.tools.
*/
@Test(groups = { "precommit", "tools", "sdk" })
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferReader.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferReader.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferReader.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferReader.java
index 9b9163a..6e38a01 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferReader.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferReader.java
@@ -25,14 +25,11 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
-import static com.sun.opends.sdk.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
-import static com.sun.opends.sdk.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE;
-import static com.sun.opends.sdk.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_TYPE;
-import static com.sun.opends.sdk.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_VALUE_BYTES;
+import static com.forgerock.opendj.ldap.LDAPConstants.*;
import static org.opends.sdk.CoreMessages.*;
import java.io.IOException;
@@ -49,7 +46,7 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.AbstractASN1Reader;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferWriter.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferWriter.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferWriter.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferWriter.java
index 1d74e12..94ecac4 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferWriter.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferWriter.java
@@ -24,7 +24,7 @@
*
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -46,7 +46,7 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.asn1.AbstractASN1Writer;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java
index 4881524..5ed5f9d 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -34,7 +34,7 @@
import org.opends.sdk.responses.IntermediateResponse;
import org.opends.sdk.responses.Result;
-import com.sun.opends.sdk.util.AsynchronousFutureResult;
+import com.forgerock.opendj.util.AsynchronousFutureResult;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPMessageHandler.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPMessageHandler.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPMessageHandler.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPMessageHandler.java
index 7112404..95bfdc7 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPMessageHandler.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPMessageHandler.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/InternalConnection.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/InternalConnection.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
index 99200ef..3d61e17 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/InternalConnection.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -37,8 +37,8 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
-import com.sun.opends.sdk.util.CompletedFutureResult;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.CompletedFutureResult;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPBindFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPBindFutureResultImpl.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPBindFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPBindFutureResultImpl.java
index 8c364b1..e9d0429 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPBindFutureResultImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPBindFutureResultImpl.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPClientFilter.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPClientFilter.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java
index d3ea0c5..e7423b9 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPClientFilter.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java
@@ -25,11 +25,11 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
-import static com.sun.opends.sdk.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
+import static com.forgerock.opendj.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
import java.io.EOFException;
import java.io.IOException;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPCompareFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPCompareFutureResultImpl.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPCompareFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPCompareFutureResultImpl.java
index 9037585..dfa9cba 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPCompareFutureResultImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPCompareFutureResultImpl.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnection.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnection.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java
index 2bcdee9..919b940 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnection.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -51,9 +51,9 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
-import com.sun.opends.sdk.util.CompletedFutureResult;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.CompletedFutureResult;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java
index 20f0a37..9eba751 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -49,9 +49,9 @@
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
-import com.sun.opends.sdk.util.CompletedFutureResult;
-import com.sun.opends.sdk.util.FutureResultTransformer;
-import com.sun.opends.sdk.util.RecursiveFutureResult;
+import com.forgerock.opendj.util.CompletedFutureResult;
+import com.forgerock.opendj.util.FutureResultTransformer;
+import com.forgerock.opendj.util.RecursiveFutureResult;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConstants.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConstants.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java
index a79b8fb..6dfd3cb 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConstants.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransport.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransport.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransport.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransport.java
index 5a6502c..311e4d8 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransport.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransport.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java
index 6005fa4..01da040 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPFutureResultImpl.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPFutureResultImpl.java
index bcf8052..4b5c4b4 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPFutureResultImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPFutureResultImpl.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPListenerImpl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPListenerImpl.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPListenerImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPListenerImpl.java
index abbfea1..1d33f21 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPListenerImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPListenerImpl.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -48,7 +48,7 @@
import org.opends.sdk.LDAPListenerOptions;
import org.opends.sdk.ServerConnectionFactory;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPMessageHandler.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPMessageHandler.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPMessageHandler.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPMessageHandler.java
index 44dcc29..4c68c60 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPMessageHandler.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPMessageHandler.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPReader.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPReader.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java
index 5d3eed5..e08a13f 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPReader.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java
@@ -25,11 +25,11 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
-import static com.sun.opends.sdk.ldap.LDAPConstants.*;
+import static com.forgerock.opendj.ldap.LDAPConstants.*;
import static org.opends.sdk.CoreMessages.ERR_LDAP_MODIFICATION_DECODE_INVALID_MOD_TYPE;
import static org.opends.sdk.CoreMessages.ERR_LDAP_SEARCH_REQUEST_DECODE_INVALID_DEREF;
import static org.opends.sdk.CoreMessages.ERR_LDAP_SEARCH_REQUEST_DECODE_INVALID_SCOPE;
@@ -48,7 +48,7 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPSearchFutureResultImpl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPSearchFutureResultImpl.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPSearchFutureResultImpl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPSearchFutureResultImpl.java
index aa27040..e5bff64 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPSearchFutureResultImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPSearchFutureResultImpl.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPServerFilter.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPServerFilter.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPServerFilter.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPServerFilter.java
index a4b9747..9e35670 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPServerFilter.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPServerFilter.java
@@ -25,11 +25,11 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
-import static com.sun.opends.sdk.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
+import static com.forgerock.opendj.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -52,8 +52,8 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPUtils.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPUtils.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
index b91adc1..fe335c8 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPUtils.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
@@ -25,11 +25,11 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
-import static com.sun.opends.sdk.ldap.LDAPConstants.*;
+import static com.forgerock.opendj.ldap.LDAPConstants.*;
import java.io.IOException;
import java.util.Collections;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPWriter.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPWriter.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java
index feaabf7..3ea726b 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPWriter.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java
@@ -25,11 +25,11 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
-import static com.sun.opends.sdk.ldap.LDAPConstants.*;
+import static com.forgerock.opendj.ldap.LDAPConstants.*;
import java.io.IOException;
import java.util.List;
@@ -44,7 +44,7 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLDecoderTransformer.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLDecoderTransformer.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLDecoderTransformer.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLDecoderTransformer.java
index e3218de..37807e7 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLDecoderTransformer.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLDecoderTransformer.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLEncoderTransformer.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLEncoderTransformer.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLEncoderTransformer.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLEncoderTransformer.java
index c3ef2b9..1539786 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLEncoderTransformer.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLEncoderTransformer.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLFilter.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLFilter.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLFilter.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLFilter.java
index 11f005a..1b98241 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLFilter.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLFilter.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/TimeoutChecker.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/TimeoutChecker.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/TimeoutChecker.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/TimeoutChecker.java
index 87dd79e..23346a8 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/TimeoutChecker.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/TimeoutChecker.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -35,7 +35,7 @@
import org.glassfish.grizzly.utils.LinkedTransferQueue;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedRequestException.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedRequestException.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedRequestException.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedRequestException.java
index e021911..e019d0a 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedRequestException.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedRequestException.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedResponseException.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedResponseException.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedResponseException.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedResponseException.java
index 7a10649..d9d46c4 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedResponseException.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedResponseException.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnsupportedMessageException.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnsupportedMessageException.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnsupportedMessageException.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnsupportedMessageException.java
index acbd2a7..a75c8e5 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnsupportedMessageException.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnsupportedMessageException.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java
index 730902d..9b37f5f 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java
@@ -24,7 +24,7 @@
*
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.controls;
+package com.forgerock.opendj.ldap.controls;
@@ -38,7 +38,7 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.ControlDecoder;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java
index 2f060b8..995dfbb 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java
@@ -24,12 +24,12 @@
*
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.controls;
+package com.forgerock.opendj.ldap.controls;
-import static com.sun.opends.sdk.util.StaticUtils.byteToHex;
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.byteToHex;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_ACCTUSABLERES_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.ERR_ACCTUSABLERES_DECODE_ERROR;
import static org.opends.sdk.CoreMessages.ERR_ACCTUSABLERES_NO_CONTROL_VALUE;
@@ -48,8 +48,8 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.ControlDecoder;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/RealAttributesOnlyRequestControl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/RealAttributesOnlyRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java
index 228fd50..048c3fc 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/RealAttributesOnlyRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java
@@ -24,7 +24,7 @@
*
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.controls;
+package com.forgerock.opendj.ldap.controls;
@@ -38,7 +38,7 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.ControlDecoder;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/VirtualAttributesOnlyRequestControl.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/VirtualAttributesOnlyRequestControl.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java
index 8db5570..694073a 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/VirtualAttributesOnlyRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java
@@ -24,7 +24,7 @@
*
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.controls;
+package com.forgerock.opendj.ldap.controls;
@@ -38,7 +38,7 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.ControlDecoder;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/package-info.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java
similarity index 95%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/package-info.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java
index d35f771..3c8c492 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/package-info.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java
@@ -28,7 +28,7 @@
/**
* Classes implementing Sun proprietary LDAP controls.
*/
-package com.sun.opends.sdk.controls;
+package com.forgerock.opendj.ldap.controls;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java
index a6eab99..b122843 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedRequest.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.extensions;
+package com.forgerock.opendj.ldap.extensions;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedResult.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedResult.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java
index 7ed2385..566d1ef 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedResult.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.extensions;
+package com.forgerock.opendj.ldap.extensions;
@@ -38,7 +38,7 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.responses.AbstractExtendedResult;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
/**
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetSymmetricKeyExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetSymmetricKeyExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
index b1f40f8..fce7369 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetSymmetricKeyExtendedRequest.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.extensions;
+package com.forgerock.opendj.ldap.extensions;
@@ -48,7 +48,7 @@
import org.opends.sdk.responses.ExtendedResultDecoder;
import org.opends.sdk.responses.Responses;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedRequest.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java
index c558aa3..ad3b2a2 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedRequest.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java
@@ -25,12 +25,12 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.extensions;
+package com.forgerock.opendj.ldap.extensions;
-import static com.sun.opends.sdk.util.StaticUtils.formatAsGeneralizedTime;
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.formatAsGeneralizedTime;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_PWPSTATE_EXTOP_DECODE_FAILURE;
import static org.opends.sdk.CoreMessages.ERR_PWPSTATE_EXTOP_NO_REQUEST_VALUE;
import static org.opends.sdk.CoreMessages.ERR_PWPSTATE_EXTOP_UNKNOWN_OP_TYPE;
@@ -54,7 +54,7 @@
import org.opends.sdk.responses.ExtendedResult;
import org.opends.sdk.responses.ExtendedResultDecoder;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedResult.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedResult.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java
index 2bb5f5f..0d0383f 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedResult.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.extensions;
+package com.forgerock.opendj.ldap.extensions;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperation.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java
similarity index 96%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperation.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java
index 0330aae..7c29c4d 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperation.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.extensions;
+package com.forgerock.opendj.ldap.extensions;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationContainer.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java
similarity index 96%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationContainer.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java
index ddf8680..e06ab1c 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationContainer.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.extensions;
+package com.forgerock.opendj.ldap.extensions;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationType.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationType.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java
index 0e3f17c..3899cf8 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationType.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.extensions;
+package com.forgerock.opendj.ldap.extensions;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/package-info.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java
similarity index 95%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/package-info.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java
index 750dd41..9c75a50 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/package-info.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java
@@ -28,7 +28,7 @@
/**
* Classes implementing Sun proprietary LDAP extended operations.
*/
-package com.sun.opends.sdk.extensions;
+package com.forgerock.opendj.ldap.extensions;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/package-info.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/package-info.java
similarity index 96%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/package-info.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/package-info.java
index a967a6b..4cece3e 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/package-info.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/package-info.java
@@ -28,7 +28,7 @@
/**
* Classes implementing LDAP protocol.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ASCIICharProp.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ASCIICharProp.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java
index f1ed00a..5c4c2dd 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ASCIICharProp.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousConnectionDecorator.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousConnectionDecorator.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousConnectionDecorator.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousConnectionDecorator.java
index 14a4c48..715819c 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousConnectionDecorator.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousConnectionDecorator.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousFutureResult.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousFutureResult.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java
index 0fe5a68..13f19de 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousFutureResult.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Base64.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Base64.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Base64.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Base64.java
index 2cc3885..6dae578 100755
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Base64.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Base64.java
@@ -24,11 +24,11 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
-import static com.sun.opends.sdk.util.Validator.ensureNotNull;
+import static com.forgerock.opendj.util.Validator.ensureNotNull;
import static org.opends.sdk.CoreMessages.ERR_BASE64_DECODE_INVALID_CHARACTER;
import static org.opends.sdk.CoreMessages.ERR_BASE64_DECODE_INVALID_LENGTH;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ByteSequenceOutputStream.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ByteSequenceOutputStream.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java
index 018c0ea..44ae27a 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ByteSequenceOutputStream.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Collections2.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Collections2.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Collections2.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Collections2.java
index fd54426..af4d5c1 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Collections2.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Collections2.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/CompletedFutureResult.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/CompletedFutureResult.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java
index 756d461..aaf594e 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/CompletedFutureResult.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Function.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Function.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Function.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Function.java
index eb20f63..8f516f5 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Function.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Function.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Functions.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Functions.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Functions.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Functions.java
index 7892222..ce19fc4 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Functions.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Functions.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/FutureResultTransformer.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/FutureResultTransformer.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java
index 07ba47e..7f3955b 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/FutureResultTransformer.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterables.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterables.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterables.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterables.java
index c3e3d66..34ff0b7 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterables.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterables.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterators.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterators.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterators.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterators.java
index e58e1e0..1c7370a 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterators.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterators.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Predicate.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Predicate.java
similarity index 97%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Predicate.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Predicate.java
index 34253e0..1f7d257 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Predicate.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Predicate.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/RecursiveFutureResult.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/RecursiveFutureResult.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java
index 0857e0a..1a9fe23 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/RecursiveFutureResult.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SizeLimitInputStream.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SizeLimitInputStream.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java
index 9bdf0ed..06e6bc2 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SizeLimitInputStream.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StaticUtils.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StaticUtils.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java
index 04725d2..5f6104b 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StaticUtils.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StringPrepProfile.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StringPrepProfile.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java
index 78d3e39..f3c025e 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StringPrepProfile.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java
@@ -24,11 +24,11 @@
*
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
-import static com.sun.opends.sdk.util.Validator.ensureNotNull;
+import static com.forgerock.opendj.util.Validator.ensureNotNull;
import java.text.Normalizer;
import java.text.Normalizer.Form;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SubstringReader.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SubstringReader.java
similarity index 98%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SubstringReader.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SubstringReader.java
index 95d34c3..2642497 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SubstringReader.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SubstringReader.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Validator.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Validator.java
similarity index 99%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Validator.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Validator.java
index 11718c4..0dbcde2 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Validator.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Validator.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/package-info.java b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/package-info.java
similarity index 96%
rename from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/package-info.java
rename to opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/package-info.java
index 25ebe0f..60c3039 100644
--- a/opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/package-info.java
+++ b/opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/package-info.java
@@ -28,7 +28,7 @@
/**
* Classes providing utility functionality.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AVA.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AVA.java
index d4eb6f1..bbfc962 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AVA.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AVA.java
@@ -30,7 +30,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.*;
+import static com.forgerock.opendj.util.StaticUtils.*;
import static org.opends.sdk.CoreMessages.*;
import java.util.Comparator;
@@ -39,9 +39,9 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.schema.*;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java
index 7d8ecfa..5bfb6c5 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java
@@ -34,7 +34,7 @@
import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.MatchingRule;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java
index 1d7c36d..b657da6 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java
@@ -44,7 +44,7 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java
index 9aad64f..2097edf 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java
@@ -33,9 +33,9 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import com.sun.opends.sdk.util.Iterables;
-import com.sun.opends.sdk.util.Predicate;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Iterables;
+import com.forgerock.opendj.util.Predicate;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java
index 47f6d88..ff07bb7 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java
@@ -40,9 +40,9 @@
import org.opends.sdk.responses.Responses;
-import com.sun.opends.sdk.util.AsynchronousFutureResult;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.AsynchronousFutureResult;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java
index 6dcfc77..fe9109c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java
@@ -32,7 +32,7 @@
import java.util.Collection;
import java.util.Map;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java
index 81eb147..a334e1f 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;
import java.util.*;
@@ -40,9 +40,9 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
-import com.sun.opends.sdk.util.ASCIICharProp;
-import com.sun.opends.sdk.util.Iterators;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.ASCIICharProp;
+import com.forgerock.opendj.util.Iterators;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java
index aec200c..95c13f0 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java
@@ -35,8 +35,8 @@
import org.opends.sdk.schema.AttributeType;
-import com.sun.opends.sdk.util.Iterators;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Iterators;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java
index 168d660..5a914e0 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java
@@ -32,9 +32,9 @@
import org.opends.sdk.requests.BindRequest;
import org.opends.sdk.responses.BindResult;
-import com.sun.opends.sdk.util.AsynchronousConnectionDecorator;
-import com.sun.opends.sdk.util.FutureResultTransformer;
-import com.sun.opends.sdk.util.RecursiveFutureResult;
+import com.forgerock.opendj.util.AsynchronousConnectionDecorator;
+import com.forgerock.opendj.util.FutureResultTransformer;
+import com.forgerock.opendj.util.RecursiveFutureResult;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java
index 31e50ed..826edca 100755
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java
@@ -35,7 +35,7 @@
import java.nio.charset.Charset;
import java.util.logging.Level;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java
index a66597a..83789c1 100755
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java
@@ -34,7 +34,7 @@
import java.nio.ByteBuffer;
import java.util.logging.Level;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java
index e9497da..ab69c14 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java
@@ -41,10 +41,10 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.AsynchronousFutureResult;
-import com.sun.opends.sdk.util.CompletedFutureResult;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.AsynchronousFutureResult;
+import com.forgerock.opendj.util.CompletedFutureResult;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connections.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connections.java
index 7965ebb..ca2c706 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connections.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connections.java
@@ -35,7 +35,7 @@
import org.opends.sdk.requests.BindRequest;
import org.opends.sdk.requests.SearchRequest;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DN.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DN.java
index 3253e25..8f1ef7c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DN.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DN.java
@@ -38,8 +38,8 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
-import com.sun.opends.sdk.util.SubstringReader;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.SubstringReader;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java
index 8d744d4..172798c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java
@@ -32,7 +32,7 @@
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entries.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entries.java
index 75263e0..ea521bc 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entries.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entries.java
@@ -36,9 +36,9 @@
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.requests.Requests;
-import com.sun.opends.sdk.util.Function;
-import com.sun.opends.sdk.util.Iterables;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Function;
+import com.forgerock.opendj.util.Iterables;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java
index 7366bbd..61a8661 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java
@@ -31,7 +31,7 @@
import java.io.IOException;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Filter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Filter.java
index ed95a07..948d974 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Filter.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Filter.java
@@ -29,9 +29,9 @@
-import static com.sun.opends.sdk.util.StaticUtils.byteToHex;
-import static com.sun.opends.sdk.util.StaticUtils.getBytes;
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.byteToHex;
+import static com.forgerock.opendj.util.StaticUtils.getBytes;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;
import java.util.*;
@@ -40,8 +40,8 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java
index 77a29cb..690154c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java
@@ -42,10 +42,10 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.responses.SearchResultReference;
-import com.sun.opends.sdk.util.AsynchronousConnectionDecorator;
-import com.sun.opends.sdk.util.FutureResultTransformer;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.AsynchronousConnectionDecorator;
+import com.forgerock.opendj.util.FutureResultTransformer;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java
index 90d248e..b9779ea 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java
@@ -29,8 +29,8 @@
-import com.sun.opends.sdk.ldap.InternalConnection;
-import com.sun.opends.sdk.util.CompletedFutureResult;
+import com.forgerock.opendj.ldap.InternalConnection;
+import com.forgerock.opendj.util.CompletedFutureResult;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java
index 4d2322f..1914de4 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java
@@ -38,7 +38,7 @@
import javax.net.ssl.*;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java
index a632071..caffe5c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java
@@ -33,8 +33,8 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import com.sun.opends.sdk.ldap.LDAPConnectionFactoryImpl;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.ldap.LDAPConnectionFactoryImpl;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java
index 619abaa..bc0cd7b 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java
@@ -35,8 +35,8 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import com.sun.opends.sdk.ldap.LDAPListenerImpl;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.ldap.LDAPListenerImpl;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java
index a2b5815..fce324c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java
@@ -33,7 +33,7 @@
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java
index ac0acaa..eed2edb 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java
@@ -37,7 +37,7 @@
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java
index 280a382..2dc49e6 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java
@@ -39,8 +39,8 @@
import org.opends.sdk.requests.SearchRequest;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java
index b25162d..ec9c25b 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java
@@ -33,7 +33,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java
index db8c3ac..2219728 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java
@@ -34,7 +34,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.requests.Requests;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java
index 4dd63d9..4154a8c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java
@@ -29,8 +29,8 @@
-import com.sun.opends.sdk.util.CompletedFutureResult;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.CompletedFutureResult;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java
index 5a4d0a9..fced880 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.DEBUG_LOG;
+import static com.forgerock.opendj.util.StaticUtils.DEBUG_LOG;
import java.util.ArrayList;
import java.util.List;
@@ -41,7 +41,7 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Modification.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Modification.java
index 3f61b9c..eeb52d2 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Modification.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/Modification.java
@@ -29,7 +29,7 @@
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RDN.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RDN.java
index e8bfb3c..e4f3f51 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RDN.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RDN.java
@@ -42,8 +42,8 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
-import com.sun.opends.sdk.util.Iterators;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.Iterators;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java
index f06a1da..ade3ae1 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java
@@ -37,7 +37,7 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.CoreSchema;
-import com.sun.opends.sdk.util.*;
+import com.forgerock.opendj.util.*;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java
index ea7ba1a..b51749a 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java
@@ -33,7 +33,7 @@
import org.opends.sdk.responses.SearchResultReference;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java
index a40d482..b3f09fd 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java
@@ -37,7 +37,7 @@
import org.opends.sdk.schema.MatchingRule;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java
index 6a660b2..28b894b 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java
@@ -36,7 +36,7 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java
index e66008d..92987fa 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java
@@ -34,7 +34,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.requests.Requests;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java
index 963737b..e972e74 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java
@@ -49,7 +49,7 @@
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java
index df5c477..059c153 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java
@@ -37,7 +37,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
-import com.sun.opends.sdk.util.ByteSequenceOutputStream;
+import com.forgerock.opendj.util.ByteSequenceOutputStream;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
index 8411145..6058916 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
@@ -44,7 +44,7 @@
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java
index 4cbf7b1..89b1c81 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java
@@ -45,8 +45,8 @@
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.SizeLimitInputStream;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.SizeLimitInputStream;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java
index 432b9e8..ab2b541 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java
@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteStringBuilder;
-import com.sun.opends.sdk.util.ByteSequenceOutputStream;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.ByteSequenceOutputStream;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java
index 6f65093..1a69e71 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_LDAPASSERT_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.ERR_LDAPASSERT_INVALID_CONTROL_VALUE;
import static org.opends.sdk.CoreMessages.ERR_LDAPASSERT_NO_CONTROL_VALUE;
@@ -42,8 +42,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.ldap.LDAPUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.ldap.LDAPUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java
index 1ab815f..c9edf63 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java
@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java
index 6beddd9..014f391 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java
@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java
index bb9e118..8679c4b 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;
import static org.opends.sdk.asn1.ASN1Constants.UNIVERSAL_INTEGER_TYPE;
import static org.opends.sdk.asn1.ASN1Constants.UNIVERSAL_OCTET_STRING_TYPE;
@@ -43,8 +43,8 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java
index 0f681d3..4b575fa 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java
@@ -30,8 +30,8 @@
import org.opends.sdk.ByteString;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java
index e0fcba2..2a014ba 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;
import java.io.IOException;
@@ -44,7 +44,7 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java
index 9d2ccf9..e90c2a4 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java
@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java
index e93a06d..12a0607 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;
import java.io.IOException;
@@ -42,9 +42,9 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.ldap.LDAPUtils;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.ldap.LDAPUtils;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java
index 8c7b499..fa80ba1 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java
@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java
index 86d82c1..db6f8e4 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_PWEXPIRING_CANNOT_DECODE_SECONDS_UNTIL_EXPIRATION;
import static org.opends.sdk.CoreMessages.ERR_PWEXPIRING_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.ERR_PWEXPIRING_NO_CONTROL_VALUE;
@@ -38,8 +38,8 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java
index af12c2c..30082f9 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java
@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java
index 71a1e06..75d5325 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java
@@ -28,8 +28,8 @@
-import static com.sun.opends.sdk.util.StaticUtils.byteToHex;
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.byteToHex;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;
import java.io.IOException;
@@ -43,8 +43,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java
index 184cf64..cfc34a6 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java
@@ -34,7 +34,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.sdk.*;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java
index 3c95744..fc9e5cc 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_PSEARCH_BAD_CHANGE_TYPES;
import static org.opends.sdk.CoreMessages.ERR_PSEARCH_CANNOT_DECODE_VALUE;
import static org.opends.sdk.CoreMessages.ERR_PSEARCH_CONTROL_BAD_OID;
@@ -46,8 +46,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java
index 93bf31b..b7dcbe9 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java
@@ -45,8 +45,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java
index 4c37b40..f3f1c05 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java
@@ -43,9 +43,9 @@
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.SearchResultEntry;
-import com.sun.opends.sdk.ldap.LDAPUtils;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.ldap.LDAPUtils;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java
index d373afd..383a56d 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java
@@ -45,8 +45,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java
index 5e6e753..49c8355 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java
@@ -43,9 +43,9 @@
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.SearchResultEntry;
-import com.sun.opends.sdk.ldap.LDAPUtils;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.ldap.LDAPUtils;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java
index f6f7868..33929c2 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;
import java.io.IOException;
@@ -41,8 +41,8 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java
index bd9b24a..18a1bdd 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;
import java.io.IOException;
@@ -41,8 +41,8 @@
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java
index 90c5bd2..992625b 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;
import java.io.IOException;
@@ -41,7 +41,7 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java
index c6793f1..84c17ae 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_SORTRES_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.INFO_SORTRES_CONTROL_CANNOT_DECODE_VALUE;
import static org.opends.sdk.CoreMessages.INFO_SORTRES_CONTROL_NO_VALUE;
@@ -43,7 +43,7 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java
index df33d8c..f97b343 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java
@@ -41,8 +41,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java
index 9445692..c7318ff 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java
@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java
index 1cc7b10..cf66743 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java
@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java
index e38787e..0b7591f 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java
@@ -28,8 +28,8 @@
-import static com.sun.opends.sdk.util.StaticUtils.byteToHex;
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.byteToHex;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_VLVREQ_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.INFO_VLVREQ_CONTROL_CANNOT_DECODE_VALUE;
import static org.opends.sdk.CoreMessages.INFO_VLVREQ_CONTROL_INVALID_TARGET_TYPE;
@@ -46,7 +46,7 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java
index 1b005ca..fda5150 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_VLVRES_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.INFO_VLVRES_CONTROL_CANNOT_DECODE_VALUE;
import static org.opends.sdk.CoreMessages.INFO_VLVRES_CONTROL_NO_VALUE;
@@ -41,7 +41,7 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java
index 490c552..72d616e 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;
import java.io.BufferedReader;
@@ -46,8 +46,8 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.*;
-import com.sun.opends.sdk.util.Base64;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Base64;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java
index 8ffade1..7bb8799 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java
@@ -40,8 +40,8 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;
-import com.sun.opends.sdk.util.Base64;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Base64;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java
index 8cadd45..9e9fd37 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java
@@ -40,7 +40,7 @@
import org.opends.sdk.requests.ModifyDNRequest;
import org.opends.sdk.requests.ModifyRequest;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java
index 8e6e353..9e72a91 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java
@@ -39,7 +39,7 @@
import org.opends.sdk.requests.SearchRequest;
import org.opends.sdk.responses.*;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java
index 2e0ab68..2f4404e 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java
@@ -36,7 +36,7 @@
import org.opends.sdk.ErrorResultException;
import org.opends.sdk.ErrorResultIOException;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java
index 97e16d0..bb69b25 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;
import java.io.IOException;
@@ -47,7 +47,7 @@
import org.opends.sdk.requests.Requests;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java
index b5862ff..964cb62 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java
@@ -40,7 +40,7 @@
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java
index 3ff6833..7ea7118 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java
@@ -44,7 +44,7 @@
import org.opends.sdk.*;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java
index 273b378..ee704a0 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java
@@ -36,7 +36,7 @@
import org.opends.sdk.*;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java
index 4099461..1c2127a 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java
@@ -33,7 +33,7 @@
import org.opends.sdk.responses.ExtendedResult;
import org.opends.sdk.responses.ExtendedResultDecoder;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java
index 310b594..67eb8f9 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java
@@ -38,7 +38,7 @@
import org.opends.sdk.controls.ControlDecoder;
import org.opends.sdk.controls.GenericControl;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java
index f054b70..6afdae7 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.ldap.LDAPConstants.TYPE_AUTHENTICATION_SASL;
+import static com.forgerock.opendj.ldap.LDAPConstants.TYPE_AUTHENTICATION_SASL;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java
index 128b2c9..c7043c0 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java
@@ -38,10 +38,10 @@
import org.opends.sdk.controls.ControlDecoder;
import org.opends.sdk.controls.GenericControl;
-import com.sun.opends.sdk.util.Collections2;
-import com.sun.opends.sdk.util.Function;
-import com.sun.opends.sdk.util.Functions;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Collections2;
+import com.forgerock.opendj.util.Function;
+import com.forgerock.opendj.util.Functions;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java
index 913e226..7e58dc3 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java
@@ -31,7 +31,7 @@
import org.opends.sdk.ByteString;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java
index afd03da..f40d851 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java
@@ -42,7 +42,7 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.Responses;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java
index a86d6b2..cae63a0 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_EXTOP_CANCEL_CANNOT_DECODE_REQUEST_VALUE;
import static org.opends.sdk.CoreMessages.ERR_EXTOP_CANCEL_NO_REQUEST_VALUE;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java
index 74fa56d..c485040 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java
@@ -34,7 +34,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java
index b9b4683..1d796cb 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java
@@ -33,7 +33,7 @@
import org.opends.sdk.DN;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java
index 9e84752..31b9dc0 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java
@@ -29,8 +29,8 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
-import static com.sun.opends.sdk.util.StaticUtils.joinCollection;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.joinCollection;
import static org.opends.sdk.CoreMessages.ERR_SASL_PROTOCOL_ERROR;
import java.util.*;
@@ -51,7 +51,7 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.Responses;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java
index 3102d56..c992a35 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java
@@ -29,8 +29,8 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
-import static com.sun.opends.sdk.util.StaticUtils.joinCollection;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.joinCollection;
import static org.opends.sdk.CoreMessages.ERR_LDAPAUTH_GSSAPI_LOCAL_AUTHENTICATION_FAILED;
import static org.opends.sdk.CoreMessages.ERR_SASL_CONTEXT_CREATE_ERROR;
import static org.opends.sdk.CoreMessages.ERR_SASL_PROTOCOL_ERROR;
@@ -53,8 +53,8 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.Responses;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
import com.sun.security.auth.callback.TextCallbackHandler;
import com.sun.security.auth.module.Krb5LoginModule;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java
index 88b4936..d760c3e 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java
@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ErrorResultException;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java
index 5d70e69..fb14674 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java
@@ -36,8 +36,8 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.responses.*;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java
index 626a51b..38f6bcb 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java
@@ -34,7 +34,7 @@
import org.opends.sdk.RDN;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java
index aac9576..8bd364a 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java
@@ -36,7 +36,7 @@
import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java
index ff8371a..a0aeddc 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_EXTOP_PASSMOD_CANNOT_DECODE_REQUEST;
import java.io.IOException;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java
index f5ebe93..e4f2f64 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java
@@ -42,7 +42,7 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.Responses;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java
index ae86ceb..dc0c3ef 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java
@@ -40,7 +40,7 @@
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.LDIFChangeRecordReader;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java
index ee2fbf9..aae0837 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java
@@ -38,7 +38,7 @@
import org.opends.sdk.Filter;
import org.opends.sdk.SearchScope;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java
index dc24eb6..e447870 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java
@@ -29,12 +29,12 @@
-import static com.sun.opends.sdk.ldap.LDAPConstants.TYPE_AUTHENTICATION_SIMPLE;
+import static com.forgerock.opendj.ldap.LDAPConstants.TYPE_AUTHENTICATION_SIMPLE;
import org.opends.sdk.ByteString;
import org.opends.sdk.ErrorResultException;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java
index 16e00c8..fe495f1 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java
@@ -41,7 +41,7 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.responses.*;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
/**
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java
index a17d3f7..15aa3b6 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java
@@ -33,8 +33,8 @@
import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import com.sun.opends.sdk.util.Function;
-import com.sun.opends.sdk.util.Iterables;
+import com.forgerock.opendj.util.Function;
+import com.forgerock.opendj.util.Iterables;
/**
* Unmodifiable add request implementation.
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java
index 0f645fe..503f127 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java
@@ -34,9 +34,9 @@
import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import com.sun.opends.sdk.util.Collections2;
-import com.sun.opends.sdk.util.Function;
-import com.sun.opends.sdk.util.Functions;
+import com.forgerock.opendj.util.Collections2;
+import com.forgerock.opendj.util.Function;
+import com.forgerock.opendj.util.Functions;
/**
* Unmodifiable modify request implementation.
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java
index 12e5cec..c178aca 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java
@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java
index 348d1ad..15233bc 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java
@@ -31,7 +31,7 @@
import org.opends.sdk.ByteString;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java
index d5f0dff..5c684fb 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java
@@ -38,7 +38,7 @@
import org.opends.sdk.controls.ControlDecoder;
import org.opends.sdk.controls.GenericControl;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
/**
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java
index 626efb7..f978f6c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java
@@ -34,7 +34,7 @@
import org.opends.sdk.ResultCode;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java
index 30d35b7..5809cb7 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java
@@ -38,10 +38,10 @@
import org.opends.sdk.controls.ControlDecoder;
import org.opends.sdk.controls.GenericControl;
-import com.sun.opends.sdk.util.Collections2;
-import com.sun.opends.sdk.util.Function;
-import com.sun.opends.sdk.util.Functions;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Collections2;
+import com.forgerock.opendj.util.Function;
+import com.forgerock.opendj.util.Functions;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java
index c5633c3..0bcba3e 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java
@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
index 966d078..a206e31 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
@@ -31,7 +31,7 @@
import org.opends.sdk.ByteString;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java
index e0bb941..d8300fd 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java
@@ -32,7 +32,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.*;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java
index 9f9c102..a66f802 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java
@@ -32,7 +32,7 @@
import java.util.LinkedList;
import java.util.List;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java
index 114062a..19d91b5 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java
@@ -32,8 +32,8 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.*;
-import com.sun.opends.sdk.util.Function;
-import com.sun.opends.sdk.util.Iterables;
+import com.forgerock.opendj.util.Function;
+import com.forgerock.opendj.util.Iterables;
/**
* Unmodifiable Search result entry implementation.
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java
index 4e82ba7..baac1cf 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.sdk.*;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java
index f5396c7..9cdbfe9 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java
@@ -40,8 +40,8 @@
import org.forgerock.i18n.LocalizableMessage;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java
index 26eedaf..a9ab193 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java
@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java
index 4c3ea6e..b95c28f 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java
index 67e3b20..fc329e3 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java
index 3c62ca5..5181b13 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java
index e52d735..5bf3202 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java
index 2089814..7c201a2 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java
index feb9af4..cc7efdd 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
index f0c32ec..e3044d3 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
index 8dd8959..882cb57 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
index c079eb4..6ae9dfb 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
index 12cd2b4..164767d 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
@@ -28,14 +28,14 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StringPrepProfile;
+import com.forgerock.opendj.util.StringPrepProfile;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java
index fe59961..c69e46b 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java
index f9ac602..ba9cd2a 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java
@@ -28,14 +28,14 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StringPrepProfile;
+import com.forgerock.opendj.util.StringPrepProfile;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java
index 6541248..f6b0617 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_COUNTRY_STRING_NOT_PRINTABLE;
import static org.opends.sdk.schema.SchemaConstants.*;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java
index 7bedb49..b3f9764 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java
@@ -35,7 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java
index c0e4dce..3ddcca2 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java
@@ -40,8 +40,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java
index b90e1f1..e415d0a 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java
index c7fd2f2..53439d7 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java
@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java
index f9fa7d0..cf37d2b 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS;
import static org.opends.sdk.schema.SchemaConstants.*;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
index 7a527dc..90f371a 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_EMPTY_VALUE;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_EXPECTED_OPEN_PARENTHESIS;
@@ -40,7 +40,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java
index 4fcaefe..88eb95b 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.getBytes;
+import static com.forgerock.opendj.util.StaticUtils.getBytes;
import java.util.Iterator;
import java.util.TreeSet;
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.*;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
/**
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
index f047a4e..5380849 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
@@ -31,7 +31,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java
index 93fcef0..a053d66 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
@@ -39,7 +39,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java
index b64f4bf..3456226 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java
@@ -34,7 +34,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java
index 2b84dda..bcaa219 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java
@@ -29,9 +29,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_INVALID_VALUE;
import static org.opends.sdk.schema.SchemaConstants.AMR_DOUBLE_METAPHONE_OID;
import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
@@ -47,7 +47,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java
index 248292a..0ba2bde 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_FAXNUMBER_EMPTY;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_FAXNUMBER_END_WITH_DOLLAR;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_FAXNUMBER_ILLEGAL_PARAMETER;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java
index 5b7d16e..08cad19 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java
@@ -41,7 +41,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java
index 014c973..7048d76 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
@@ -39,7 +39,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java
index 0487334..8580588 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java
@@ -35,7 +35,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
index 2f45c7f..879ba0e 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
@@ -35,8 +35,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.sdk.*;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java
index cad5ee7..4228f4d 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java
@@ -35,7 +35,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java
index 9dbc99c..f16161f 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.*;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
index 8ab9d40..1179306 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java
index fcde546..ad68383 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java
@@ -43,7 +43,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java
index 42fdb82..7849724 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java
@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java
index ed52727..a4b1314 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java
index c444a78..384a5a7 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java
@@ -43,8 +43,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java
index 459ebb6..4137a37 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java
@@ -38,7 +38,7 @@
import org.forgerock.i18n.LocalizableMessage;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java
index d357db3..35e6d76 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java
@@ -40,8 +40,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java
index 90cd3d8..8eea4bb 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java
index 67eea56..d400057 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java
index 224c592..13aae3b 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java
index 12d9227..a04d843 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.isDigit;
+import static com.forgerock.opendj.util.StaticUtils.isDigit;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_NUMERIC_STRING_EMPTY_VALUE;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR;
import static org.opends.sdk.schema.SchemaConstants.EMR_NUMERIC_STRING_OID;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java
index 31d79c7..695af29 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java
@@ -37,7 +37,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java
index 11b5df6..e8b0b4c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java
@@ -38,7 +38,7 @@
import org.forgerock.i18n.LocalizableMessage;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java
index 29cea39..3e7ead4 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java
@@ -40,8 +40,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
index c3bb105..73a7389 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
@@ -30,8 +30,8 @@
import org.opends.sdk.*;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
index c6c51a5..899bacf 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
@@ -37,7 +37,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java
index 0d6f9a9..6440f59 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java
index 7d988fa..dc27f89 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java
index 1d080ff..d66197d 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java
@@ -41,7 +41,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.sdk.ByteSequence;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java
index 53010a8..b4153f5 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java
@@ -44,9 +44,9 @@
import org.opends.sdk.responses.Result;
import org.opends.sdk.responses.SearchResultEntry;
-import com.sun.opends.sdk.util.FutureResultTransformer;
-import com.sun.opends.sdk.util.RecursiveFutureResult;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.FutureResultTransformer;
+import com.forgerock.opendj.util.RecursiveFutureResult;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java
index 28dde99..538ccde 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java
@@ -50,9 +50,9 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.Entry;
-import com.sun.opends.sdk.util.StaticUtils;
-import com.sun.opends.sdk.util.SubstringReader;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.StaticUtils;
+import com.forgerock.opendj.util.SubstringReader;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java
index c2cc4f0..ae00ef7 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java
index 03dfd05..c4800af 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java
@@ -28,8 +28,8 @@
-import static com.sun.opends.sdk.util.StaticUtils.isAlpha;
-import static com.sun.opends.sdk.util.StaticUtils.isDigit;
+import static com.forgerock.opendj.util.StaticUtils.isAlpha;
+import static com.forgerock.opendj.util.StaticUtils.isDigit;
import static org.opends.sdk.CoreMessages.*;
import java.util.*;
@@ -37,7 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.SubstringReader;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java
index 6a2fd92..cd1e75c 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java
@@ -41,7 +41,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.sdk.ByteSequence;
-import com.sun.opends.sdk.util.Validator;
+import com.forgerock.opendj.util.Validator;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java
index 4365add..b370b8a 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java
@@ -31,7 +31,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java
index 0894a95..4546584 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java
@@ -31,7 +31,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java
index 64a198c..06a1afe 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.isDigit;
+import static com.forgerock.opendj.util.StaticUtils.isDigit;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_TELEPHONE_EMPTY;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_TELEPHONE_ILLEGAL_CHAR;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_TELEPHONE_NO_DIGITS;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java
index 2bc04bd..626d0f9 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java
@@ -41,7 +41,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java
index fb00329..6991602 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java
@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java
index 81b8b49..506a640 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_USERPW_NO_CLOSING_BRACE;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_USERPW_NO_OPENING_BRACE;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_USERPW_NO_SCHEME;
diff --git a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java
index c1f15e4..1b6eb31 100644
--- a/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java
+++ b/opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
-import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
-import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
+import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
+import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import org.opends.sdk.*;
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferReaderTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferReaderTestCase.java
similarity index 94%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferReaderTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferReaderTestCase.java
index b53055d..60b011f 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferReaderTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferReaderTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -37,6 +37,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1ReaderTestCase;
+import com.forgerock.opendj.ldap.ASN1BufferReader;
+
/**
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferWriterTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java
similarity index 94%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferWriterTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java
index c9e5c1a..2f3826e 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferWriterTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -40,6 +40,9 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.asn1.ASN1WriterTestCase;
+import com.forgerock.opendj.ldap.ASN1BufferReader;
+import com.forgerock.opendj.ldap.ASN1BufferWriter;
+
/**
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransportTestCase.java
similarity index 95%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransportTestCase.java
index b7d5227..a408d7f 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransportTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -37,6 +37,8 @@
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
import org.testng.annotations.Test;
+import com.forgerock.opendj.ldap.LDAPDefaultTCPNIOTransport;
+
/**
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
similarity index 91%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
index 98a5d22..9e2a514 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.ldap;
+package com.forgerock.opendj.ldap;
@@ -36,7 +36,7 @@
/**
* An abstract class that all ldap unit tests should extend. Ldap represents the
- * classes found directly under the package com.sun.opends.sdk.ldap.
+ * classes found directly under the package com.forgerock.opendj.ldap.ldap.
*/
@Test(groups = { "precommit", "ldap", "sdk" })
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControlTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java
similarity index 95%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControlTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java
index 739a446..787247d 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControlTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.controls;
+package com.forgerock.opendj.ldap.controls;
@@ -42,6 +42,8 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.testng.annotations.Test;
+import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;
+
/**
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControlTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java
similarity index 94%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControlTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java
index 5b3d651..9cf667e 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControlTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.controls;
+package com.forgerock.opendj.ldap.controls;
@@ -43,6 +43,9 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.testng.annotations.Test;
+import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;
+import com.forgerock.opendj.ldap.controls.AccountUsabilityResponseControl;
+
/**
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/ASCIICharPropTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java
similarity index 98%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/ASCIICharPropTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java
index d2f2a69..85e6562 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/ASCIICharPropTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
@@ -35,6 +35,8 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import com.forgerock.opendj.util.ASCIICharProp;
+
/**
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/Base64TestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/Base64TestCase.java
similarity index 97%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/Base64TestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/Base64TestCase.java
index 9327bba..6a9a29f 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/Base64TestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/Base64TestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
@@ -37,11 +37,12 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import com.forgerock.opendj.util.Base64;
+
/**
- * This class defines a set of tests for the {@link org.opends.sdk.util.Base64}
- * class.
+ * This class defines a set of tests for the {@link Base64} class.
*/
public final class Base64TestCase extends UtilTestCase
{
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StaticUtilsTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java
similarity index 98%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StaticUtilsTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java
index 6a8b34a..9afaa5d 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StaticUtilsTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
@@ -38,6 +38,8 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import com.forgerock.opendj.util.StaticUtils;
+
/**
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StringPrepProfileTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java
similarity index 98%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StringPrepProfileTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java
index 702fedb..71fd79f 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StringPrepProfileTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
similarity index 97%
rename from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java
rename to opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
index 208047a..b8b925f 100644
--- a/opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.util;
+package com.forgerock.opendj.util;
diff --git a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java
index d170ac5..e359df2 100644
--- a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java
@@ -53,7 +53,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java
index 34998fb..51bbe1b 100644
--- a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java
@@ -41,7 +41,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java
index 5f7a8f6..504fad7 100644
--- a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java
+++ b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java
@@ -30,7 +30,7 @@
-import static com.sun.opends.sdk.ldap.LDAPConstants.TYPE_AUTHENTICATION_SASL;
+import static com.forgerock.opendj.ldap.LDAPConstants.TYPE_AUTHENTICATION_SASL;
import java.io.IOException;
import java.util.*;
@@ -50,8 +50,8 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
-import com.sun.opends.sdk.controls.AccountUsabilityRequestControl;
-import com.sun.opends.sdk.controls.AccountUsabilityResponseControl;
+import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;
+import com.forgerock.opendj.ldap.controls.AccountUsabilityResponseControl;
diff --git a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java
index 360a86c..bf1b29c 100644
--- a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java
@@ -42,7 +42,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import com.sun.opends.sdk.util.StaticUtils;
+import com.forgerock.opendj.util.StaticUtils;
diff --git a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java
index bb3f49a..602731f 100644
--- a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java
@@ -33,7 +33,7 @@
import org.testng.annotations.Test;
-import com.sun.opends.sdk.ldap.LDAPConstants;
+import com.forgerock.opendj.ldap.LDAPConstants;
diff --git a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java
index ca8b60e..84b1cd2 100644
--- a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java
+++ b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java
@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.testng.annotations.DataProvider;
-import com.sun.opends.sdk.ldap.LDAPConstants;
+import com.forgerock.opendj.ldap.LDAPConstants;
diff --git a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java
index 318c098..350be83 100644
--- a/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java
+++ b/opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java
@@ -33,7 +33,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import com.sun.opends.sdk.util.SubstringReader;
+import com.forgerock.opendj.util.SubstringReader;
--
Gitblit v1.10.0