From 9fdb95ca9c3c8e3524845760b81a85c7a4c81a45 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 04 Dec 2009 11:49:33 +0000
Subject: [PATCH] Drop util package: move ByteString hierarchy into top level sdk package and other "internal" classes to com.sun.*. Move messages into their own package. Clean up imports.
---
sdk/src/org/opends/sdk/AttributeDescription.java | 11
sdk/src/org/opends/sdk/asn1/ASN1.java | 29
sdk/src/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java | 15
sdk/src/org/opends/sdk/tools/LDAPCompare.java | 7
sdk/src/com/sun/opends/sdk/messages/messages_de.properties | 0
sdk/src/org/opends/sdk/responses/IntermediateResponse.java | 2
sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java | 10
sdk/src/com/sun/opends/sdk/util/Function.java | 2
sdk/src/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java | 4
sdk/src/com/sun/opends/sdk/util/Predicate.java | 2
sdk/src/org/opends/sdk/requests/GenericExtendedRequest.java | 2
sdk/src/org/opends/sdk/AbstractConnection.java | 8
sdk/src/org/opends/sdk/schema/UserPasswordSyntaxImpl.java | 15
sdk/src/org/opends/sdk/SynchronousConnection.java | 3
sdk/src/org/opends/sdk/responses/AbstractIntermediateResponse.java | 2
sdk/src/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java | 14
sdk/src/org/opends/sdk/CancelledException.java | 12
sdk/src/org/opends/sdk/schema/SchemaConstants.java | 2
sdk/src/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java | 5
sdk/src/org/opends/sdk/asn1/ASN1OutputStreamWriter.java | 14
sdk/src/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java | 11
sdk/src/org/opends/sdk/requests/GenericExtendedRequestImpl.java | 5
sdk/src/org/opends/sdk/responses/GenericExtendedResult.java | 2
sdk/src/org/opends/sdk/tools/ArgumentParser.java | 4
sdk/src/org/opends/sdk/extensions/CancelRequest.java | 12
sdk/src/org/opends/sdk/schema/Schema.java | 17
sdk/src/org/opends/sdk/controls/PasswordExpiringControl.java | 12
sdk/src/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java | 7
sdk/src/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java | 11
sdk/src/org/opends/sdk/ldap/ExtendedResultFutureImpl.java | 6
sdk/src/org/opends/sdk/schema/RegexSyntaxImpl.java | 12
sdk/src/org/opends/sdk/extensions/PasswordPolicyStateExtendedOperation.java | 18
sdk/src/org/opends/sdk/tools/Argument.java | 4
sdk/src/com/sun/opends/sdk/util/Functions.java | 3
sdk/src/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java | 10
sdk/src/org/opends/sdk/schema/PostalAddressSyntaxImpl.java | 7
sdk/src/com/sun/opends/sdk/util/LocalizableException.java | 3
sdk/src/org/opends/sdk/controls/ServerSideSortControl.java | 13
sdk/src/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java | 17
sdk/src/org/opends/sdk/schema/TelexNumberSyntaxImpl.java | 13
sdk/src/org/opends/sdk/Assertion.java | 1
sdk/src/org/opends/sdk/sasl/GSSAPISASLBindRequest.java | 8
sdk/src/org/opends/sdk/controls/PasswordExpiredControl.java | 7
sdk/src/org/opends/sdk/sasl/PlainSASLBindRequest.java | 5
sdk/src/org/opends/sdk/controls/PreReadControl.java | 16
sdk/src/org/opends/sdk/requests/GenericBindRequestImpl.java | 7
sdk/src/org/opends/sdk/sasl/SASLContext.java | 2
sdk/src/org/opends/sdk/controls/ProxiedAuthV1Control.java | 15
sdk/src/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/requests/Requests.java | 7
sdk/src/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java | 13
sdk/src/org/opends/sdk/RootDSE.java | 8
sdk/src/org/opends/sdk/controls/ProxiedAuthV2Control.java | 15
sdk/src/org/opends/sdk/schema/AbstractMatchingRuleImpl.java | 2
sdk/src/org/opends/sdk/requests/AddRequest.java | 9
sdk/src/org/opends/sdk/Attribute.java | 3
sdk/src/org/opends/sdk/schema/SchemaElement.java | 2
sdk/src/org/opends/sdk/controls/PagedResultsControl.java | 16
sdk/src/org/opends/sdk/responses/ExtendedResult.java | 2
sdk/src/org/opends/sdk/schema/SyntaxImpl.java | 3
sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java | 8
sdk/src/org/opends/sdk/controls/GenericControl.java | 5
sdk/src/org/opends/sdk/requests/AbstractUnmodifiableRequestImpl.java | 3
sdk/src/org/opends/sdk/requests/AbstractRequestImpl.java | 3
sdk/src/org/opends/sdk/tools/DataSource.java | 2
sdk/src/org/opends/sdk/AbstractEntry.java | 3
sdk/src/org/opends/sdk/ldif/AbstractLDIFReader.java | 9
sdk/src/org/opends/sdk/ByteSequenceReader.java | 3
sdk/src/org/opends/sdk/schema/OctetStringSyntaxImpl.java | 7
sdk/src/org/opends/sdk/Entry.java | 4
sdk/src/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java | 10
sdk/src/org/opends/sdk/extensions/GetSymmetricKeyRequest.java | 12
sdk/src/org/opends/sdk/responses/SearchResultEntry.java | 9
sdk/src/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java | 11
sdk/src/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java | 14
sdk/src/org/opends/sdk/requests/CompareRequest.java | 5
sdk/src/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java | 17
sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java | 10
sdk/src/org/opends/sdk/extensions/WhoAmIResult.java | 2
sdk/src/com/sun/opends/sdk/messages/messages_zh_TW.properties | 0
sdk/src/org/opends/sdk/asn1/ASN1Reader.java | 4
sdk/src/org/opends/sdk/extensions/GetConnectionIDResult.java | 4
sdk/src/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java | 13
sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java | 16
sdk/src/org/opends/sdk/extensions/PasswordModifyResult.java | 4
sdk/src/org/opends/sdk/Types.java | 3
sdk/src/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java | 10
sdk/src/org/opends/sdk/responses/SearchResultEntryImpl.java | 9
sdk/src/com/sun/opends/sdk/util/SubstringReader.java | 2
sdk/src/org/opends/sdk/controls/PersistentSearchControl.java | 14
sdk/src/org/opends/sdk/sasl/AnonymousSASLBindRequest.java | 5
sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java | 2
sdk/src/org/opends/sdk/schema/EnumOrderingMatchingRule.java | 9
sdk/src/org/opends/sdk/schema/MatchingRuleImpl.java | 4
sdk/src/com/sun/opends/sdk/util/Iterators.java | 2
sdk/src/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java | 5
sdk/src/org/opends/sdk/requests/ModifyRequest.java | 5
sdk/src/org/opends/sdk/ByteSequence.java | 3
sdk/src/org/opends/sdk/responses/BindResultImpl.java | 2
sdk/src/org/opends/sdk/schema/UUIDSyntaxImpl.java | 9
sdk/src/org/opends/sdk/LinkedAttribute.java | 5
sdk/src/com/sun/opends/sdk/util/Platform.java | 5
sdk/src/org/opends/sdk/ByteStringBuilder.java | 4
sdk/src/org/opends/sdk/SortedEntry.java | 6
sdk/src/com/sun/opends/sdk/util/ByteSequenceOutputStream.java | 4
sdk/src/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java | 4
sdk/src/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java | 11
sdk/src/org/opends/sdk/schema/UTCTimeSyntaxImpl.java | 9
sdk/src/org/opends/sdk/Filter.java | 8
sdk/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java | 10
sdk/src/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java | 3
sdk/src/org/opends/sdk/tools/ArgumentException.java | 2
sdk/src/org/opends/sdk/schema/IA5StringSyntaxImpl.java | 5
sdk/src/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java | 11
sdk/src/com/sun/opends/sdk/util/SSLUtils.java | 10
sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java | 9
sdk/build.xml | 4
sdk/src/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java | 3
sdk/src/org/opends/sdk/tools/Utils.java | 8
sdk/src/org/opends/sdk/controls/AuthorizationIdentityControl.java | 10
sdk/src/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java | 18
sdk/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java | 13
sdk/src/org/opends/sdk/schema/CountryStringSyntaxImpl.java | 8
sdk/src/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java | 10
sdk/src/org/opends/sdk/schema/SchemaNotFoundException.java | 2
sdk/src/org/opends/sdk/schema/Syntax.java | 7
sdk/src/org/opends/sdk/ldap/LDAPConnectionOptions.java | 3
sdk/src/org/opends/sdk/schema/BinarySyntaxImpl.java | 7
sdk/src/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/requests/GenericBindRequest.java | 5
sdk/src/org/opends/sdk/extensions/PasswordModifyRequest.java | 8
sdk/src/org/opends/sdk/tools/LDAPSearch.java | 7
sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java | 2
sdk/src/org/opends/sdk/controls/VLVTarget.java | 11
sdk/src/org/opends/sdk/OperationTimeoutException.java | 13
sdk/src/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java | 11
sdk/src/org/opends/sdk/requests/DeleteRequestImpl.java | 5
sdk/src/org/opends/sdk/ldap/UnexpectedRequestException.java | 3
sdk/src/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java | 13
sdk/src/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java | 7
sdk/src/org/opends/sdk/schema/BitStringSyntaxImpl.java | 10
sdk/src/org/opends/sdk/controls/ControlDecoder.java | 2
sdk/src/org/opends/sdk/ldap/LDAPUtils.java | 2
sdk/src/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java | 4
sdk/src/com/sun/opends/sdk/util/StaticUtils.java | 93 -
sdk/src/org/opends/sdk/schema/FaxSyntaxImpl.java | 7
sdk/src/org/opends/sdk/tools/FileBasedArgument.java | 4
sdk/src/org/opends/sdk/ldif/ConnectionEntryWriter.java | 3
sdk/src/org/opends/sdk/schema/NumericStringSyntaxImpl.java | 13
sdk/src/org/opends/sdk/requests/SearchRequestImpl.java | 5
sdk/src/org/opends/sdk/requests/AbstractExtendedRequest.java | 2
sdk/src/org/opends/sdk/schema/BooleanSyntaxImpl.java | 8
sdk/src/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/controls/PostReadControl.java | 16
sdk/src/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java | 3
sdk/src/org/opends/sdk/responses/GenericExtendedResultImpl.java | 2
sdk/src/org/opends/sdk/tools/BooleanArgument.java | 2
sdk/src/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java | 8
sdk/src/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java | 4
sdk/src/com/sun/opends/sdk/util/Validator.java | 2
sdk/src/org/opends/sdk/extensions/GetConnectionIDRequest.java | 5
sdk/src/org/opends/sdk/controls/PasswordPolicyControl.java | 16
sdk/src/org/opends/sdk/AuthenticatedConnectionFactory.java | 3
sdk/src/org/opends/sdk/requests/ModifyDNRequest.java | 3
sdk/src/org/opends/sdk/asn1/AbstractASN1Writer.java | 2
sdk/src/org/opends/sdk/controls/AssertionControl.java | 14
sdk/src/org/opends/sdk/ldif/LDIFChangeRecordWriter.java | 4
sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java | 2
sdk/src/org/opends/sdk/schema/DITContentRule.java | 4
sdk/src/org/opends/sdk/extensions/StartTLSRequest.java | 2
sdk/src/org/opends/sdk/schema/OIDSyntaxImpl.java | 11
sdk/src/org/opends/sdk/schema/GuideSyntaxImpl.java | 15
sdk/src/org/opends/sdk/ldap/ASN1StreamWriter.java | 8
sdk/src/org/opends/sdk/ldap/LDAPMessageHandler.java | 2
sdk/src/org/opends/sdk/requests/ModifyDNRequestImpl.java | 5
sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java | 10
sdk/src/org/opends/sdk/AbstractFilterVisitor.java | 1
sdk/src/org/opends/sdk/ldap/UnsupportedMessageException.java | 2
sdk/src/org/opends/sdk/responses/GenericIntermediateResponse.java | 2
sdk/src/org/opends/sdk/schema/CertificateListSyntaxImpl.java | 7
sdk/src/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java | 7
sdk/src/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/tools/ConsoleApplication.java | 2
sdk/src/org/opends/sdk/DN.java | 11
sdk/src/org/opends/sdk/requests/CompareRequestImpl.java | 7
sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java | 2
sdk/src/org/opends/sdk/ByteString.java | 4
sdk/build-tools/com/sun/opends/sdk/build/tools/CoverageDiff.java | 29
sdk/src/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java | 6
sdk/src/org/opends/sdk/schema/UnknownSchemaElementException.java | 2
sdk/src/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java | 6
sdk/src/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java | 4
sdk/src/org/opends/sdk/controls/SubtreeDeleteControl.java | 7
sdk/src/org/opends/sdk/schema/ObjectClass.java | 8
sdk/src/org/opends/sdk/ldap/LDAPConnection.java | 10
sdk/src/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java | 6
sdk/src/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java | 15
sdk/src/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java | 4
sdk/src/org/opends/sdk/ldif/LDIFEntryWriter.java | 4
sdk/src/org/opends/sdk/requests/SearchRequest.java | 3
sdk/src/com/sun/opends/sdk/messages/messages_zh_CN.properties | 0
sdk/src/org/opends/sdk/schema/CertificatePairSyntaxImpl.java | 7
sdk/src/com/sun/opends/sdk/util/Base64.java | 11
sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java | 3
sdk/src/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java | 8
sdk/src/com/sun/opends/sdk/messages/messages.properties | 0
sdk/src/org/opends/sdk/schema/NameForm.java | 7
sdk/src/org/opends/sdk/controls/PasswordPolicyWarningType.java | 3
sdk/src/org/opends/sdk/ldap/SearchResultFutureImpl.java | 5
sdk/src/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java | 4
sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java | 14
sdk/src/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java | 17
sdk/src/org/opends/sdk/ConnectionException.java | 5
sdk/src/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java | 14
sdk/src/org/opends/sdk/requests/AddRequestImpl.java | 9
sdk/src/org/opends/sdk/responses/SearchResultReferenceImpl.java | 2
sdk/src/org/opends/sdk/sasl/ExternalSASLBindRequest.java | 5
sdk/src/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java | 10
sdk/src/org/opends/sdk/controls/EntryChangeNotificationControl.java | 20
sdk/src/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java | 15
sdk/src/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java | 9
sdk/src/org/opends/sdk/sasl/DigestMD5SASLBindRequest.java | 5
sdk/src/org/opends/sdk/AbstractAttribute.java | 6
sdk/src/org/opends/sdk/ldap/AbstractLDAPMessageHandler.java | 2
sdk/src/org/opends/sdk/ldif/LDIFChangeRecordReader.java | 9
sdk/src/org/opends/sdk/controls/MatchedValuesControl.java | 15
sdk/src/org/opends/sdk/ldap/ConnectionPool.java | 27
sdk/src/org/opends/sdk/schema/IntegerSyntaxImpl.java | 13
sdk/src/org/opends/sdk/controls/PasswordPolicyErrorType.java | 2
sdk/src/org/opends/sdk/responses/AbstractExtendedResult.java | 2
sdk/src/org/opends/sdk/schema/SchemaBuilder.java | 8
sdk/src/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java | 17
sdk/src/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java | 7
sdk/build-tools/com/sun/opends/sdk/build/tools/CheckPrecommit.java | 12
sdk/src/org/opends/sdk/DecodeException.java | 2
sdk/src/org/opends/sdk/schema/MatchingRule.java | 12
sdk/src/com/sun/opends/sdk/messages/messages_es.properties | 0
sdk/src/org/opends/sdk/controls/SortKey.java | 3
sdk/src/org/opends/sdk/requests/DeleteRequest.java | 3
sdk/src/org/opends/sdk/responses/BindResult.java | 2
sdk/src/org/opends/sdk/schema/MatchingRuleUse.java | 5
sdk/src/org/opends/sdk/asn1/ASN1Writer.java | 2
sdk/src/org/opends/sdk/ldap/UnexpectedResponseException.java | 3
sdk/src/org/opends/sdk/responses/AbstractResultImpl.java | 3
sdk/src/org/opends/sdk/controls/AccountUsabilityControl.java | 17
sdk/src/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java | 13
sdk/src/org/opends/sdk/ErrorResultIOException.java | 2
sdk/src/org/opends/sdk/extensions/WhoAmIRequest.java | 2
sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java | 6
sdk/src/org/opends/sdk/ldif/AbstractLDIFWriter.java | 9
sdk/src/org/opends/sdk/schema/AttributeType.java | 8
sdk/src/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java | 11
sdk/src/org/opends/sdk/ResultCode.java | 2
sdk/src/org/opends/sdk/sasl/GenericSASLBindRequest.java | 5
sdk/src/org/opends/sdk/requests/ModifyRequestImpl.java | 7
sdk/src/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java | 10
sdk/src/org/opends/sdk/tools/ModRate.java | 2
sdk/src/org/opends/sdk/tools/CLIException.java | 4
sdk/src/org/opends/sdk/sasl/CRAMMD5SASLBindRequest.java | 5
sdk/src/org/opends/sdk/Matcher.java | 9
sdk/src/org/opends/sdk/controls/Control.java | 2
sdk/src/org/opends/sdk/schema/JPEGSyntaxImpl.java | 7
sdk/src/org/opends/sdk/ldap/LDAPEncoder.java | 5
sdk/src/com/sun/opends/sdk/messages/messages_ja.properties | 0
sdk/src/com/sun/opends/sdk/util/Iterables.java | 2
sdk/src/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java | 16
sdk/src/org/opends/sdk/schema/NameFormSyntaxImpl.java | 14
sdk/src/com/sun/opends/sdk/messages/messages_fr.properties | 0
sdk/src/org/opends/sdk/ldap/LDAPConnectionFactoryImpl.java | 2
sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java | 5
sdk/src/com/sun/opends/sdk/messages/messages_ko.properties | 0
sdk/src/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java | 3
sdk/src/org/opends/sdk/schema/EnumSyntaxImpl.java | 18
sdk/src/com/sun/opends/sdk/util/LocalizedIllegalArgumentException.java | 3
sdk/src/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/controls/VLVControl.java | 16
sdk/src/org/opends/sdk/tools/SearchRate.java | 2
sdk/src/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/schema/PrintableStringSyntaxImpl.java | 6
sdk/src/org/opends/sdk/tools/LDAPModify.java | 4
sdk/src/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java | 8
sdk/src/org/opends/sdk/tools/IntegerArgument.java | 2
sdk/src/org/opends/sdk/Connection.java | 4
sdk/src/org/opends/sdk/ldap/LDAPDecoder.java | 8
sdk/src/org/opends/sdk/schema/ConflictingSchemaElementException.java | 2
sdk/src/org/opends/sdk/requests/SimpleBindRequest.java | 5
sdk/src/org/opends/sdk/schema/CertificateSyntaxImpl.java | 7
sdk/src/org/opends/sdk/responses/Responses.java | 11
sdk/src/org/opends/sdk/tools/PromptingTrustManager.java | 5
sdk/src/com/sun/opends/sdk/util/ASCIICharProp.java | 2
sdk/src/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java | 9
sdk/src/com/sun/opends/sdk/util/StringPrepProfile.java | 8
sdk/src/org/opends/sdk/schema/ObjectClassSyntaxImpl.java | 16
sdk/src/org/opends/sdk/FilterVisitor.java | 1
sdk/src/org/opends/sdk/schema/SchemaException.java | 2
sdk/src/org/opends/sdk/requests/SimpleBindRequestImpl.java | 7
sdk/src/org/opends/sdk/schema/DITStructureRule.java | 5
sdk/src/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java | 7
sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java | 8
sdk/src/org/opends/sdk/extensions/ExtendedOperation.java | 2
sdk/src/org/opends/sdk/asn1/AbstractASN1Reader.java | 6
sdk/src/org/opends/sdk/RDN.java | 8
sdk/src/org/opends/sdk/Change.java | 4
sdk/src/org/opends/sdk/requests/ExtendedRequest.java | 2
sdk/src/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java | 12
sdk/src/org/opends/sdk/responses/AbstractResponseImpl.java | 3
sdk/src/org/opends/sdk/schema/SchemaUtils.java | 10
310 files changed, 1,040 insertions(+), 1,219 deletions(-)
diff --git a/sdk/build-tools/com/sun/opends/sdk/build/tools/CheckPrecommit.java b/sdk/build-tools/com/sun/opends/sdk/build/tools/CheckPrecommit.java
index 1f2ca27..5fb5b84 100644
--- a/sdk/build-tools/com/sun/opends/sdk/build/tools/CheckPrecommit.java
+++ b/sdk/build-tools/com/sun/opends/sdk/build/tools/CheckPrecommit.java
@@ -37,18 +37,10 @@
import java.util.LinkedList;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.FileSet;
-
import org.tmatesoft.svn.core.SVNDepth;
import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.wc.SVNPropertyData;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNStatus;
-import org.tmatesoft.svn.core.wc.SVNWCClient;
+import org.tmatesoft.svn.core.wc.*;
@@ -176,7 +168,7 @@
try
{
- long status = ourClientManager.getStatusClient().doStatus(workspacePath, SVNRevision.WORKING,
+ ourClientManager.getStatusClient().doStatus(workspacePath, SVNRevision.WORKING,
SVNDepth.INFINITY, false, false, false, false, this, null);
}
catch (Exception e)
diff --git a/sdk/build-tools/com/sun/opends/sdk/build/tools/CoverageDiff.java b/sdk/build-tools/com/sun/opends/sdk/build/tools/CoverageDiff.java
index 9b226e7..c4204ce 100644
--- a/sdk/build-tools/com/sun/opends/sdk/build/tools/CoverageDiff.java
+++ b/sdk/build-tools/com/sun/opends/sdk/build/tools/CoverageDiff.java
@@ -26,24 +26,25 @@
*/
package com.sun.opends.sdk.build.tools;
-import com.vladium.emma.report.*;
-import com.vladium.emma.report.html.doc.*;
-import com.vladium.emma.data.*;
-import com.vladium.util.IntObjectMap;
-
import java.io.*;
import java.util.*;
-import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
-
+import org.apache.tools.ant.Task;
import org.tmatesoft.svn.core.SVNDepth;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNDiffClient;
import org.tmatesoft.svn.core.wc.SVNRevision;
+import com.vladium.emma.data.DataFactory;
+import com.vladium.emma.data.ICoverageData;
+import com.vladium.emma.data.IMergeable;
+import com.vladium.emma.data.IMetaData;
+import com.vladium.emma.report.*;
+import com.vladium.emma.report.html.doc.*;
+import com.vladium.util.IntObjectMap;
+
public class CoverageDiff extends Task {
private static SVNClientManager ourClientManager =
@@ -188,7 +189,7 @@
// So we can go over http:// and https:// when diff'ing against previous versions
DAVRepositoryFactory.setup();
-
+
IReportDataView emmaDataView = null;
try
{
@@ -307,7 +308,7 @@
SVNRevision baseRevision = SVNRevision.parse(fromRevision);
System.out.println("Doing coverage diff from revision: " + baseRevision.toString());
- ourClientManager.getDiffClient().doDiff(workspaceRoot, baseRevision,
+ ourClientManager.getDiffClient().doDiff(workspaceRoot, baseRevision,
workspaceRoot, SVNRevision.WORKING, SVNDepth.INFINITY, false,
new FileOutputStream(diffFile), null);
@@ -650,7 +651,6 @@
int workingCopyBegin;
int workingCopyRange;
int otherCopyBegin;
- int otherCopyRange;
Double[] modCoverage = new Double[4];
modCoverage[COVERED_MOD_EXE_LINES] = 0.0;
@@ -671,15 +671,12 @@
int workingCopyEndIdx = chunkHeader.indexOf(" ", workingCopyCommaIdx);
int otherCopyBeginIdx = chunkHeader.indexOf(otherCopyFlag);
int otherCopyCommaIdx = chunkHeader.indexOf(",", otherCopyBeginIdx);
- int otherCopyEndIdx = chunkHeader.indexOf(" ", otherCopyCommaIdx);
workingCopyBegin = Integer.parseInt(
chunkHeader.substring(workingCopyBeginIdx + 1, workingCopyCommaIdx));
workingCopyRange = Integer.parseInt(
chunkHeader.substring(workingCopyCommaIdx + 1, workingCopyEndIdx));
otherCopyBegin = Integer.parseInt(
chunkHeader.substring(otherCopyBeginIdx + 1, otherCopyCommaIdx));
- otherCopyRange = Integer.parseInt(
- chunkHeader.substring(otherCopyCommaIdx + 1, otherCopyEndIdx));
String chunkLine;
SrcFileItem.LineCoverageData lCoverageData = null;
@@ -804,12 +801,12 @@
return null;
}
- for(Iterator packages = rootItem.getChildren(); packages.hasNext();)
+ for(Iterator<?> packages = rootItem.getChildren(); packages.hasNext();)
{
IItem packageItem = (IItem)packages.next();
if(packageItem.getName().equals(srcPackageName))
{
- for(Iterator sources = packageItem.getChildren(); sources.hasNext();)
+ for(Iterator<?> sources = packageItem.getChildren(); sources.hasNext();)
{
SrcFileItem sourceItem = (SrcFileItem)sources.next();
if(sourceItem.getName().equals(srcFileName))
diff --git a/sdk/build.xml b/sdk/build.xml
index 4e76bb6..75e2515 100755
--- a/sdk/build.xml
+++ b/sdk/build.xml
@@ -168,8 +168,8 @@
</fileset>
</classpath>
</typedef>
- <genmsg sourceProps="${src.dir}/com/sun/opends/sdk/util/messages.properties"
- destJava="${srcgen.dir}/com/sun/opends/sdk/util/Messages.java">
+ <genmsg sourceProps="${src.dir}/com/sun/opends/sdk/messages/messages.properties"
+ destJava="${srcgen.dir}/com/sun/opends/sdk/messages/Messages.java">
</genmsg>
</target>
diff --git a/sdk/src/com/sun/opends/sdk/util/messages.properties b/sdk/src/com/sun/opends/sdk/messages/messages.properties
similarity index 100%
rename from sdk/src/com/sun/opends/sdk/util/messages.properties
rename to sdk/src/com/sun/opends/sdk/messages/messages.properties
diff --git a/sdk/src/com/sun/opends/sdk/util/messages_de.properties b/sdk/src/com/sun/opends/sdk/messages/messages_de.properties
similarity index 100%
rename from sdk/src/com/sun/opends/sdk/util/messages_de.properties
rename to sdk/src/com/sun/opends/sdk/messages/messages_de.properties
diff --git a/sdk/src/com/sun/opends/sdk/util/messages_es.properties b/sdk/src/com/sun/opends/sdk/messages/messages_es.properties
similarity index 100%
rename from sdk/src/com/sun/opends/sdk/util/messages_es.properties
rename to sdk/src/com/sun/opends/sdk/messages/messages_es.properties
diff --git a/sdk/src/com/sun/opends/sdk/util/messages_fr.properties b/sdk/src/com/sun/opends/sdk/messages/messages_fr.properties
similarity index 100%
rename from sdk/src/com/sun/opends/sdk/util/messages_fr.properties
rename to sdk/src/com/sun/opends/sdk/messages/messages_fr.properties
diff --git a/sdk/src/com/sun/opends/sdk/util/messages_ja.properties b/sdk/src/com/sun/opends/sdk/messages/messages_ja.properties
similarity index 100%
rename from sdk/src/com/sun/opends/sdk/util/messages_ja.properties
rename to sdk/src/com/sun/opends/sdk/messages/messages_ja.properties
diff --git a/sdk/src/com/sun/opends/sdk/util/messages_ko.properties b/sdk/src/com/sun/opends/sdk/messages/messages_ko.properties
similarity index 100%
rename from sdk/src/com/sun/opends/sdk/util/messages_ko.properties
rename to sdk/src/com/sun/opends/sdk/messages/messages_ko.properties
diff --git a/sdk/src/com/sun/opends/sdk/util/messages_zh_CN.properties b/sdk/src/com/sun/opends/sdk/messages/messages_zh_CN.properties
similarity index 100%
rename from sdk/src/com/sun/opends/sdk/util/messages_zh_CN.properties
rename to sdk/src/com/sun/opends/sdk/messages/messages_zh_CN.properties
diff --git a/sdk/src/com/sun/opends/sdk/util/messages_zh_TW.properties b/sdk/src/com/sun/opends/sdk/messages/messages_zh_TW.properties
similarity index 100%
rename from sdk/src/com/sun/opends/sdk/util/messages_zh_TW.properties
rename to sdk/src/com/sun/opends/sdk/messages/messages_zh_TW.properties
diff --git a/sdk/src/org/opends/sdk/util/ASCIICharProp.java b/sdk/src/com/sun/opends/sdk/util/ASCIICharProp.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/ASCIICharProp.java
rename to sdk/src/com/sun/opends/sdk/util/ASCIICharProp.java
index 621da56..106864b 100644
--- a/sdk/src/org/opends/sdk/util/ASCIICharProp.java
+++ b/sdk/src/com/sun/opends/sdk/util/ASCIICharProp.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
diff --git a/sdk/src/org/opends/sdk/util/Base64.java b/sdk/src/com/sun/opends/sdk/util/Base64.java
similarity index 97%
rename from sdk/src/org/opends/sdk/util/Base64.java
rename to sdk/src/com/sun/opends/sdk/util/Base64.java
index 06fa779..b9dcde1 100755
--- a/sdk/src/org/opends/sdk/util/Base64.java
+++ b/sdk/src/com/sun/opends/sdk/util/Base64.java
@@ -24,14 +24,17 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.Validator.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.Validator.*;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
+
diff --git a/sdk/src/org/opends/sdk/util/ByteSequenceOutputStream.java b/sdk/src/com/sun/opends/sdk/util/ByteSequenceOutputStream.java
similarity index 97%
rename from sdk/src/org/opends/sdk/util/ByteSequenceOutputStream.java
rename to sdk/src/com/sun/opends/sdk/util/ByteSequenceOutputStream.java
index 7f77f30..6b4c784 100644
--- a/sdk/src/org/opends/sdk/util/ByteSequenceOutputStream.java
+++ b/sdk/src/com/sun/opends/sdk/util/ByteSequenceOutputStream.java
@@ -24,11 +24,13 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
import java.io.IOException;
import java.io.OutputStream;
+import org.opends.sdk.ByteStringBuilder;
+
/**
* An adapter class that allows writing to an byte string builder
* with the outputstream interface.
diff --git a/sdk/src/org/opends/sdk/util/Function.java b/sdk/src/com/sun/opends/sdk/util/Function.java
similarity index 97%
rename from sdk/src/org/opends/sdk/util/Function.java
rename to sdk/src/com/sun/opends/sdk/util/Function.java
index bb8157e..01e77dd 100644
--- a/sdk/src/org/opends/sdk/util/Function.java
+++ b/sdk/src/com/sun/opends/sdk/util/Function.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
diff --git a/sdk/src/org/opends/sdk/util/Functions.java b/sdk/src/com/sun/opends/sdk/util/Functions.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/Functions.java
rename to sdk/src/com/sun/opends/sdk/util/Functions.java
index 02bbea9..716f081 100644
--- a/sdk/src/org/opends/sdk/util/Functions.java
+++ b/sdk/src/com/sun/opends/sdk/util/Functions.java
@@ -25,11 +25,12 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
import org.opends.sdk.AttributeDescription;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.schema.Schema;
diff --git a/sdk/src/org/opends/sdk/util/Iterables.java b/sdk/src/com/sun/opends/sdk/util/Iterables.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/Iterables.java
rename to sdk/src/com/sun/opends/sdk/util/Iterables.java
index 0313cdc..9acf838 100644
--- a/sdk/src/org/opends/sdk/util/Iterables.java
+++ b/sdk/src/com/sun/opends/sdk/util/Iterables.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
diff --git a/sdk/src/org/opends/sdk/util/Iterators.java b/sdk/src/com/sun/opends/sdk/util/Iterators.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/Iterators.java
rename to sdk/src/com/sun/opends/sdk/util/Iterators.java
index 785c278..639bcaf 100644
--- a/sdk/src/org/opends/sdk/util/Iterators.java
+++ b/sdk/src/com/sun/opends/sdk/util/Iterators.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
diff --git a/sdk/src/org/opends/sdk/util/LocalizableException.java b/sdk/src/com/sun/opends/sdk/util/LocalizableException.java
similarity index 94%
rename from sdk/src/org/opends/sdk/util/LocalizableException.java
rename to sdk/src/com/sun/opends/sdk/util/LocalizableException.java
index ea71cf2..cf63aa3 100644
--- a/sdk/src/org/opends/sdk/util/LocalizableException.java
+++ b/sdk/src/com/sun/opends/sdk/util/LocalizableException.java
@@ -24,11 +24,10 @@
*
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
-import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/util/LocalizedIllegalArgumentException.java b/sdk/src/com/sun/opends/sdk/util/LocalizedIllegalArgumentException.java
similarity index 97%
rename from sdk/src/org/opends/sdk/util/LocalizedIllegalArgumentException.java
rename to sdk/src/com/sun/opends/sdk/util/LocalizedIllegalArgumentException.java
index d9e8d6e..a1bdac6 100644
--- a/sdk/src/org/opends/sdk/util/LocalizedIllegalArgumentException.java
+++ b/sdk/src/com/sun/opends/sdk/util/LocalizedIllegalArgumentException.java
@@ -25,11 +25,10 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
-import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/util/Platform.java b/sdk/src/com/sun/opends/sdk/util/Platform.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/Platform.java
rename to sdk/src/com/sun/opends/sdk/util/Platform.java
index 7f5937a..f3954bc 100644
--- a/sdk/src/org/opends/sdk/util/Platform.java
+++ b/sdk/src/com/sun/opends/sdk/util/Platform.java
@@ -25,10 +25,10 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.io.*;
import java.lang.reflect.Constructor;
@@ -38,7 +38,6 @@
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
-import com.sun.opends.sdk.util.Message;
/**
* Provides a wrapper class that collects all of the JVM vendor
diff --git a/sdk/src/org/opends/sdk/util/Predicate.java b/sdk/src/com/sun/opends/sdk/util/Predicate.java
similarity index 97%
rename from sdk/src/org/opends/sdk/util/Predicate.java
rename to sdk/src/com/sun/opends/sdk/util/Predicate.java
index a7058f6..d2eb188 100644
--- a/sdk/src/org/opends/sdk/util/Predicate.java
+++ b/sdk/src/com/sun/opends/sdk/util/Predicate.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
diff --git a/sdk/src/org/opends/sdk/util/SSLUtils.java b/sdk/src/com/sun/opends/sdk/util/SSLUtils.java
similarity index 80%
rename from sdk/src/org/opends/sdk/util/SSLUtils.java
rename to sdk/src/com/sun/opends/sdk/util/SSLUtils.java
index a6cb1ba..1a1ba2f 100644
--- a/sdk/src/org/opends/sdk/util/SSLUtils.java
+++ b/sdk/src/com/sun/opends/sdk/util/SSLUtils.java
@@ -1,4 +1,4 @@
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
@@ -16,14 +16,6 @@
*/
public class SSLUtils
{
- private static String PROVIDER =
- System.getProperty("org.opends.security.provider");
- private static String KEY_STORE =
- System.getProperty("javax.net.ssl.keyStore");
-
- {
-
- }
public static SSLContext getSSLContext(TrustManager trustManager,
KeyManager keyManager)
throws KeyManagementException, NoSuchAlgorithmException {
diff --git a/sdk/src/org/opends/sdk/util/SizeLimitInputStream.java b/sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java
similarity index 98%
rename from sdk/src/org/opends/sdk/util/SizeLimitInputStream.java
rename to sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java
index 16eca77..5a02dad 100644
--- a/sdk/src/org/opends/sdk/util/SizeLimitInputStream.java
+++ b/sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
import java.io.IOException;
import java.io.InputStream;
diff --git a/sdk/src/org/opends/sdk/util/StaticUtils.java b/sdk/src/com/sun/opends/sdk/util/StaticUtils.java
similarity index 94%
rename from sdk/src/org/opends/sdk/util/StaticUtils.java
rename to sdk/src/com/sun/opends/sdk/util/StaticUtils.java
index 0eb960a..818389e 100644
--- a/sdk/src/org/opends/sdk/util/StaticUtils.java
+++ b/sdk/src/com/sun/opends/sdk/util/StaticUtils.java
@@ -25,11 +25,11 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
@@ -40,11 +40,11 @@
import java.util.zip.Deflater;
import java.util.zip.Inflater;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
-import com.sun.opends.sdk.util.Message;
-import com.sun.opends.sdk.util.MessageBuilder;
-import com.sun.opends.sdk.util.MessageDescriptor;
@@ -672,47 +672,21 @@
public static boolean compress(ByteSequence input,
ByteStringBuilder output)
{
- // Avoid extra copies if possible.
- byte[] inputBuffer;
- int inputOffset;
- final int inputLength = input.length();
+ byte[] inputBytes = input.toByteArray();
+ byte[] outputBytes = new byte[inputBytes.length];
- if (input instanceof ByteString)
- {
- final ByteString byteString = (ByteString) input;
- inputBuffer = byteString.buffer;
- inputOffset = byteString.offset;
- }
- else if (input instanceof ByteStringBuilder)
- {
- final ByteStringBuilder builder = (ByteStringBuilder) input;
- inputBuffer = builder.buffer;
- inputOffset = 0;
- }
- else
- {
- inputBuffer = new byte[inputLength];
- inputOffset = 0;
- input.copyTo(inputBuffer);
- }
-
- // Make sure the free space in the destination buffer is at least
- // as big as this.
- output.ensureAdditionalCapacity(inputLength);
-
- final int compressedSize = compress(inputBuffer, inputOffset,
- inputLength, output.buffer, output.length, output.buffer.length
- - output.length);
+ final int compressedSize = compress(inputBytes, 0,
+ inputBytes.length, outputBytes, 0, outputBytes.length);
if (compressedSize != -1)
{
if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINE))
{
StaticUtils.DEBUG_LOG.fine(String.format("Compression %d/%d%n",
- compressedSize, inputLength));
+ compressedSize, inputBytes.length));
}
- output.length += compressedSize;
+ output.append(outputBytes, 0, compressedSize);
return true;
}
@@ -1752,53 +1726,24 @@
ByteStringBuilder output, int uncompressedSize)
throws DataFormatException
{
- // Avoid extra copies if possible.
- byte[] inputBuffer;
- int inputOffset;
- final int inputLength = input.length();
+ byte[] inputBytes = input.toByteArray();
+ byte[] outputBytes = new byte[uncompressedSize > 0 ? uncompressedSize : 0];
- if (input instanceof ByteString)
- {
- final ByteString byteString = (ByteString) input;
- inputBuffer = byteString.buffer;
- inputOffset = byteString.offset;
- }
- else if (input instanceof ByteStringBuilder)
- {
- final ByteStringBuilder builder = (ByteStringBuilder) input;
- inputBuffer = builder.buffer;
- inputOffset = 0;
- }
- else
- {
- inputBuffer = new byte[inputLength];
- inputOffset = 0;
- input.copyTo(inputBuffer);
- }
-
- // Resize destination buffer if a uncompressed size was provided.
- if (uncompressedSize > 0)
- {
- output.ensureAdditionalCapacity(uncompressedSize);
- }
-
- int decompressResult = uncompress(inputBuffer, inputOffset,
- inputLength, output.buffer, output.length, output.buffer.length
- - output.length);
+ int decompressResult = uncompress(inputBytes, 0,
+ inputBytes.length, outputBytes, 0, outputBytes.length);
if (decompressResult < 0)
{
// The destination buffer wasn't big enough. Resize and retry.
- output.ensureAdditionalCapacity(-decompressResult);
- decompressResult = uncompress(inputBuffer, inputOffset,
- inputLength, output.buffer, output.length,
- output.buffer.length - output.length);
+ outputBytes = new byte[-decompressResult];
+ decompressResult = uncompress(inputBytes, 0,
+ inputBytes.length, outputBytes, 0, outputBytes.length);
}
if (decompressResult >= 0)
{
// It was successful.
- output.length += decompressResult;
+ output.append(outputBytes, 0, decompressResult);
return true;
}
diff --git a/sdk/src/org/opends/sdk/util/StringPrepProfile.java b/sdk/src/com/sun/opends/sdk/util/StringPrepProfile.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/StringPrepProfile.java
rename to sdk/src/com/sun/opends/sdk/util/StringPrepProfile.java
index e8b9abe..f3dc098 100644
--- a/sdk/src/org/opends/sdk/util/StringPrepProfile.java
+++ b/sdk/src/com/sun/opends/sdk/util/StringPrepProfile.java
@@ -24,15 +24,17 @@
*
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
-import static org.opends.sdk.util.Validator.ensureNotNull;
+import static com.sun.opends.sdk.util.Validator.*;
import java.util.HashMap;
import java.util.HashSet;
+import org.opends.sdk.ByteSequence;
+
/**
@@ -571,7 +573,7 @@
* The buffer to which the prepared form of the string should
* be appended.
* @param sequence
- * The {@link org.opends.sdk.util.ByteSequence} that
+ * The {@link org.opends.sdk.ByteSequence} that
* needs preparation.
* @param trim
* Indicates whether leading and trailing spaces should be
diff --git a/sdk/src/org/opends/sdk/util/SubstringReader.java b/sdk/src/com/sun/opends/sdk/util/SubstringReader.java
similarity index 97%
rename from sdk/src/org/opends/sdk/util/SubstringReader.java
rename to sdk/src/com/sun/opends/sdk/util/SubstringReader.java
index 1efcd07..20d2a26 100644
--- a/sdk/src/org/opends/sdk/util/SubstringReader.java
+++ b/sdk/src/com/sun/opends/sdk/util/SubstringReader.java
@@ -1,4 +1,4 @@
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
/**
* Created by IntelliJ IDEA.
diff --git a/sdk/src/org/opends/sdk/util/Validator.java b/sdk/src/com/sun/opends/sdk/util/Validator.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/Validator.java
rename to sdk/src/com/sun/opends/sdk/util/Validator.java
index 47fbaaa..a36b5f1 100644
--- a/sdk/src/org/opends/sdk/util/Validator.java
+++ b/sdk/src/com/sun/opends/sdk/util/Validator.java
@@ -25,7 +25,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package com.sun.opends.sdk.util;
diff --git a/sdk/src/org/opends/sdk/AbstractAttribute.java b/sdk/src/org/opends/sdk/AbstractAttribute.java
index 1e55080..f903c3e 100644
--- a/sdk/src/org/opends/sdk/AbstractAttribute.java
+++ b/sdk/src/org/opends/sdk/AbstractAttribute.java
@@ -33,9 +33,9 @@
import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.MatchingRule;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Function;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Function;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/AbstractConnection.java b/sdk/src/org/opends/sdk/AbstractConnection.java
index b36f3cf..01ee2a4 100644
--- a/sdk/src/org/opends/sdk/AbstractConnection.java
+++ b/sdk/src/org/opends/sdk/AbstractConnection.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.Collection;
import java.util.LinkedList;
@@ -38,9 +38,9 @@
import org.opends.sdk.requests.Requests;
import org.opends.sdk.requests.SearchRequest;
import org.opends.sdk.responses.*;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/AbstractEntry.java b/sdk/src/org/opends/sdk/AbstractEntry.java
index 3732bc5..809edcd 100644
--- a/sdk/src/org/opends/sdk/AbstractEntry.java
+++ b/sdk/src/org/opends/sdk/AbstractEntry.java
@@ -30,7 +30,8 @@
import org.opends.sdk.schema.ObjectClass;
-import org.opends.sdk.util.*;
+
+import com.sun.opends.sdk.util.*;
diff --git a/sdk/src/org/opends/sdk/AbstractFilterVisitor.java b/sdk/src/org/opends/sdk/AbstractFilterVisitor.java
index 7a62823..c1cffda 100644
--- a/sdk/src/org/opends/sdk/AbstractFilterVisitor.java
+++ b/sdk/src/org/opends/sdk/AbstractFilterVisitor.java
@@ -31,7 +31,6 @@
import java.util.List;
-import org.opends.sdk.util.ByteSequence;
/**
diff --git a/sdk/src/org/opends/sdk/Assertion.java b/sdk/src/org/opends/sdk/Assertion.java
index 96d052b..2d2a53c 100644
--- a/sdk/src/org/opends/sdk/Assertion.java
+++ b/sdk/src/org/opends/sdk/Assertion.java
@@ -29,7 +29,6 @@
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/Attribute.java b/sdk/src/org/opends/sdk/Attribute.java
index d76a1da..df27016 100644
--- a/sdk/src/org/opends/sdk/Attribute.java
+++ b/sdk/src/org/opends/sdk/Attribute.java
@@ -34,8 +34,7 @@
import java.util.NoSuchElementException;
import java.util.Set;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Function;
+import com.sun.opends.sdk.util.Function;
diff --git a/sdk/src/org/opends/sdk/AttributeDescription.java b/sdk/src/org/opends/sdk/AttributeDescription.java
index 69255bd..af75c39 100644
--- a/sdk/src/org/opends/sdk/AttributeDescription.java
+++ b/sdk/src/org/opends/sdk/AttributeDescription.java
@@ -29,19 +29,16 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.util.*;
-import com.sun.opends.sdk.util.Message;
import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
-import org.opends.sdk.util.ASCIICharProp;
-import org.opends.sdk.util.Iterators;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.*;
diff --git a/sdk/src/org/opends/sdk/AuthenticatedConnectionFactory.java b/sdk/src/org/opends/sdk/AuthenticatedConnectionFactory.java
index 08d91f6..a56df5f 100644
--- a/sdk/src/org/opends/sdk/AuthenticatedConnectionFactory.java
+++ b/sdk/src/org/opends/sdk/AuthenticatedConnectionFactory.java
@@ -38,7 +38,8 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.CompareResult;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/util/ByteSequence.java b/sdk/src/org/opends/sdk/ByteSequence.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/ByteSequence.java
rename to sdk/src/org/opends/sdk/ByteSequence.java
index 922db42..2ab17d9 100755
--- a/sdk/src/org/opends/sdk/util/ByteSequence.java
+++ b/sdk/src/org/opends/sdk/ByteSequence.java
@@ -24,7 +24,7 @@
*
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package org.opends.sdk;
@@ -33,6 +33,7 @@
+
/**
* A {@code ByteSequence} is a readable sequence of byte values. This
* interface provides uniform, read-only access to many different kinds
diff --git a/sdk/src/org/opends/sdk/util/ByteSequenceReader.java b/sdk/src/org/opends/sdk/ByteSequenceReader.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/ByteSequenceReader.java
rename to sdk/src/org/opends/sdk/ByteSequenceReader.java
index 35ca336..1fa9fd2 100755
--- a/sdk/src/org/opends/sdk/util/ByteSequenceReader.java
+++ b/sdk/src/org/opends/sdk/ByteSequenceReader.java
@@ -24,7 +24,8 @@
*
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package org.opends.sdk;
+
diff --git a/sdk/src/org/opends/sdk/util/ByteString.java b/sdk/src/org/opends/sdk/ByteString.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/ByteString.java
rename to sdk/src/org/opends/sdk/ByteString.java
index c626b2d..65c71e1 100755
--- a/sdk/src/org/opends/sdk/util/ByteString.java
+++ b/sdk/src/org/opends/sdk/ByteString.java
@@ -24,7 +24,7 @@
*
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package org.opends.sdk;
@@ -32,6 +32,8 @@
import java.io.OutputStream;
import java.util.logging.Level;
+import com.sun.opends.sdk.util.StaticUtils;
+
/**
diff --git a/sdk/src/org/opends/sdk/util/ByteStringBuilder.java b/sdk/src/org/opends/sdk/ByteStringBuilder.java
similarity index 99%
rename from sdk/src/org/opends/sdk/util/ByteStringBuilder.java
rename to sdk/src/org/opends/sdk/ByteStringBuilder.java
index efb5ed0..92821ed 100755
--- a/sdk/src/org/opends/sdk/util/ByteStringBuilder.java
+++ b/sdk/src/org/opends/sdk/ByteStringBuilder.java
@@ -24,7 +24,7 @@
*
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.util;
+package org.opends.sdk;
@@ -34,6 +34,8 @@
import java.nio.ByteBuffer;
import java.util.logging.Level;
+import com.sun.opends.sdk.util.StaticUtils;
+
/**
diff --git a/sdk/src/org/opends/sdk/CancelledException.java b/sdk/src/org/opends/sdk/CancelledException.java
index 72ef73b..e3c1618 100644
--- a/sdk/src/org/opends/sdk/CancelledException.java
+++ b/sdk/src/org/opends/sdk/CancelledException.java
@@ -27,15 +27,21 @@
package org.opends.sdk;
+
+
import org.opends.sdk.responses.Result;
+
+
/**
- * Created by IntelliJ IDEA. User: boli Date: Dec 2, 2009 Time: 12:25:31 PM To
- * change this template use File | Settings | File Templates.
+ * Thrown when the result code returned in a Result indicates that the
+ * Request was cancelled.
*/
+@SuppressWarnings("serial")
public class CancelledException extends ErrorResultException
{
- public CancelledException(Result result) {
+ public CancelledException(Result result)
+ {
super(result);
}
}
diff --git a/sdk/src/org/opends/sdk/Change.java b/sdk/src/org/opends/sdk/Change.java
index 04f7b4b..3fdc37b 100644
--- a/sdk/src/org/opends/sdk/Change.java
+++ b/sdk/src/org/opends/sdk/Change.java
@@ -29,8 +29,8 @@
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/Connection.java b/sdk/src/org/opends/sdk/Connection.java
index 5e82780..d4caacc 100644
--- a/sdk/src/org/opends/sdk/Connection.java
+++ b/sdk/src/org/opends/sdk/Connection.java
@@ -35,8 +35,8 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/ConnectionException.java b/sdk/src/org/opends/sdk/ConnectionException.java
index eaffa68..20e8ec9 100644
--- a/sdk/src/org/opends/sdk/ConnectionException.java
+++ b/sdk/src/org/opends/sdk/ConnectionException.java
@@ -30,9 +30,10 @@
import org.opends.sdk.responses.Result;
/**
- * Created by IntelliJ IDEA. User: boli Date: Dec 1, 2009 Time: 2:31:58 PM To
- * change this template use File | Settings | File Templates.
+ * Thrown when the result code returned in a Result indicates that the
+ * Request was unsuccessful because of a connection failure.
*/
+@SuppressWarnings("serial")
public class ConnectionException extends ErrorResultException {
public ConnectionException(Result result) {
super(result);
diff --git a/sdk/src/org/opends/sdk/DN.java b/sdk/src/org/opends/sdk/DN.java
index 010b2d0..86e5679 100644
--- a/sdk/src/org/opends/sdk/DN.java
+++ b/sdk/src/org/opends/sdk/DN.java
@@ -29,16 +29,17 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.*;
-import com.sun.opends.sdk.util.Message;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.SubstringReader;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/DecodeException.java b/sdk/src/org/opends/sdk/DecodeException.java
index b0b8764..10e229e 100644
--- a/sdk/src/org/opends/sdk/DecodeException.java
+++ b/sdk/src/org/opends/sdk/DecodeException.java
@@ -31,8 +31,8 @@
import java.io.IOException;
+import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.LocalizableException;
diff --git a/sdk/src/org/opends/sdk/Entry.java b/sdk/src/org/opends/sdk/Entry.java
index ed49121..1e5776c 100644
--- a/sdk/src/org/opends/sdk/Entry.java
+++ b/sdk/src/org/opends/sdk/Entry.java
@@ -32,8 +32,8 @@
import java.util.Collection;
import org.opends.sdk.schema.ObjectClass;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/ErrorResultIOException.java b/sdk/src/org/opends/sdk/ErrorResultIOException.java
index a2db44a..109ed21 100644
--- a/sdk/src/org/opends/sdk/ErrorResultIOException.java
+++ b/sdk/src/org/opends/sdk/ErrorResultIOException.java
@@ -31,7 +31,7 @@
import java.io.IOException;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/Filter.java b/sdk/src/org/opends/sdk/Filter.java
index ddff4ee..242a106 100644
--- a/sdk/src/org/opends/sdk/Filter.java
+++ b/sdk/src/org/opends/sdk/Filter.java
@@ -29,15 +29,17 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.util.*;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.*;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/FilterVisitor.java b/sdk/src/org/opends/sdk/FilterVisitor.java
index a7d180e..dcf85e8 100644
--- a/sdk/src/org/opends/sdk/FilterVisitor.java
+++ b/sdk/src/org/opends/sdk/FilterVisitor.java
@@ -31,7 +31,6 @@
import java.util.List;
-import org.opends.sdk.util.ByteSequence;
/**
diff --git a/sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java b/sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java
index 83133c1..bf237a3 100644
--- a/sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java
+++ b/sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java
@@ -27,17 +27,21 @@
package org.opends.sdk;
-import org.opends.sdk.responses.*;
-import org.opends.sdk.requests.*;
-import org.opends.sdk.util.Validator;
-
-import java.util.List;
import java.util.LinkedList;
-import java.util.concurrent.CountDownLatch;
+import java.util.List;
import java.util.concurrent.CancellationException;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.opends.sdk.requests.*;
+import org.opends.sdk.responses.BindResult;
+import org.opends.sdk.responses.CompareResult;
+import org.opends.sdk.responses.GenericExtendedResult;
+import org.opends.sdk.responses.Result;
+
+import com.sun.opends.sdk.util.Validator;
+
/**
* An heart beat connection factory can be used to create
* connections that sends a periodic search request to a Directory Server.
diff --git a/sdk/src/org/opends/sdk/LinkedAttribute.java b/sdk/src/org/opends/sdk/LinkedAttribute.java
index 1b52b5b..7701aee 100644
--- a/sdk/src/org/opends/sdk/LinkedAttribute.java
+++ b/sdk/src/org/opends/sdk/LinkedAttribute.java
@@ -31,9 +31,8 @@
import java.util.*;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/Matcher.java b/sdk/src/org/opends/sdk/Matcher.java
index 7e7aace..2c27ea8 100644
--- a/sdk/src/org/opends/sdk/Matcher.java
+++ b/sdk/src/org/opends/sdk/Matcher.java
@@ -29,7 +29,7 @@
-import static org.opends.sdk.util.StaticUtils.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.util.ArrayList;
import java.util.List;
@@ -39,10 +39,9 @@
import org.opends.sdk.schema.MatchingRuleUse;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.StaticUtils;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.StaticUtils;
/**
diff --git a/sdk/src/org/opends/sdk/OperationTimeoutException.java b/sdk/src/org/opends/sdk/OperationTimeoutException.java
index dfaca1e..ac9bee2 100644
--- a/sdk/src/org/opends/sdk/OperationTimeoutException.java
+++ b/sdk/src/org/opends/sdk/OperationTimeoutException.java
@@ -27,15 +27,22 @@
package org.opends.sdk;
+
+
import org.opends.sdk.responses.Result;
+
+
/**
- * Created by IntelliJ IDEA. User: boli Date: Dec 2, 2009 Time: 1:28:13 PM To
- * change this template use File | Settings | File Templates.
+ * Thrown when the result code returned in a Result indicates that the
+ * Request was aborted because it did not complete in the required time
+ * out period.
*/
+@SuppressWarnings("serial")
public class OperationTimeoutException extends ErrorResultException
{
- public OperationTimeoutException(Result result) {
+ public OperationTimeoutException(Result result)
+ {
super(result);
}
}
diff --git a/sdk/src/org/opends/sdk/RDN.java b/sdk/src/org/opends/sdk/RDN.java
index a553d6e..8c61bff 100644
--- a/sdk/src/org/opends/sdk/RDN.java
+++ b/sdk/src/org/opends/sdk/RDN.java
@@ -29,14 +29,14 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.util.*;
-import com.sun.opends.sdk.util.Message;
import org.opends.sdk.schema.*;
-import org.opends.sdk.util.*;
+
+import com.sun.opends.sdk.util.*;
diff --git a/sdk/src/org/opends/sdk/ResultCode.java b/sdk/src/org/opends/sdk/ResultCode.java
index 9306f9a..5f8c464 100644
--- a/sdk/src/org/opends/sdk/ResultCode.java
+++ b/sdk/src/org/opends/sdk/ResultCode.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.Arrays;
import java.util.Collections;
diff --git a/sdk/src/org/opends/sdk/RootDSE.java b/sdk/src/org/opends/sdk/RootDSE.java
index 697d3d6..0e9a032 100644
--- a/sdk/src/org/opends/sdk/RootDSE.java
+++ b/sdk/src/org/opends/sdk/RootDSE.java
@@ -34,10 +34,10 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.SchemaNotFoundException;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Functions;
-import org.opends.sdk.util.Iterables;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Functions;
+import com.sun.opends.sdk.util.Iterables;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/SortedEntry.java b/sdk/src/org/opends/sdk/SortedEntry.java
index 5f48d0f..da1ce00 100644
--- a/sdk/src/org/opends/sdk/SortedEntry.java
+++ b/sdk/src/org/opends/sdk/SortedEntry.java
@@ -34,9 +34,9 @@
import java.util.TreeMap;
import org.opends.sdk.requests.Requests;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/SynchronousConnection.java b/sdk/src/org/opends/sdk/SynchronousConnection.java
index 81bf207..af00ba9 100644
--- a/sdk/src/org/opends/sdk/SynchronousConnection.java
+++ b/sdk/src/org/opends/sdk/SynchronousConnection.java
@@ -33,7 +33,8 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.CompareResult;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/Types.java b/sdk/src/org/opends/sdk/Types.java
index b040dcf..a2ee3fa 100644
--- a/sdk/src/org/opends/sdk/Types.java
+++ b/sdk/src/org/opends/sdk/Types.java
@@ -35,7 +35,8 @@
import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.ObjectClass;
-import org.opends.sdk.util.*;
+
+import com.sun.opends.sdk.util.*;
diff --git a/sdk/src/org/opends/sdk/asn1/ASN1.java b/sdk/src/org/opends/sdk/asn1/ASN1.java
index c263d88..231e520 100644
--- a/sdk/src/org/opends/sdk/asn1/ASN1.java
+++ b/sdk/src/org/opends/sdk/asn1/ASN1.java
@@ -32,13 +32,18 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.opends.sdk.util.*;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteSequenceReader;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
+
+import com.sun.opends.sdk.util.ByteSequenceOutputStream;
/**
* This class contains various static factory methods for creating ASN.1
* readers and writers.
- *
+ *
* @see ASN1Reader
* @see ASN1Writer
*/
@@ -48,7 +53,7 @@
/**
* Returns an ASN.1 reader whose source is the provided byte array and
* having an unlimited maximum BER element size.
- *
+ *
* @param array
* The byte array to use.
* @return The new ASN.1 reader.
@@ -63,7 +68,7 @@
/**
* Returns an ASN.1 reader whose source is the provided byte array and
* having a user defined maximum BER element size.
- *
+ *
* @param array
* The byte array to use.
* @param maxElementSize
@@ -81,7 +86,7 @@
/**
* Returns an ASN.1 reader whose source is the provided byte sequence
* and having an unlimited maximum BER element size.
- *
+ *
* @param sequence
* The byte sequence to use.
* @return The new ASN.1 reader.
@@ -96,7 +101,7 @@
/**
* Returns an ASN.1 reader whose source is the provided byte sequence
* and having a user defined maximum BER element size.
- *
+ *
* @param sequence
* The byte sequence to use.
* @param maxElementSize
@@ -116,7 +121,7 @@
/**
* Returns an ASN.1 reader whose source is the provided byte sequence
* reader and having an unlimited maximum BER element size.
- *
+ *
* @param reader
* The byte sequence reader to use.
* @return The new ASN.1 reader.
@@ -131,7 +136,7 @@
/**
* Returns an ASN.1 reader whose source is the provided byte sequence
* reader and having a user defined maximum BER element size.
- *
+ *
* @param reader
* The byte sequence reader to use.
* @param maxElementSize
@@ -150,7 +155,7 @@
/**
* Returns an ASN.1 reader whose source is the provided input stream
* and having an unlimited maximum BER element size.
- *
+ *
* @param stream
* The input stream to use.
* @return The new ASN.1 reader.
@@ -165,7 +170,7 @@
/**
* Returns an ASN.1 reader whose source is the provided input stream
* and having a user defined maximum BER element size.
- *
+ *
* @param stream
* The input stream to use.
* @param maxElementSize
@@ -184,7 +189,7 @@
/**
* Returns an ASN.1 writer whose destination is the provided byte
* string builder.
- *
+ *
* @param builder
* The byte string builder to use.
* @return The new ASN.1 writer.
@@ -201,7 +206,7 @@
/**
* Returns an ASN.1 writer whose destination is the provided output
* stream.
- *
+ *
* @param stream
* The output stream to use.
* @return The new ASN.1 writer.
diff --git a/sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java b/sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
index fca1186..2c21de6 100644
--- a/sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
+++ b/sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
@@ -29,20 +29,20 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;
import java.io.IOException;
import java.util.LinkedList;
import java.util.logging.Level;
+import org.opends.sdk.ByteSequenceReader;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequenceReader;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java b/sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java
index a367063..194e273 100644
--- a/sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java
+++ b/sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;
import java.io.IOException;
@@ -37,13 +37,13 @@
import java.util.LinkedList;
import java.util.logging.Level;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.SizeLimitInputStream;
-import org.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.SizeLimitInputStream;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/asn1/ASN1OutputStreamWriter.java b/sdk/src/org/opends/sdk/asn1/ASN1OutputStreamWriter.java
index 8ba76f1..bdaf6bb 100644
--- a/sdk/src/org/opends/sdk/asn1/ASN1OutputStreamWriter.java
+++ b/sdk/src/org/opends/sdk/asn1/ASN1OutputStreamWriter.java
@@ -28,20 +28,20 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ASN1_SEQUENCE_WRITE_NOT_STARTED;
-import static org.opends.sdk.asn1.ASN1Constants.BOOLEAN_VALUE_FALSE;
-import static org.opends.sdk.asn1.ASN1Constants.BOOLEAN_VALUE_TRUE;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.asn1.ASN1Constants.*;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.logging.Level;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteStringBuilder;
+
+import com.sun.opends.sdk.util.ByteSequenceOutputStream;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteSequenceOutputStream;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.StaticUtils;
/**
diff --git a/sdk/src/org/opends/sdk/asn1/ASN1Reader.java b/sdk/src/org/opends/sdk/asn1/ASN1Reader.java
index 424da2a..b47ba44 100644
--- a/sdk/src/org/opends/sdk/asn1/ASN1Reader.java
+++ b/sdk/src/org/opends/sdk/asn1/ASN1Reader.java
@@ -32,9 +32,9 @@
import java.io.Closeable;
import java.io.IOException;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
diff --git a/sdk/src/org/opends/sdk/asn1/ASN1Writer.java b/sdk/src/org/opends/sdk/asn1/ASN1Writer.java
index dae71e0..b4621ed 100644
--- a/sdk/src/org/opends/sdk/asn1/ASN1Writer.java
+++ b/sdk/src/org/opends/sdk/asn1/ASN1Writer.java
@@ -32,7 +32,7 @@
import java.io.Flushable;
import java.io.IOException;
-import org.opends.sdk.util.ByteSequence;
+import org.opends.sdk.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/asn1/AbstractASN1Reader.java b/sdk/src/org/opends/sdk/asn1/AbstractASN1Reader.java
index 2ec53df..8540c52 100644
--- a/sdk/src/org/opends/sdk/asn1/AbstractASN1Reader.java
+++ b/sdk/src/org/opends/sdk/asn1/AbstractASN1Reader.java
@@ -29,14 +29,14 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;
import java.io.IOException;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/asn1/AbstractASN1Writer.java b/sdk/src/org/opends/sdk/asn1/AbstractASN1Writer.java
index 662043c..f98bdf1 100644
--- a/sdk/src/org/opends/sdk/asn1/AbstractASN1Writer.java
+++ b/sdk/src/org/opends/sdk/asn1/AbstractASN1Writer.java
@@ -32,7 +32,7 @@
import java.io.IOException;
-import org.opends.sdk.util.ByteSequence;
+import org.opends.sdk.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/controls/AccountUsabilityControl.java b/sdk/src/org/opends/sdk/controls/AccountUsabilityControl.java
index 9bd5efb..e435032 100644
--- a/sdk/src/org/opends/sdk/controls/AccountUsabilityControl.java
+++ b/sdk/src/org/opends/sdk/controls/AccountUsabilityControl.java
@@ -2,24 +2,21 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ACCTUSABLERES_DECODE_ERROR;
-import static com.sun.opends.sdk.util.Messages.ERR_ACCTUSABLERES_NO_CONTROL_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ACCTUSABLERES_UNKNOWN_VALUE_ELEMENT_TYPE;
-import static org.opends.sdk.util.StaticUtils.byteToHex;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/controls/AssertionControl.java b/sdk/src/org/opends/sdk/controls/AssertionControl.java
index fc87255..de8e2b7 100644
--- a/sdk/src/org/opends/sdk/controls/AssertionControl.java
+++ b/sdk/src/org/opends/sdk/controls/AssertionControl.java
@@ -29,13 +29,13 @@
-import static com.sun.opends.sdk.util.Messages.ERR_LDAPASSERT_INVALID_CONTROL_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_LDAPASSERT_NO_CONTROL_VALUE;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.Filter;
import org.opends.sdk.asn1.ASN1;
@@ -43,9 +43,9 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.ldap.LDAPUtils;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/AuthorizationIdentityControl.java b/sdk/src/org/opends/sdk/controls/AuthorizationIdentityControl.java
index 29478e6..a7f4a08 100644
--- a/sdk/src/org/opends/sdk/controls/AuthorizationIdentityControl.java
+++ b/sdk/src/org/opends/sdk/controls/AuthorizationIdentityControl.java
@@ -2,15 +2,15 @@
-import static com.sun.opends.sdk.util.Messages.ERR_AUTHZIDREQ_CONTROL_HAS_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_AUTHZIDRESP_NO_CONTROL_VALUE;
+import static com.sun.opends.sdk.messages.Messages.*;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/Control.java b/sdk/src/org/opends/sdk/controls/Control.java
index 5f9af74..cb034c8 100644
--- a/sdk/src/org/opends/sdk/controls/Control.java
+++ b/sdk/src/org/opends/sdk/controls/Control.java
@@ -2,7 +2,7 @@
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/controls/ControlDecoder.java b/sdk/src/org/opends/sdk/controls/ControlDecoder.java
index f853361..83f34f6 100644
--- a/sdk/src/org/opends/sdk/controls/ControlDecoder.java
+++ b/sdk/src/org/opends/sdk/controls/ControlDecoder.java
@@ -28,9 +28,9 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/controls/EntryChangeNotificationControl.java b/sdk/src/org/opends/sdk/controls/EntryChangeNotificationControl.java
index 5bfd59f..4981c4b 100644
--- a/sdk/src/org/opends/sdk/controls/EntryChangeNotificationControl.java
+++ b/sdk/src/org/opends/sdk/controls/EntryChangeNotificationControl.java
@@ -2,26 +2,24 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ECN_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ECN_ILLEGAL_PREVIOUS_DN;
-import static com.sun.opends.sdk.util.Messages.ERR_ECN_NO_CONTROL_VALUE;
-import static org.opends.sdk.asn1.ASN1Constants.UNIVERSAL_INTEGER_TYPE;
-import static org.opends.sdk.asn1.ASN1Constants.UNIVERSAL_OCTET_STRING_TYPE;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
+import static org.opends.sdk.asn1.ASN1Constants.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/GenericControl.java b/sdk/src/org/opends/sdk/controls/GenericControl.java
index 019648d..406a07f 100644
--- a/sdk/src/org/opends/sdk/controls/GenericControl.java
+++ b/sdk/src/org/opends/sdk/controls/GenericControl.java
@@ -29,8 +29,9 @@
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
+import org.opends.sdk.ByteString;
+
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java b/sdk/src/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java
index e3b7038..f355daf 100644
--- a/sdk/src/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java
+++ b/sdk/src/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java
@@ -2,13 +2,13 @@
-import static com.sun.opends.sdk.util.Messages.INFO_GETEFFECTIVERIGHTS_DECODE_ERROR;
-import static com.sun.opends.sdk.util.Messages.INFO_GETEFFECTIVERIGHTS_INVALID_AUTHZID;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.io.IOException;
import java.util.*;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
@@ -16,9 +16,9 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/MatchedValuesControl.java b/sdk/src/org/opends/sdk/controls/MatchedValuesControl.java
index 6c1bbae..6bd04a0 100644
--- a/sdk/src/org/opends/sdk/controls/MatchedValuesControl.java
+++ b/sdk/src/org/opends/sdk/controls/MatchedValuesControl.java
@@ -29,24 +29,25 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.AbstractFilterVisitor;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.Filter;
+import org.opends.sdk.*;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.ldap.LDAPUtils;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.*;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/PagedResultsControl.java b/sdk/src/org/opends/sdk/controls/PagedResultsControl.java
index 9fc130ec..45d80a8 100644
--- a/sdk/src/org/opends/sdk/controls/PagedResultsControl.java
+++ b/sdk/src/org/opends/sdk/controls/PagedResultsControl.java
@@ -2,23 +2,21 @@
-import static com.sun.opends.sdk.util.Messages.ERR_LDAP_PAGED_RESULTS_DECODE_COOKIE;
-import static com.sun.opends.sdk.util.Messages.ERR_LDAP_PAGED_RESULTS_DECODE_NULL;
-import static com.sun.opends.sdk.util.Messages.ERR_LDAP_PAGED_RESULTS_DECODE_SEQUENCE;
-import static com.sun.opends.sdk.util.Messages.ERR_LDAP_PAGED_RESULTS_DECODE_SIZE;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/PasswordExpiredControl.java b/sdk/src/org/opends/sdk/controls/PasswordExpiredControl.java
index 756232c..4f1ef7b 100644
--- a/sdk/src/org/opends/sdk/controls/PasswordExpiredControl.java
+++ b/sdk/src/org/opends/sdk/controls/PasswordExpiredControl.java
@@ -2,12 +2,13 @@
-import static com.sun.opends.sdk.util.Messages.ERR_PWEXPIRED_CONTROL_INVALID_VALUE;
+import static com.sun.opends.sdk.messages.Messages.*;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
+
+import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/controls/PasswordExpiringControl.java b/sdk/src/org/opends/sdk/controls/PasswordExpiringControl.java
index d0f3796..6d40dbf 100644
--- a/sdk/src/org/opends/sdk/controls/PasswordExpiringControl.java
+++ b/sdk/src/org/opends/sdk/controls/PasswordExpiringControl.java
@@ -2,15 +2,15 @@
-import static com.sun.opends.sdk.util.Messages.ERR_PWEXPIRING_CANNOT_DECODE_SECONDS_UNTIL_EXPIRATION;
-import static com.sun.opends.sdk.util.Messages.ERR_PWEXPIRING_NO_CONTROL_VALUE;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/controls/PasswordPolicyControl.java b/sdk/src/org/opends/sdk/controls/PasswordPolicyControl.java
index 2fa1ac2..c191e8c 100644
--- a/sdk/src/org/opends/sdk/controls/PasswordPolicyControl.java
+++ b/sdk/src/org/opends/sdk/controls/PasswordPolicyControl.java
@@ -2,22 +2,22 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.byteToHex;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/PasswordPolicyErrorType.java b/sdk/src/org/opends/sdk/controls/PasswordPolicyErrorType.java
index 1549897..826c2a5 100644
--- a/sdk/src/org/opends/sdk/controls/PasswordPolicyErrorType.java
+++ b/sdk/src/org/opends/sdk/controls/PasswordPolicyErrorType.java
@@ -2,7 +2,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.Arrays;
import java.util.List;
diff --git a/sdk/src/org/opends/sdk/controls/PasswordPolicyWarningType.java b/sdk/src/org/opends/sdk/controls/PasswordPolicyWarningType.java
index 85ebf35..46c322b 100644
--- a/sdk/src/org/opends/sdk/controls/PasswordPolicyWarningType.java
+++ b/sdk/src/org/opends/sdk/controls/PasswordPolicyWarningType.java
@@ -2,8 +2,7 @@
-import static com.sun.opends.sdk.util.Messages.INFO_PWPWARNTYPE_DESCRIPTION_GRACE_LOGINS_REMAINING;
-import static com.sun.opends.sdk.util.Messages.INFO_PWPWARNTYPE_DESCRIPTION_TIME_BEFORE_EXPIRATION;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.Arrays;
import java.util.List;
diff --git a/sdk/src/org/opends/sdk/controls/PersistentSearchControl.java b/sdk/src/org/opends/sdk/controls/PersistentSearchControl.java
index b3ce6da..cbcae72 100644
--- a/sdk/src/org/opends/sdk/controls/PersistentSearchControl.java
+++ b/sdk/src/org/opends/sdk/controls/PersistentSearchControl.java
@@ -2,21 +2,21 @@
-import static com.sun.opends.sdk.util.Messages.ERR_PSEARCH_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_PSEARCH_NO_CONTROL_VALUE;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/controls/PostReadControl.java b/sdk/src/org/opends/sdk/controls/PostReadControl.java
index 82b8686..5596d02 100644
--- a/sdk/src/org/opends/sdk/controls/PostReadControl.java
+++ b/sdk/src/org/opends/sdk/controls/PostReadControl.java
@@ -29,17 +29,15 @@
-import static com.sun.opends.sdk.util.Messages.ERR_POSTREADREQ_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_POSTREADREQ_NO_CONTROL_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_POSTREADRESP_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_POSTREADRESP_NO_CONTROL_VALUE;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
@@ -47,10 +45,10 @@
import org.opends.sdk.ldap.LDAPUtils;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/PreReadControl.java b/sdk/src/org/opends/sdk/controls/PreReadControl.java
index fa6c417..c7e3661 100644
--- a/sdk/src/org/opends/sdk/controls/PreReadControl.java
+++ b/sdk/src/org/opends/sdk/controls/PreReadControl.java
@@ -29,17 +29,15 @@
-import static com.sun.opends.sdk.util.Messages.ERR_PREREADREQ_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_PREREADREQ_NO_CONTROL_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_PREREADRESP_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_PREREADRESP_NO_CONTROL_VALUE;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
@@ -47,10 +45,10 @@
import org.opends.sdk.ldap.LDAPUtils;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/ProxiedAuthV1Control.java b/sdk/src/org/opends/sdk/controls/ProxiedAuthV1Control.java
index 9ff8cf8..f680699 100644
--- a/sdk/src/org/opends/sdk/controls/ProxiedAuthV1Control.java
+++ b/sdk/src/org/opends/sdk/controls/ProxiedAuthV1Control.java
@@ -2,22 +2,21 @@
-import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH1_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH1_CONTROL_NOT_CRITICAL;
-import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH1_NO_CONTROL_VALUE;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/ProxiedAuthV2Control.java b/sdk/src/org/opends/sdk/controls/ProxiedAuthV2Control.java
index 6f48e47..a3c5b98 100644
--- a/sdk/src/org/opends/sdk/controls/ProxiedAuthV2Control.java
+++ b/sdk/src/org/opends/sdk/controls/ProxiedAuthV2Control.java
@@ -2,22 +2,21 @@
-import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH2_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH2_CONTROL_NOT_CRITICAL;
-import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH2_NO_CONTROL_VALUE;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/ServerSideSortControl.java b/sdk/src/org/opends/sdk/controls/ServerSideSortControl.java
index b0e36d3..3ab3dc1 100644
--- a/sdk/src/org/opends/sdk/controls/ServerSideSortControl.java
+++ b/sdk/src/org/opends/sdk/controls/ServerSideSortControl.java
@@ -2,23 +2,24 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/SortKey.java b/sdk/src/org/opends/sdk/controls/SortKey.java
index 9ba4460..36f2f16 100644
--- a/sdk/src/org/opends/sdk/controls/SortKey.java
+++ b/sdk/src/org/opends/sdk/controls/SortKey.java
@@ -3,7 +3,8 @@
import org.opends.sdk.AttributeDescription;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/SubtreeDeleteControl.java b/sdk/src/org/opends/sdk/controls/SubtreeDeleteControl.java
index 351968b..bbdd5ef 100644
--- a/sdk/src/org/opends/sdk/controls/SubtreeDeleteControl.java
+++ b/sdk/src/org/opends/sdk/controls/SubtreeDeleteControl.java
@@ -2,12 +2,13 @@
-import static com.sun.opends.sdk.util.Messages.ERR_SUBTREE_DELETE_INVALID_CONTROL_VALUE;
+import static com.sun.opends.sdk.messages.Messages.*;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
+
+import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/controls/VLVControl.java b/sdk/src/org/opends/sdk/controls/VLVControl.java
index be479be..963827b 100644
--- a/sdk/src/org/opends/sdk/controls/VLVControl.java
+++ b/sdk/src/org/opends/sdk/controls/VLVControl.java
@@ -2,23 +2,21 @@
-import static com.sun.opends.sdk.util.Messages.INFO_VLVREQ_CONTROL_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.INFO_VLVREQ_CONTROL_NO_VALUE;
-import static com.sun.opends.sdk.util.Messages.INFO_VLVRES_CONTROL_CANNOT_DECODE_VALUE;
-import static com.sun.opends.sdk.util.Messages.INFO_VLVRES_CONTROL_NO_VALUE;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/controls/VLVTarget.java b/sdk/src/org/opends/sdk/controls/VLVTarget.java
index dc91d3c..0e8f398 100644
--- a/sdk/src/org/opends/sdk/controls/VLVTarget.java
+++ b/sdk/src/org/opends/sdk/controls/VLVTarget.java
@@ -2,17 +2,18 @@
-import static com.sun.opends.sdk.util.Messages.INFO_VLVREQ_CONTROL_INVALID_TARGET_TYPE;
-import static org.opends.sdk.util.StaticUtils.byteToHex;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/extensions/CancelRequest.java b/sdk/src/org/opends/sdk/extensions/CancelRequest.java
index 0226363..d18f7cf 100644
--- a/sdk/src/org/opends/sdk/extensions/CancelRequest.java
+++ b/sdk/src/org/opends/sdk/extensions/CancelRequest.java
@@ -2,13 +2,13 @@
-import static com.sun.opends.sdk.util.Messages.ERR_EXTOP_CANCEL_CANNOT_DECODE_REQUEST_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_EXTOP_CANCEL_NO_REQUEST_VALUE;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
@@ -17,8 +17,8 @@
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
+
+import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/extensions/ExtendedOperation.java b/sdk/src/org/opends/sdk/extensions/ExtendedOperation.java
index 28d8ee4..a52e301 100644
--- a/sdk/src/org/opends/sdk/extensions/ExtendedOperation.java
+++ b/sdk/src/org/opends/sdk/extensions/ExtendedOperation.java
@@ -2,11 +2,11 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.requests.ExtendedRequest;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/extensions/GetConnectionIDRequest.java b/sdk/src/org/opends/sdk/extensions/GetConnectionIDRequest.java
index d0c49f1..65de671 100644
--- a/sdk/src/org/opends/sdk/extensions/GetConnectionIDRequest.java
+++ b/sdk/src/org/opends/sdk/extensions/GetConnectionIDRequest.java
@@ -4,13 +4,14 @@
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.requests.AbstractExtendedRequest;
-import org.opends.sdk.util.ByteString;
+
+import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/extensions/GetConnectionIDResult.java b/sdk/src/org/opends/sdk/extensions/GetConnectionIDResult.java
index 7fb1be0..920ef33 100644
--- a/sdk/src/org/opends/sdk/extensions/GetConnectionIDResult.java
+++ b/sdk/src/org/opends/sdk/extensions/GetConnectionIDResult.java
@@ -31,12 +31,12 @@
import java.io.IOException;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.responses.AbstractExtendedResult;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
diff --git a/sdk/src/org/opends/sdk/extensions/GetSymmetricKeyRequest.java b/sdk/src/org/opends/sdk/extensions/GetSymmetricKeyRequest.java
index 0abd842..33e76c0 100644
--- a/sdk/src/org/opends/sdk/extensions/GetSymmetricKeyRequest.java
+++ b/sdk/src/org/opends/sdk/extensions/GetSymmetricKeyRequest.java
@@ -2,12 +2,12 @@
-import static com.sun.opends.sdk.util.Messages.ERR_GET_SYMMETRIC_KEY_ASN1_DECODE_EXCEPTION;
-import static com.sun.opends.sdk.util.Messages.ERR_GET_SYMMETRIC_KEY_NO_VALUE;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
@@ -16,9 +16,9 @@
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/extensions/PasswordModifyRequest.java b/sdk/src/org/opends/sdk/extensions/PasswordModifyRequest.java
index 3517116..84f61d9 100644
--- a/sdk/src/org/opends/sdk/extensions/PasswordModifyRequest.java
+++ b/sdk/src/org/opends/sdk/extensions/PasswordModifyRequest.java
@@ -2,19 +2,19 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.requests.AbstractExtendedRequest;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/extensions/PasswordModifyResult.java b/sdk/src/org/opends/sdk/extensions/PasswordModifyResult.java
index b73354b..2882393 100644
--- a/sdk/src/org/opends/sdk/extensions/PasswordModifyResult.java
+++ b/sdk/src/org/opends/sdk/extensions/PasswordModifyResult.java
@@ -4,12 +4,12 @@
import java.io.IOException;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.responses.AbstractExtendedResult;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
diff --git a/sdk/src/org/opends/sdk/extensions/PasswordPolicyStateExtendedOperation.java b/sdk/src/org/opends/sdk/extensions/PasswordPolicyStateExtendedOperation.java
index 7d27ee1..910979c 100644
--- a/sdk/src/org/opends/sdk/extensions/PasswordPolicyStateExtendedOperation.java
+++ b/sdk/src/org/opends/sdk/extensions/PasswordPolicyStateExtendedOperation.java
@@ -2,11 +2,8 @@
-import static com.sun.opends.sdk.util.Messages.ERR_PWPSTATE_EXTOP_DECODE_FAILURE;
-import static com.sun.opends.sdk.util.Messages.ERR_PWPSTATE_EXTOP_NO_REQUEST_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_PWPSTATE_EXTOP_UNKNOWN_OP_TYPE;
-import static org.opends.sdk.util.StaticUtils.formatAsGeneralizedTime;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
import java.util.ArrayList;
@@ -14,18 +11,15 @@
import java.util.Date;
import java.util.List;
-import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DN;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.ResultCode;
+import org.opends.sdk.*;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.responses.AbstractExtendedResult;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/extensions/StartTLSRequest.java b/sdk/src/org/opends/sdk/extensions/StartTLSRequest.java
index 5b05138..70819df 100644
--- a/sdk/src/org/opends/sdk/extensions/StartTLSRequest.java
+++ b/sdk/src/org/opends/sdk/extensions/StartTLSRequest.java
@@ -4,12 +4,12 @@
import javax.net.ssl.SSLContext;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/extensions/WhoAmIRequest.java b/sdk/src/org/opends/sdk/extensions/WhoAmIRequest.java
index c9a33c8..ae87c86 100644
--- a/sdk/src/org/opends/sdk/extensions/WhoAmIRequest.java
+++ b/sdk/src/org/opends/sdk/extensions/WhoAmIRequest.java
@@ -2,10 +2,10 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.requests.AbstractExtendedRequest;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/extensions/WhoAmIResult.java b/sdk/src/org/opends/sdk/extensions/WhoAmIResult.java
index a59a45b..6a77ae9 100644
--- a/sdk/src/org/opends/sdk/extensions/WhoAmIResult.java
+++ b/sdk/src/org/opends/sdk/extensions/WhoAmIResult.java
@@ -29,9 +29,9 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.responses.AbstractExtendedResult;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java b/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java
index e953da3..633d5df 100644
--- a/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java
+++ b/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java
@@ -28,23 +28,23 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.ldap.LDAPConstants.*;
import java.io.IOException;
import java.nio.BufferUnderflowException;
import java.util.logging.Level;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.AbstractASN1Reader;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
import com.sun.grizzly.streams.StreamReader;
import com.sun.grizzly.utils.PoolableObject;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/ldap/ASN1StreamWriter.java b/sdk/src/org/opends/sdk/ldap/ASN1StreamWriter.java
index 0ee55f4..94c9e34 100644
--- a/sdk/src/org/opends/sdk/ldap/ASN1StreamWriter.java
+++ b/sdk/src/org/opends/sdk/ldap/ASN1StreamWriter.java
@@ -28,21 +28,21 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;
import java.io.IOException;
import java.util.logging.Level;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.asn1.AbstractASN1Writer;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteStringBuilder;
-import org.opends.sdk.util.StaticUtils;
import com.sun.grizzly.streams.StreamWriter;
import com.sun.grizzly.utils.PoolableObject;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/ldap/AbstractLDAPMessageHandler.java b/sdk/src/org/opends/sdk/ldap/AbstractLDAPMessageHandler.java
index 925edbf..c25c2f0 100644
--- a/sdk/src/org/opends/sdk/ldap/AbstractLDAPMessageHandler.java
+++ b/sdk/src/org/opends/sdk/ldap/AbstractLDAPMessageHandler.java
@@ -29,6 +29,7 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.GenericControl;
@@ -36,7 +37,6 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.sasl.SASLBindRequest;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java b/sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java
index 3111494..84b1aec 100644
--- a/sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java
+++ b/sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java
@@ -37,9 +37,10 @@
import org.opends.sdk.ResultFuture;
import org.opends.sdk.ResultHandler;
import org.opends.sdk.requests.Requests;
-import org.opends.sdk.responses.Result;
import org.opends.sdk.responses.Responses;
-import org.opends.sdk.util.StaticUtils;
+import org.opends.sdk.responses.Result;
+
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/ldap/ConnectionPool.java b/sdk/src/org/opends/sdk/ldap/ConnectionPool.java
index f97356e..cfadeeb 100644
--- a/sdk/src/org/opends/sdk/ldap/ConnectionPool.java
+++ b/sdk/src/org/opends/sdk/ldap/ConnectionPool.java
@@ -27,18 +27,21 @@
package org.opends.sdk.ldap;
+import java.util.Stack;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
+
import org.opends.sdk.*;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.responses.Result;
+import org.opends.sdk.requests.*;
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.CompareResult;
import org.opends.sdk.responses.GenericExtendedResult;
-import org.opends.sdk.requests.*;
+import org.opends.sdk.responses.Result;
-import java.util.concurrent.*;
-import java.util.Queue;
-import java.util.Stack;
-import java.util.logging.Level;
+import com.sun.opends.sdk.util.StaticUtils;
/**
* Created by IntelliJ IDEA. User: digitalperk Date: Nov 25, 2009 Time: 11:12:29
@@ -50,7 +53,7 @@
private volatile int numConnections;
private final int poolSize;
private final Stack<AsynchronousConnection> pool;
- private final ConcurrentLinkedQueue<PendingConnectionFuture> pendingFutures;
+ private final ConcurrentLinkedQueue<PendingConnectionFuture<?>> pendingFutures;
private final Object lock = new Object();
private class PooledConnectionWapper
@@ -108,7 +111,7 @@
}
// See if there waiters pending
- PendingConnectionFuture future = pendingFutures.poll();
+ PendingConnectionFuture<?> future = pendingFutures.poll();
if (future != null) {
PooledConnectionWapper pooledConnection =
new PooledConnectionWapper(connection);
@@ -356,14 +359,14 @@
this.connectionFactory = connectionFactory;
this.poolSize = poolSize;
this.pool = new Stack<AsynchronousConnection>();
- this.pendingFutures = new ConcurrentLinkedQueue<PendingConnectionFuture>();
+ this.pendingFutures = new ConcurrentLinkedQueue<PendingConnectionFuture<?>>();
}
private class WrapConnectionResultHandler
implements ConnectionResultHandler<AsynchronousConnection, Void> {
- private final PendingConnectionFuture future;
+ private final PendingConnectionFuture<?> future;
- private WrapConnectionResultHandler(PendingConnectionFuture future) {
+ private WrapConnectionResultHandler(PendingConnectionFuture<?> future) {
this.future = future;
}
diff --git a/sdk/src/org/opends/sdk/ldap/ExtendedResultFutureImpl.java b/sdk/src/org/opends/sdk/ldap/ExtendedResultFutureImpl.java
index 6df167b..b419abe 100644
--- a/sdk/src/org/opends/sdk/ldap/ExtendedResultFutureImpl.java
+++ b/sdk/src/org/opends/sdk/ldap/ExtendedResultFutureImpl.java
@@ -31,13 +31,9 @@
import java.util.concurrent.ExecutorService;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.ResultCode;
-import org.opends.sdk.ResultFuture;
-import org.opends.sdk.ResultHandler;
+import org.opends.sdk.*;
import org.opends.sdk.requests.ExtendedRequest;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/ldap/LDAPConnection.java b/sdk/src/org/opends/sdk/ldap/LDAPConnection.java
index b2c71d6..d2776f8 100644
--- a/sdk/src/org/opends/sdk/ldap/LDAPConnection.java
+++ b/sdk/src/org/opends/sdk/ldap/LDAPConnection.java
@@ -29,16 +29,15 @@
-import static org.opends.sdk.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
+import static org.opends.sdk.ldap.LDAPConstants.*;
import java.io.EOFException;
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger;
import javax.net.ssl.SSLContext;
@@ -53,15 +52,14 @@
import org.opends.sdk.sasl.SASLBindRequest;
import org.opends.sdk.sasl.SASLContext;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
import com.sun.grizzly.filterchain.Filter;
import com.sun.grizzly.filterchain.FilterChain;
import com.sun.grizzly.filterchain.StreamTransformerFilter;
import com.sun.grizzly.ssl.*;
import com.sun.grizzly.streams.StreamWriter;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/ldap/LDAPConnectionFactoryImpl.java b/sdk/src/org/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
index bdb51f9..e19f158 100644
--- a/sdk/src/org/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
+++ b/sdk/src/org/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
@@ -42,7 +42,6 @@
import org.opends.sdk.extensions.StartTLSRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.Validator;
import com.sun.grizzly.TransportFactory;
import com.sun.grizzly.attributes.Attribute;
@@ -53,6 +52,7 @@
import com.sun.grizzly.ssl.SSLFilter;
import com.sun.grizzly.ssl.SSLHandshaker;
import com.sun.grizzly.streams.StreamWriter;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/ldap/LDAPConnectionOptions.java b/sdk/src/org/opends/sdk/ldap/LDAPConnectionOptions.java
index 9104b55..1267b96 100644
--- a/sdk/src/org/opends/sdk/ldap/LDAPConnectionOptions.java
+++ b/sdk/src/org/opends/sdk/ldap/LDAPConnectionOptions.java
@@ -32,7 +32,8 @@
import javax.net.ssl.SSLContext;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/ldap/LDAPDecoder.java b/sdk/src/org/opends/sdk/ldap/LDAPDecoder.java
index 9e757a0..353877f 100644
--- a/sdk/src/org/opends/sdk/ldap/LDAPDecoder.java
+++ b/sdk/src/org/opends/sdk/ldap/LDAPDecoder.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;
import static org.opends.sdk.ldap.LDAPConstants.*;
@@ -43,9 +43,9 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.sasl.GenericSASLBindRequest;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.StaticUtils;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/ldap/LDAPEncoder.java b/sdk/src/org/opends/sdk/ldap/LDAPEncoder.java
index 1fe7632..e90cc44 100644
--- a/sdk/src/org/opends/sdk/ldap/LDAPEncoder.java
+++ b/sdk/src/org/opends/sdk/ldap/LDAPEncoder.java
@@ -35,6 +35,7 @@
import java.util.logging.Level;
import org.opends.sdk.Attribute;
+import org.opends.sdk.ByteString;
import org.opends.sdk.Change;
import org.opends.sdk.DN;
import org.opends.sdk.asn1.ASN1Writer;
@@ -42,8 +43,8 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
import org.opends.sdk.sasl.SASLBindRequest;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
+
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/ldap/LDAPMessageHandler.java b/sdk/src/org/opends/sdk/ldap/LDAPMessageHandler.java
index 4cc393d..459dd39 100644
--- a/sdk/src/org/opends/sdk/ldap/LDAPMessageHandler.java
+++ b/sdk/src/org/opends/sdk/ldap/LDAPMessageHandler.java
@@ -29,13 +29,13 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.controls.Control;
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
import org.opends.sdk.sasl.SASLBindRequest;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/ldap/LDAPUtils.java b/sdk/src/org/opends/sdk/ldap/LDAPUtils.java
index ecf5c5f..dc8e5c2 100644
--- a/sdk/src/org/opends/sdk/ldap/LDAPUtils.java
+++ b/sdk/src/org/opends/sdk/ldap/LDAPUtils.java
@@ -36,13 +36,13 @@
import java.util.LinkedList;
import java.util.List;
+import org.opends.sdk.ByteSequence;
import org.opends.sdk.Filter;
import org.opends.sdk.FilterVisitor;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/ldap/SearchResultFutureImpl.java b/sdk/src/org/opends/sdk/ldap/SearchResultFutureImpl.java
index b8c7a19..a94c3a6 100644
--- a/sdk/src/org/opends/sdk/ldap/SearchResultFutureImpl.java
+++ b/sdk/src/org/opends/sdk/ldap/SearchResultFutureImpl.java
@@ -36,7 +36,10 @@
import org.opends.sdk.ResultHandler;
import org.opends.sdk.SearchResultHandler;
import org.opends.sdk.requests.SearchRequest;
-import org.opends.sdk.responses.*;
+import org.opends.sdk.responses.Responses;
+import org.opends.sdk.responses.Result;
+import org.opends.sdk.responses.SearchResultEntry;
+import org.opends.sdk.responses.SearchResultReference;
diff --git a/sdk/src/org/opends/sdk/ldap/UnexpectedRequestException.java b/sdk/src/org/opends/sdk/ldap/UnexpectedRequestException.java
index 094cf02..d0fb634 100644
--- a/sdk/src/org/opends/sdk/ldap/UnexpectedRequestException.java
+++ b/sdk/src/org/opends/sdk/ldap/UnexpectedRequestException.java
@@ -31,9 +31,10 @@
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
import org.opends.sdk.requests.Request;
+import com.sun.opends.sdk.util.Message;
+
/**
diff --git a/sdk/src/org/opends/sdk/ldap/UnexpectedResponseException.java b/sdk/src/org/opends/sdk/ldap/UnexpectedResponseException.java
index 37f4041..582412b 100644
--- a/sdk/src/org/opends/sdk/ldap/UnexpectedResponseException.java
+++ b/sdk/src/org/opends/sdk/ldap/UnexpectedResponseException.java
@@ -31,9 +31,10 @@
import java.io.IOException;
-import com.sun.opends.sdk.util.Message;
import org.opends.sdk.responses.Response;
+import com.sun.opends.sdk.util.Message;
+
/**
diff --git a/sdk/src/org/opends/sdk/ldap/UnsupportedMessageException.java b/sdk/src/org/opends/sdk/ldap/UnsupportedMessageException.java
index 5343a81..adf4683 100644
--- a/sdk/src/org/opends/sdk/ldap/UnsupportedMessageException.java
+++ b/sdk/src/org/opends/sdk/ldap/UnsupportedMessageException.java
@@ -31,7 +31,7 @@
import java.io.IOException;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/ldif/AbstractLDIFReader.java b/sdk/src/org/opends/sdk/ldif/AbstractLDIFReader.java
index baf3255..6d119e2 100644
--- a/sdk/src/org/opends/sdk/ldif/AbstractLDIFReader.java
+++ b/sdk/src/org/opends/sdk/ldif/AbstractLDIFReader.java
@@ -29,8 +29,8 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.BufferedReader;
import java.io.IOException;
@@ -41,10 +41,9 @@
import java.util.LinkedList;
import java.util.List;
-import com.sun.opends.sdk.util.Message;
-import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.*;
-import org.opends.sdk.util.*;
+
+import com.sun.opends.sdk.util.*;
diff --git a/sdk/src/org/opends/sdk/ldif/AbstractLDIFWriter.java b/sdk/src/org/opends/sdk/ldif/AbstractLDIFWriter.java
index ecf3c1f..e976eb4 100644
--- a/sdk/src/org/opends/sdk/ldif/AbstractLDIFWriter.java
+++ b/sdk/src/org/opends/sdk/ldif/AbstractLDIFWriter.java
@@ -36,11 +36,12 @@
import java.util.List;
import java.util.regex.Pattern;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.Base64;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Base64;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java b/sdk/src/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java
index fd63d88..7f428ac 100644
--- a/sdk/src/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java
+++ b/sdk/src/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java
@@ -39,7 +39,8 @@
import org.opends.sdk.requests.DeleteRequest;
import org.opends.sdk.requests.ModifyDNRequest;
import org.opends.sdk.requests.ModifyRequest;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/ldif/ConnectionEntryWriter.java b/sdk/src/org/opends/sdk/ldif/ConnectionEntryWriter.java
index 71acb1d..6d29ce4 100644
--- a/sdk/src/org/opends/sdk/ldif/ConnectionEntryWriter.java
+++ b/sdk/src/org/opends/sdk/ldif/ConnectionEntryWriter.java
@@ -35,7 +35,8 @@
import org.opends.sdk.Entry;
import org.opends.sdk.ErrorResultException;
import org.opends.sdk.ErrorResultIOException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/ldif/LDIFChangeRecordReader.java b/sdk/src/org/opends/sdk/ldif/LDIFChangeRecordReader.java
index 20a693b..8b59d0e 100644
--- a/sdk/src/org/opends/sdk/ldif/LDIFChangeRecordReader.java
+++ b/sdk/src/org/opends/sdk/ldif/LDIFChangeRecordReader.java
@@ -29,8 +29,8 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.IOException;
import java.io.InputStream;
@@ -43,11 +43,10 @@
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.requests.Requests;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/ldif/LDIFChangeRecordWriter.java b/sdk/src/org/opends/sdk/ldif/LDIFChangeRecordWriter.java
index 2346a23..188af66 100644
--- a/sdk/src/org/opends/sdk/ldif/LDIFChangeRecordWriter.java
+++ b/sdk/src/org/opends/sdk/ldif/LDIFChangeRecordWriter.java
@@ -39,8 +39,8 @@
import org.opends.sdk.requests.ModifyDNRequest;
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java b/sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java
index dbdd7ff..d78a35f 100644
--- a/sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java
+++ b/sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.io.IOException;
import java.io.InputStream;
@@ -38,10 +38,10 @@
import org.opends.sdk.*;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/ldif/LDIFEntryWriter.java b/sdk/src/org/opends/sdk/ldif/LDIFEntryWriter.java
index eed7202..ff70ec7 100644
--- a/sdk/src/org/opends/sdk/ldif/LDIFEntryWriter.java
+++ b/sdk/src/org/opends/sdk/ldif/LDIFEntryWriter.java
@@ -35,8 +35,8 @@
import org.opends.sdk.*;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/AbstractExtendedRequest.java b/sdk/src/org/opends/sdk/requests/AbstractExtendedRequest.java
index 9422db6..2be54f2 100644
--- a/sdk/src/org/opends/sdk/requests/AbstractExtendedRequest.java
+++ b/sdk/src/org/opends/sdk/requests/AbstractExtendedRequest.java
@@ -29,9 +29,9 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.extensions.ExtendedOperation;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/requests/AbstractRequestImpl.java b/sdk/src/org/opends/sdk/requests/AbstractRequestImpl.java
index 6cdfea1..a799c53 100644
--- a/sdk/src/org/opends/sdk/requests/AbstractRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/AbstractRequestImpl.java
@@ -34,7 +34,8 @@
import java.util.List;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/AbstractUnmodifiableRequestImpl.java b/sdk/src/org/opends/sdk/requests/AbstractUnmodifiableRequestImpl.java
index 98132db..b63783b 100644
--- a/sdk/src/org/opends/sdk/requests/AbstractUnmodifiableRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/AbstractUnmodifiableRequestImpl.java
@@ -30,7 +30,8 @@
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.Iterables;
+
+import com.sun.opends.sdk.util.Iterables;
diff --git a/sdk/src/org/opends/sdk/requests/AddRequest.java b/sdk/src/org/opends/sdk/requests/AddRequest.java
index 6629aae..5d50d3d 100644
--- a/sdk/src/org/opends/sdk/requests/AddRequest.java
+++ b/sdk/src/org/opends/sdk/requests/AddRequest.java
@@ -31,16 +31,13 @@
import java.util.Collection;
-import org.opends.sdk.Attribute;
-import org.opends.sdk.AttributeDescription;
-import org.opends.sdk.DN;
-import org.opends.sdk.Entry;
+import org.opends.sdk.*;
import org.opends.sdk.controls.Control;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.schema.ObjectClass;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/requests/AddRequestImpl.java b/sdk/src/org/opends/sdk/requests/AddRequestImpl.java
index 91cb043..ad7d00d 100644
--- a/sdk/src/org/opends/sdk/requests/AddRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/AddRequestImpl.java
@@ -31,14 +31,11 @@
import java.util.Collection;
-import org.opends.sdk.Attribute;
-import org.opends.sdk.AttributeDescription;
-import org.opends.sdk.DN;
-import org.opends.sdk.Entry;
+import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.schema.ObjectClass;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/requests/CompareRequest.java b/sdk/src/org/opends/sdk/requests/CompareRequest.java
index 0172292..96d6b57 100644
--- a/sdk/src/org/opends/sdk/requests/CompareRequest.java
+++ b/sdk/src/org/opends/sdk/requests/CompareRequest.java
@@ -30,10 +30,11 @@
import org.opends.sdk.AttributeDescription;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/requests/CompareRequestImpl.java b/sdk/src/org/opends/sdk/requests/CompareRequestImpl.java
index 1bd45ce..6fa8610 100644
--- a/sdk/src/org/opends/sdk/requests/CompareRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/CompareRequestImpl.java
@@ -30,10 +30,11 @@
import org.opends.sdk.AttributeDescription;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/DeleteRequest.java b/sdk/src/org/opends/sdk/requests/DeleteRequest.java
index 0425c6f..eeed2cb 100644
--- a/sdk/src/org/opends/sdk/requests/DeleteRequest.java
+++ b/sdk/src/org/opends/sdk/requests/DeleteRequest.java
@@ -33,7 +33,8 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/requests/DeleteRequestImpl.java b/sdk/src/org/opends/sdk/requests/DeleteRequestImpl.java
index b9e4646..7d01a74 100644
--- a/sdk/src/org/opends/sdk/requests/DeleteRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/DeleteRequestImpl.java
@@ -31,8 +31,9 @@
import org.opends.sdk.DN;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/ExtendedRequest.java b/sdk/src/org/opends/sdk/requests/ExtendedRequest.java
index 26cd503..24a0d18 100644
--- a/sdk/src/org/opends/sdk/requests/ExtendedRequest.java
+++ b/sdk/src/org/opends/sdk/requests/ExtendedRequest.java
@@ -29,11 +29,11 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;
import org.opends.sdk.extensions.ExtendedOperation;
import org.opends.sdk.extensions.StartTLSRequest;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/requests/GenericBindRequest.java b/sdk/src/org/opends/sdk/requests/GenericBindRequest.java
index c8e1ab5..f5f8a56 100644
--- a/sdk/src/org/opends/sdk/requests/GenericBindRequest.java
+++ b/sdk/src/org/opends/sdk/requests/GenericBindRequest.java
@@ -29,11 +29,12 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/requests/GenericBindRequestImpl.java b/sdk/src/org/opends/sdk/requests/GenericBindRequestImpl.java
index dbaa10e..fe1b677 100644
--- a/sdk/src/org/opends/sdk/requests/GenericBindRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/GenericBindRequestImpl.java
@@ -29,10 +29,11 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/GenericExtendedRequest.java b/sdk/src/org/opends/sdk/requests/GenericExtendedRequest.java
index ff027f8..e361b9c 100644
--- a/sdk/src/org/opends/sdk/requests/GenericExtendedRequest.java
+++ b/sdk/src/org/opends/sdk/requests/GenericExtendedRequest.java
@@ -29,11 +29,11 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
import org.opends.sdk.extensions.ExtendedOperation;
import org.opends.sdk.responses.GenericExtendedResult;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/requests/GenericExtendedRequestImpl.java b/sdk/src/org/opends/sdk/requests/GenericExtendedRequestImpl.java
index b7e396e..f48fdc4 100644
--- a/sdk/src/org/opends/sdk/requests/GenericExtendedRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/GenericExtendedRequestImpl.java
@@ -29,13 +29,14 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.extensions.ExtendedOperation;
import org.opends.sdk.responses.GenericExtendedResult;
import org.opends.sdk.responses.Responses;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/ModifyDNRequest.java b/sdk/src/org/opends/sdk/requests/ModifyDNRequest.java
index 9afbe3f..9dbf6f1 100644
--- a/sdk/src/org/opends/sdk/requests/ModifyDNRequest.java
+++ b/sdk/src/org/opends/sdk/requests/ModifyDNRequest.java
@@ -34,7 +34,8 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/requests/ModifyDNRequestImpl.java b/sdk/src/org/opends/sdk/requests/ModifyDNRequestImpl.java
index ae7a5be..0e70e22 100644
--- a/sdk/src/org/opends/sdk/requests/ModifyDNRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/ModifyDNRequestImpl.java
@@ -32,8 +32,9 @@
import org.opends.sdk.DN;
import org.opends.sdk.RDN;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/ModifyRequest.java b/sdk/src/org/opends/sdk/requests/ModifyRequest.java
index 3aa9fa9..a7b1467 100644
--- a/sdk/src/org/opends/sdk/requests/ModifyRequest.java
+++ b/sdk/src/org/opends/sdk/requests/ModifyRequest.java
@@ -29,14 +29,15 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.Change;
import org.opends.sdk.DN;
import org.opends.sdk.ModificationType;
import org.opends.sdk.controls.Control;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/requests/ModifyRequestImpl.java b/sdk/src/org/opends/sdk/requests/ModifyRequestImpl.java
index 0f7f6be..3757be5 100644
--- a/sdk/src/org/opends/sdk/requests/ModifyRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/ModifyRequestImpl.java
@@ -32,13 +32,14 @@
import java.util.LinkedList;
import java.util.List;
-import org.opends.sdk.LinkedAttribute;
import org.opends.sdk.Change;
import org.opends.sdk.DN;
+import org.opends.sdk.LinkedAttribute;
import org.opends.sdk.ModificationType;
import org.opends.sdk.ldif.ChangeRecordVisitor;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/Requests.java b/sdk/src/org/opends/sdk/requests/Requests.java
index b6185b8..c39a863 100644
--- a/sdk/src/org/opends/sdk/requests/Requests.java
+++ b/sdk/src/org/opends/sdk/requests/Requests.java
@@ -29,16 +29,15 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.LDIFChangeRecordReader;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/SearchRequest.java b/sdk/src/org/opends/sdk/requests/SearchRequest.java
index 5e60480..ad82c99 100644
--- a/sdk/src/org/opends/sdk/requests/SearchRequest.java
+++ b/sdk/src/org/opends/sdk/requests/SearchRequest.java
@@ -36,7 +36,8 @@
import org.opends.sdk.Filter;
import org.opends.sdk.SearchScope;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/requests/SearchRequestImpl.java b/sdk/src/org/opends/sdk/requests/SearchRequestImpl.java
index 5c83d43..14ce602 100644
--- a/sdk/src/org/opends/sdk/requests/SearchRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/SearchRequestImpl.java
@@ -37,8 +37,9 @@
import org.opends.sdk.DereferenceAliasesPolicy;
import org.opends.sdk.Filter;
import org.opends.sdk.SearchScope;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/requests/SimpleBindRequest.java b/sdk/src/org/opends/sdk/requests/SimpleBindRequest.java
index 8b0c07d..48b6779 100644
--- a/sdk/src/org/opends/sdk/requests/SimpleBindRequest.java
+++ b/sdk/src/org/opends/sdk/requests/SimpleBindRequest.java
@@ -29,10 +29,11 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/requests/SimpleBindRequestImpl.java b/sdk/src/org/opends/sdk/requests/SimpleBindRequestImpl.java
index 5856934..a8a6f51 100644
--- a/sdk/src/org/opends/sdk/requests/SimpleBindRequestImpl.java
+++ b/sdk/src/org/opends/sdk/requests/SimpleBindRequestImpl.java
@@ -29,10 +29,11 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/responses/AbstractExtendedResult.java b/sdk/src/org/opends/sdk/responses/AbstractExtendedResult.java
index be40ebf..dde1dd1 100644
--- a/sdk/src/org/opends/sdk/responses/AbstractExtendedResult.java
+++ b/sdk/src/org/opends/sdk/responses/AbstractExtendedResult.java
@@ -29,8 +29,8 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/AbstractIntermediateResponse.java b/sdk/src/org/opends/sdk/responses/AbstractIntermediateResponse.java
index f2278e8..ff15a22 100644
--- a/sdk/src/org/opends/sdk/responses/AbstractIntermediateResponse.java
+++ b/sdk/src/org/opends/sdk/responses/AbstractIntermediateResponse.java
@@ -29,7 +29,7 @@
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/AbstractResponseImpl.java b/sdk/src/org/opends/sdk/responses/AbstractResponseImpl.java
index 26e74e2..669cddd 100644
--- a/sdk/src/org/opends/sdk/responses/AbstractResponseImpl.java
+++ b/sdk/src/org/opends/sdk/responses/AbstractResponseImpl.java
@@ -34,7 +34,8 @@
import java.util.List;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/responses/AbstractResultImpl.java b/sdk/src/org/opends/sdk/responses/AbstractResultImpl.java
index 33c55f8..b47259b 100644
--- a/sdk/src/org/opends/sdk/responses/AbstractResultImpl.java
+++ b/sdk/src/org/opends/sdk/responses/AbstractResultImpl.java
@@ -33,7 +33,8 @@
import java.util.List;
import org.opends.sdk.ResultCode;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java b/sdk/src/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java
index d2fad61..a39c9cc 100644
--- a/sdk/src/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java
+++ b/sdk/src/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java
@@ -30,7 +30,8 @@
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.Iterables;
+
+import com.sun.opends.sdk.util.Iterables;
diff --git a/sdk/src/org/opends/sdk/responses/BindResult.java b/sdk/src/org/opends/sdk/responses/BindResult.java
index 359ddd7..4555962 100644
--- a/sdk/src/org/opends/sdk/responses/BindResult.java
+++ b/sdk/src/org/opends/sdk/responses/BindResult.java
@@ -29,9 +29,9 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/BindResultImpl.java b/sdk/src/org/opends/sdk/responses/BindResultImpl.java
index df56a42..26110bf 100644
--- a/sdk/src/org/opends/sdk/responses/BindResultImpl.java
+++ b/sdk/src/org/opends/sdk/responses/BindResultImpl.java
@@ -29,8 +29,8 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/ExtendedResult.java b/sdk/src/org/opends/sdk/responses/ExtendedResult.java
index 61ecc35..4cdc79d 100644
--- a/sdk/src/org/opends/sdk/responses/ExtendedResult.java
+++ b/sdk/src/org/opends/sdk/responses/ExtendedResult.java
@@ -29,9 +29,9 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/GenericExtendedResult.java b/sdk/src/org/opends/sdk/responses/GenericExtendedResult.java
index 6e2090b..12dd1fa 100644
--- a/sdk/src/org/opends/sdk/responses/GenericExtendedResult.java
+++ b/sdk/src/org/opends/sdk/responses/GenericExtendedResult.java
@@ -29,9 +29,9 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/GenericExtendedResultImpl.java b/sdk/src/org/opends/sdk/responses/GenericExtendedResultImpl.java
index 98abda5..cdcc2a0 100644
--- a/sdk/src/org/opends/sdk/responses/GenericExtendedResultImpl.java
+++ b/sdk/src/org/opends/sdk/responses/GenericExtendedResultImpl.java
@@ -29,8 +29,8 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/GenericIntermediateResponse.java b/sdk/src/org/opends/sdk/responses/GenericIntermediateResponse.java
index 9ec733e..5eda851 100644
--- a/sdk/src/org/opends/sdk/responses/GenericIntermediateResponse.java
+++ b/sdk/src/org/opends/sdk/responses/GenericIntermediateResponse.java
@@ -29,8 +29,8 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java b/sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
index c5a5bf7..6f6e2a1 100644
--- a/sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
+++ b/sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java
@@ -29,7 +29,7 @@
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/IntermediateResponse.java b/sdk/src/org/opends/sdk/responses/IntermediateResponse.java
index 51d83e9..ce4a051 100644
--- a/sdk/src/org/opends/sdk/responses/IntermediateResponse.java
+++ b/sdk/src/org/opends/sdk/responses/IntermediateResponse.java
@@ -29,8 +29,8 @@
+import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/responses/Responses.java b/sdk/src/org/opends/sdk/responses/Responses.java
index 0ba85e0..beb6175 100644
--- a/sdk/src/org/opends/sdk/responses/Responses.java
+++ b/sdk/src/org/opends/sdk/responses/Responses.java
@@ -29,13 +29,10 @@
-import org.opends.sdk.DN;
-import org.opends.sdk.Entry;
-import org.opends.sdk.ResultCode;
-import org.opends.sdk.SortedEntry;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.Validator;
+import org.opends.sdk.*;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/responses/SearchResultEntry.java b/sdk/src/org/opends/sdk/responses/SearchResultEntry.java
index fb5e755..f5b5320 100644
--- a/sdk/src/org/opends/sdk/responses/SearchResultEntry.java
+++ b/sdk/src/org/opends/sdk/responses/SearchResultEntry.java
@@ -31,14 +31,11 @@
import java.util.Collection;
-import org.opends.sdk.Attribute;
-import org.opends.sdk.AttributeDescription;
-import org.opends.sdk.DN;
-import org.opends.sdk.Entry;
+import org.opends.sdk.*;
import org.opends.sdk.controls.Control;
import org.opends.sdk.schema.ObjectClass;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/responses/SearchResultEntryImpl.java b/sdk/src/org/opends/sdk/responses/SearchResultEntryImpl.java
index 6125343..987d1b4 100644
--- a/sdk/src/org/opends/sdk/responses/SearchResultEntryImpl.java
+++ b/sdk/src/org/opends/sdk/responses/SearchResultEntryImpl.java
@@ -31,13 +31,10 @@
import java.util.Collection;
-import org.opends.sdk.Attribute;
-import org.opends.sdk.AttributeDescription;
-import org.opends.sdk.DN;
-import org.opends.sdk.Entry;
+import org.opends.sdk.*;
import org.opends.sdk.schema.ObjectClass;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/responses/SearchResultReferenceImpl.java b/sdk/src/org/opends/sdk/responses/SearchResultReferenceImpl.java
index fe0edc4..204ef9c 100644
--- a/sdk/src/org/opends/sdk/responses/SearchResultReferenceImpl.java
+++ b/sdk/src/org/opends/sdk/responses/SearchResultReferenceImpl.java
@@ -32,7 +32,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java b/sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java
index 1226691..e9e0ca0 100644
--- a/sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java
+++ b/sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.io.IOException;
diff --git a/sdk/src/org/opends/sdk/sasl/AnonymousSASLBindRequest.java b/sdk/src/org/opends/sdk/sasl/AnonymousSASLBindRequest.java
index 2688391..58dbff6 100644
--- a/sdk/src/org/opends/sdk/sasl/AnonymousSASLBindRequest.java
+++ b/sdk/src/org/opends/sdk/sasl/AnonymousSASLBindRequest.java
@@ -30,8 +30,9 @@
import javax.security.sasl.SaslException;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+import org.opends.sdk.ByteString;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/sasl/CRAMMD5SASLBindRequest.java b/sdk/src/org/opends/sdk/sasl/CRAMMD5SASLBindRequest.java
index 15b3569..0b3e57f 100644
--- a/sdk/src/org/opends/sdk/sasl/CRAMMD5SASLBindRequest.java
+++ b/sdk/src/org/opends/sdk/sasl/CRAMMD5SASLBindRequest.java
@@ -34,9 +34,10 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/sasl/DigestMD5SASLBindRequest.java b/sdk/src/org/opends/sdk/sasl/DigestMD5SASLBindRequest.java
index a4afac7..fc76f26 100644
--- a/sdk/src/org/opends/sdk/sasl/DigestMD5SASLBindRequest.java
+++ b/sdk/src/org/opends/sdk/sasl/DigestMD5SASLBindRequest.java
@@ -38,9 +38,10 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/sasl/ExternalSASLBindRequest.java b/sdk/src/org/opends/sdk/sasl/ExternalSASLBindRequest.java
index ed0aedd..82a11f6 100644
--- a/sdk/src/org/opends/sdk/sasl/ExternalSASLBindRequest.java
+++ b/sdk/src/org/opends/sdk/sasl/ExternalSASLBindRequest.java
@@ -31,9 +31,10 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/sasl/GSSAPISASLBindRequest.java b/sdk/src/org/opends/sdk/sasl/GSSAPISASLBindRequest.java
index 556adb2..a716cc5 100644
--- a/sdk/src/org/opends/sdk/sasl/GSSAPISASLBindRequest.java
+++ b/sdk/src/org/opends/sdk/sasl/GSSAPISASLBindRequest.java
@@ -29,8 +29,8 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -43,11 +43,11 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
import com.sun.security.auth.callback.TextCallbackHandler;
import com.sun.security.auth.module.Krb5LoginModule;
diff --git a/sdk/src/org/opends/sdk/sasl/GenericSASLBindRequest.java b/sdk/src/org/opends/sdk/sasl/GenericSASLBindRequest.java
index f151dd2..1c1102b 100644
--- a/sdk/src/org/opends/sdk/sasl/GenericSASLBindRequest.java
+++ b/sdk/src/org/opends/sdk/sasl/GenericSASLBindRequest.java
@@ -31,8 +31,9 @@
import javax.security.sasl.SaslException;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+import org.opends.sdk.ByteString;
+
+import com.sun.opends.sdk.util.Validator;
/**
diff --git a/sdk/src/org/opends/sdk/sasl/PlainSASLBindRequest.java b/sdk/src/org/opends/sdk/sasl/PlainSASLBindRequest.java
index 3e50421..dcfbec4 100644
--- a/sdk/src/org/opends/sdk/sasl/PlainSASLBindRequest.java
+++ b/sdk/src/org/opends/sdk/sasl/PlainSASLBindRequest.java
@@ -34,9 +34,10 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/sasl/SASLContext.java b/sdk/src/org/opends/sdk/sasl/SASLContext.java
index d870bfd..3f666a0 100644
--- a/sdk/src/org/opends/sdk/sasl/SASLContext.java
+++ b/sdk/src/org/opends/sdk/sasl/SASLContext.java
@@ -31,7 +31,7 @@
import javax.security.sasl.SaslException;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/AbstractMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/AbstractMatchingRuleImpl.java
index d5fb099..1ab9e61 100644
--- a/sdk/src/org/opends/sdk/schema/AbstractMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/AbstractMatchingRuleImpl.java
@@ -32,9 +32,9 @@
import java.util.List;
import org.opends.sdk.Assertion;
+import org.opends.sdk.ByteSequence;
import org.opends.sdk.ConditionResult;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java
index 7ebcbd7..2746636 100644
--- a/sdk/src/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java
@@ -28,11 +28,7 @@
-import org.opends.sdk.Assertion;
-import org.opends.sdk.ConditionResult;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.*;
diff --git a/sdk/src/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java
index 23f4257..e5d2add 100644
--- a/sdk/src/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java
@@ -28,18 +28,15 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.LinkedList;
import java.util.List;
-import org.opends.sdk.Assertion;
-import org.opends.sdk.ConditionResult;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import org.opends.sdk.*;
+
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/AttributeType.java b/sdk/src/org/opends/sdk/schema/AttributeType.java
index c124e43..2a78c2b 100644
--- a/sdk/src/org/opends/sdk/schema/AttributeType.java
+++ b/sdk/src/org/opends/sdk/schema/AttributeType.java
@@ -29,8 +29,8 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.SCHEMA_PROPERTY_APPROX_RULE;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.Collections;
import java.util.Iterator;
@@ -38,8 +38,8 @@
import java.util.Map;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java
index a90500b..52753fd 100644
--- a/sdk/src/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java
@@ -29,19 +29,16 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ATTRTYPE_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ATTRTYPE_EXPECTED_OPEN_PARENTHESIS;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ATTRTYPE_INVALID_ATTRIBUTE_USAGE;
-import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_ATTRIBUTE_TYPE_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java
index 621b334..b54cceb 100644
--- a/sdk/src/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java
index dfd961b..02b73db 100644
--- a/sdk/src/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java
@@ -29,14 +29,14 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.EMR_AUTH_PASSWORD_EXACT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_AUTH_PASSWORD_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/BinarySyntaxImpl.java b/sdk/src/org/opends/sdk/schema/BinarySyntaxImpl.java
index c0aa2a9..746528a 100644
--- a/sdk/src/org/opends/sdk/schema/BinarySyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/BinarySyntaxImpl.java
@@ -29,12 +29,11 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_BINARY_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java
index 9dd4994..8d4149e 100644
--- a/sdk/src/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java
@@ -28,14 +28,13 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_INVALID_BIT;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT;
+import static com.sun.opends.sdk.messages.Messages.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/BitStringSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/BitStringSyntaxImpl.java
index 777ae2e..7bd0639 100644
--- a/sdk/src/org/opends/sdk/schema/BitStringSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/BitStringSyntaxImpl.java
@@ -29,14 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_INVALID_BIT;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT;
-import static org.opends.sdk.schema.SchemaConstants.EMR_BIT_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_BIT_STRING_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java
index 31b328e..f50ad09 100644
--- a/sdk/src/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java
@@ -28,11 +28,11 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN;
+import static com.sun.opends.sdk.messages.Messages.*;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/BooleanSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/BooleanSyntaxImpl.java
index 81120db..b5f5575 100644
--- a/sdk/src/org/opends/sdk/schema/BooleanSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/BooleanSyntaxImpl.java
@@ -29,12 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN;
-import static org.opends.sdk.schema.SchemaConstants.EMR_BOOLEAN_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_BOOLEAN_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java
index bda2301..5a9297c 100644
--- a/sdk/src/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java
index ccdaddf..15a9923 100644
--- a/sdk/src/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java
@@ -28,15 +28,14 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
-import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java
index d70bf5b..0dd36c4 100644
--- a/sdk/src/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java
@@ -28,15 +28,14 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
-import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java
index f22d047..85f64cb 100644
--- a/sdk/src/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java
index 33d53c8..faf9556 100644
--- a/sdk/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java
@@ -28,13 +28,11 @@
-import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java
index b5b9bc8..249f028 100644
--- a/sdk/src/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
index b0c094c..bd0ac38 100644
--- a/sdk/src/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
@@ -28,15 +28,14 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
index b278a85..67337cc 100644
--- a/sdk/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
@@ -28,15 +28,14 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
index e0018bd..6dc1544 100644
--- a/sdk/src/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
index f95f1d4..f349095 100644
--- a/sdk/src/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
@@ -28,13 +28,13 @@
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StringPrepProfile;
+
+import com.sun.opends.sdk.util.StringPrepProfile;
diff --git a/sdk/src/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java
index 292e17c..baea2ad 100644
--- a/sdk/src/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java
index 0ed9ce0..d243560 100644
--- a/sdk/src/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java
@@ -28,13 +28,13 @@
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StringPrepProfile;
+
+import com.sun.opends.sdk.util.StringPrepProfile;
diff --git a/sdk/src/org/opends/sdk/schema/CertificateListSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/CertificateListSyntaxImpl.java
index 98ecb08..a98212d 100644
--- a/sdk/src/org/opends/sdk/schema/CertificateListSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CertificateListSyntaxImpl.java
@@ -29,12 +29,11 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_CERTLIST_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/CertificatePairSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/CertificatePairSyntaxImpl.java
index 1ff653f..1eaf6da 100644
--- a/sdk/src/org/opends/sdk/schema/CertificatePairSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CertificatePairSyntaxImpl.java
@@ -29,12 +29,11 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_CERTPAIR_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/CertificateSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/CertificateSyntaxImpl.java
index faddbf0..0ec6f61 100644
--- a/sdk/src/org/opends/sdk/schema/CertificateSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CertificateSyntaxImpl.java
@@ -29,12 +29,11 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_CERTIFICATE_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/ConflictingSchemaElementException.java b/sdk/src/org/opends/sdk/schema/ConflictingSchemaElementException.java
index a9aa81e..8b6acb6 100644
--- a/sdk/src/org/opends/sdk/schema/ConflictingSchemaElementException.java
+++ b/sdk/src/org/opends/sdk/schema/ConflictingSchemaElementException.java
@@ -29,8 +29,8 @@
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/schema/CountryStringSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/CountryStringSyntaxImpl.java
index 72efb88..8c20e5b 100644
--- a/sdk/src/org/opends/sdk/schema/CountryStringSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/CountryStringSyntaxImpl.java
@@ -29,13 +29,13 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_COUNTRY_STRING_NOT_PRINTABLE;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;
-import static org.opends.sdk.util.StaticUtils.toLowerCase;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/DITContentRule.java b/sdk/src/org/opends/sdk/schema/DITContentRule.java
index d53bc94..4c6a38d 100644
--- a/sdk/src/org/opends/sdk/schema/DITContentRule.java
+++ b/sdk/src/org/opends/sdk/schema/DITContentRule.java
@@ -29,12 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.*;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java
index a60a327..48b38c0 100644
--- a/sdk/src/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java
@@ -29,18 +29,16 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DCR_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DCR_EXPECTED_OPEN_PARENTHESIS;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
-import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_DIT_CONTENT_RULE_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/DITStructureRule.java b/sdk/src/org/opends/sdk/schema/DITStructureRule.java
index 6996ae9..8788f06 100644
--- a/sdk/src/org/opends/sdk/schema/DITStructureRule.java
+++ b/sdk/src/org/opends/sdk/schema/DITStructureRule.java
@@ -29,13 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_UNKNOWN_NAME_FORM;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_UNKNOWN_RULE_ID;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.*;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java
index d0e26fd..05edf2c 100644
--- a/sdk/src/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java
@@ -29,19 +29,16 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_EXPECTED_OPEN_PARENTHESIS;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_NO_NAME_FORM;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
-import static org.opends.sdk.schema.SchemaConstants.EMR_INTEGER_FIRST_COMPONENT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_DIT_STRUCTURE_RULE_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java
index 4ee0dab..1392f1b 100644
--- a/sdk/src/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java
@@ -29,16 +29,16 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;
-import static org.opends.sdk.util.StaticUtils.toLowerCase;
import java.util.HashSet;
import java.util.StringTokenizer;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
index e2595f5..58005cc 100644
--- a/sdk/src/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
@@ -28,18 +28,16 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EXPECTED_OPEN_PARENTHESIS;
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
+
+import org.opends.sdk.Assertion;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.Assertion;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java
index 59dfb82..fbd60f0 100644
--- a/sdk/src/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java
@@ -29,11 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DIRECTORYSTRING_INVALID_ZEROLENGTH_VALUE;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java
index 3a3d64f..ac8667d 100644
--- a/sdk/src/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java
@@ -33,9 +33,8 @@
import org.opends.sdk.*;
import org.opends.sdk.RDN.AVA;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java
index 46b75f9..8177bc8 100644
--- a/sdk/src/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java
@@ -29,14 +29,13 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_DN_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_DN_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
-import com.sun.opends.sdk.util.MessageBuilder;
+import org.opends.sdk.ByteSequence;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.MessageBuilder;
diff --git a/sdk/src/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
index f365576..875b0f5 100644
--- a/sdk/src/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
@@ -28,9 +28,10 @@
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java
index f8de2fb..89fbe2c 100644
--- a/sdk/src/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java
@@ -29,16 +29,15 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_ENHANCED_GUIDE_NAME;
-import static org.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/EnumOrderingMatchingRule.java b/sdk/src/org/opends/sdk/schema/EnumOrderingMatchingRule.java
index 4b2f6ef..ab0446a 100644
--- a/sdk/src/org/opends/sdk/schema/EnumOrderingMatchingRule.java
+++ b/sdk/src/org/opends/sdk/schema/EnumOrderingMatchingRule.java
@@ -28,12 +28,13 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_INVALID_VALUE;
+import static com.sun.opends.sdk.messages.Messages.*;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/EnumSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/EnumSyntaxImpl.java
index 5677039..2d7bb76 100644
--- a/sdk/src/org/opends/sdk/schema/EnumSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/EnumSyntaxImpl.java
@@ -29,24 +29,20 @@
-import static com.sun.opends.sdk.util.Messages.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;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OID_GENERIC_ENUM;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java
index 469ef63..f72ee01 100644
--- a/sdk/src/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java
@@ -28,11 +28,7 @@
-import org.opends.sdk.Assertion;
-import org.opends.sdk.ConditionResult;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.*;
diff --git a/sdk/src/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java
index ab18a27..d2f81ba 100644
--- a/sdk/src/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java
@@ -29,20 +29,15 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_FAXNUMBER_EMPTY;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_FAXNUMBER_END_WITH_DOLLAR;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_FAXNUMBER_ILLEGAL_PARAMETER;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_FAXNUMBER_NOT_PRINTABLE;
-import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_FAXNUMBER_NAME;
-import static org.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.HashSet;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/FaxSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/FaxSyntaxImpl.java
index f7e594e..5fd190e 100644
--- a/sdk/src/org/opends/sdk/schema/FaxSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/FaxSyntaxImpl.java
@@ -29,12 +29,11 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_FAX_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java
index a153074..2cdf4a6 100644
--- a/sdk/src/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java
@@ -28,9 +28,9 @@
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java
index dc7c429..b7e6c42 100644
--- a/sdk/src/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java
@@ -28,9 +28,9 @@
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java
index 00a3add..c239c24 100644
--- a/sdk/src/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java
@@ -29,18 +29,19 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
+
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/schema/GuideSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/GuideSyntaxImpl.java
index 50d80b3..2fd5085 100644
--- a/sdk/src/org/opends/sdk/schema/GuideSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/GuideSyntaxImpl.java
@@ -29,16 +29,15 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_GUIDE_NAME;
-import static org.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/IA5StringSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/IA5StringSyntaxImpl.java
index b103c25..87e29bc 100644
--- a/sdk/src/org/opends/sdk/schema/IA5StringSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/IA5StringSyntaxImpl.java
@@ -29,12 +29,13 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java
index e6770da..c176c21 100644
--- a/sdk/src/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java
@@ -28,13 +28,14 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ILLEGAL_INTEGER;
+import static com.sun.opends.sdk.messages.Messages.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
index 0c9c357..0f6dd25 100644
--- a/sdk/src/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
@@ -28,18 +28,13 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EXPECTED_OPEN_PARENTHESIS;
-import static com.sun.opends.sdk.util.Messages.ERR_EMR_INTFIRSTCOMP_FIRST_COMPONENT_NOT_INT;
+import static com.sun.opends.sdk.messages.Messages.*;
+
+import org.opends.sdk.*;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.Assertion;
-import org.opends.sdk.ConditionResult;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java
index 1d16369..1f56b1a 100644
--- a/sdk/src/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java
@@ -28,13 +28,14 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ILLEGAL_INTEGER;
+import static com.sun.opends.sdk.messages.Messages.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/schema/IntegerSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/IntegerSyntaxImpl.java
index 5ecd7a1..6dd658b 100644
--- a/sdk/src/org/opends/sdk/schema/IntegerSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/IntegerSyntaxImpl.java
@@ -29,17 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_INTEGER_DASH_NEEDS_VALUE;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_INTEGER_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_INTEGER_INVALID_CHARACTER;
-import static org.opends.sdk.schema.SchemaConstants.EMR_INTEGER_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_INTEGER_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_EXACT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_INTEGER_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/JPEGSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/JPEGSyntaxImpl.java
index 0454deb..a532f69 100644
--- a/sdk/src/org/opends/sdk/schema/JPEGSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/JPEGSyntaxImpl.java
@@ -29,12 +29,11 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_JPEG_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java
index 1b4b4e3..c258116 100644
--- a/sdk/src/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java
@@ -28,15 +28,9 @@
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.Assertion;
-import org.opends.sdk.ConditionResult;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.*;
diff --git a/sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
index 5971f1d..62f7948 100644
--- a/sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
@@ -29,19 +29,19 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_LDAP_SYNTAX_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.*;
import java.util.regex.Pattern;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
+
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/MatchingRule.java b/sdk/src/org/opends/sdk/schema/MatchingRule.java
index e97ffe6..e351fdf 100644
--- a/sdk/src/org/opends/sdk/schema/MatchingRule.java
+++ b/sdk/src/org/opends/sdk/schema/MatchingRule.java
@@ -29,20 +29,20 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MR_UNKNOWN_SYNTAX;
-import static com.sun.opends.sdk.util.Messages.WARN_MATCHING_RULE_NOT_IMPLEMENTED;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import com.sun.opends.sdk.util.Message;
import org.opends.sdk.Assertion;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/MatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/MatchingRuleImpl.java
index 04e6e12..bd946b4 100644
--- a/sdk/src/org/opends/sdk/schema/MatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/MatchingRuleImpl.java
@@ -32,9 +32,9 @@
import java.util.List;
import org.opends.sdk.Assertion;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java
index fb551b6..7abc2f4 100644
--- a/sdk/src/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java
@@ -29,19 +29,16 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MR_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MR_EXPECTED_OPEN_PARENTHESIS;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MR_NO_SYNTAX;
-import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_MATCHING_RULE_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/MatchingRuleUse.java b/sdk/src/org/opends/sdk/schema/MatchingRuleUse.java
index cf3b078..7592a4f 100644
--- a/sdk/src/org/opends/sdk/schema/MatchingRuleUse.java
+++ b/sdk/src/org/opends/sdk/schema/MatchingRuleUse.java
@@ -29,13 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_MATCHING_RULE;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.*;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java
index e9f4bdf..df74407 100644
--- a/sdk/src/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java
@@ -29,21 +29,18 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_EXPECTED_OPEN_PARENTHESIS;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_NO_ATTR;
-import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_MATCHING_RULE_USE_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.Set;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
+
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java
index be1b686..907b047 100644
--- a/sdk/src/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java
@@ -29,16 +29,14 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAMEANDUID_ILLEGAL_BINARY_DIGIT;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAMEANDUID_INVALID_DN;
-import static org.opends.sdk.schema.SchemaConstants.EMR_UNIQUE_MEMBER_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_NAME_AND_OPTIONAL_UID_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
-import com.sun.opends.sdk.util.MessageBuilder;
+import org.opends.sdk.ByteSequence;
import org.opends.sdk.DN;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.MessageBuilder;
diff --git a/sdk/src/org/opends/sdk/schema/NameForm.java b/sdk/src/org/opends/sdk/schema/NameForm.java
index dbe1bbd..4e55133 100644
--- a/sdk/src/org/opends/sdk/schema/NameForm.java
+++ b/sdk/src/org/opends/sdk/schema/NameForm.java
@@ -29,15 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAME_FORM_STRUCTURAL_CLASS_NOT_STRUCTURAL;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_OPTIONAL_ATTR;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_REQUIRED_ATTR;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_STRUCTURAL_CLASS;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.*;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/NameFormSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/NameFormSyntaxImpl.java
index 9745316..e483aa3 100644
--- a/sdk/src/org/opends/sdk/schema/NameFormSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/NameFormSyntaxImpl.java
@@ -29,18 +29,18 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_NAME_FORM_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.Set;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
+
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java
index e803010..6b3d71b9 100644
--- a/sdk/src/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java
index 0b342fc..a6aa797 100644
--- a/sdk/src/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java
index 216aaef..6637ec0 100644
--- a/sdk/src/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/NumericStringSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/NumericStringSyntaxImpl.java
index 5726466..a10bc17 100644
--- a/sdk/src/org/opends/sdk/schema/NumericStringSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/NumericStringSyntaxImpl.java
@@ -29,16 +29,13 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NUMERIC_STRING_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR;
-import static org.opends.sdk.schema.SchemaConstants.EMR_NUMERIC_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_NUMERIC_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_EXACT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_NUMERIC_STRING_NAME;
-import static org.opends.sdk.util.StaticUtils.isDigit;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/OIDSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/OIDSyntaxImpl.java
index 55f1ef6..9e29530 100644
--- a/sdk/src/org/opends/sdk/schema/OIDSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/OIDSyntaxImpl.java
@@ -29,14 +29,13 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_OID_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_OID_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/ObjectClass.java b/sdk/src/org/opends/sdk/schema/ObjectClass.java
index de50379..bc8f031 100644
--- a/sdk/src/org/opends/sdk/schema/ObjectClass.java
+++ b/sdk/src/org/opends/sdk/schema/ObjectClass.java
@@ -29,15 +29,13 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.EXTENSIBLE_OBJECT_OBJECTCLASS_NAME;
-import static org.opends.sdk.schema.SchemaConstants.EXTENSIBLE_OBJECT_OBJECTCLASS_OID;
-import static org.opends.sdk.schema.SchemaConstants.TOP_OBJECTCLASS_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.*;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/ObjectClassSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/ObjectClassSyntaxImpl.java
index 81e551e..646eec1 100644
--- a/sdk/src/org/opends/sdk/schema/ObjectClassSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/ObjectClassSyntaxImpl.java
@@ -29,18 +29,16 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_OBJECTCLASS_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_OPEN_PARENTHESIS;
-import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_OBJECTCLASS_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
index b006242..a18c600 100644
--- a/sdk/src/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
@@ -28,13 +28,10 @@
-import org.opends.sdk.Assertion;
-import org.opends.sdk.ConditionResult;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
+import org.opends.sdk.*;
+
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
index 5fffa6f..c03e3bf 100644
--- a/sdk/src/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
@@ -28,15 +28,15 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EXPECTED_OPEN_PARENTHESIS;
+import static com.sun.opends.sdk.messages.Messages.*;
+
+import org.opends.sdk.Assertion;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.Assertion;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.SubstringReader;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java
index 83ab9e2..69e38b9 100644
--- a/sdk/src/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java
@@ -28,8 +28,8 @@
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java
index 1c08743..f2d2de0 100644
--- a/sdk/src/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java
@@ -28,8 +28,8 @@
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java
index 57d7354..11bef77 100644
--- a/sdk/src/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java
@@ -28,8 +28,8 @@
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/OctetStringSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/OctetStringSyntaxImpl.java
index f04baec..08af743 100644
--- a/sdk/src/org/opends/sdk/schema/OctetStringSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/OctetStringSyntaxImpl.java
@@ -29,12 +29,11 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_OCTET_STRING_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java
index f21559b..6b818ff 100644
--- a/sdk/src/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java
@@ -29,13 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_LIST_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_LIST_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_OTHER_MAILBOX_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/PostalAddressSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/PostalAddressSyntaxImpl.java
index 4a24587..b2ac842 100644
--- a/sdk/src/org/opends/sdk/schema/PostalAddressSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/PostalAddressSyntaxImpl.java
@@ -29,12 +29,11 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_POSTAL_ADDRESS_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java
index 5c80c28..c109036 100644
--- a/sdk/src/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java
index de7e862..0025b47 100644
--- a/sdk/src/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java
@@ -31,8 +31,9 @@
import static org.opends.sdk.schema.SchemaConstants.*;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/PrintableStringSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/PrintableStringSyntaxImpl.java
index 941ec23..56ec225 100644
--- a/sdk/src/org/opends/sdk/schema/PrintableStringSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/PrintableStringSyntaxImpl.java
@@ -29,12 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_PRINTABLE_STRING_EMPTY_VALUE;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_PRINTABLE_STRING_ILLEGAL_CHARACTER;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java
index c21b29e..e7a02d0 100644
--- a/sdk/src/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java
@@ -28,12 +28,10 @@
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java
index 2ccef37..08733f1 100644
--- a/sdk/src/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java
@@ -31,8 +31,9 @@
import static org.opends.sdk.schema.SchemaConstants.*;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/RegexSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/RegexSyntaxImpl.java
index 0c6ff8b..3b23c33 100644
--- a/sdk/src/org/opends/sdk/schema/RegexSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/RegexSyntaxImpl.java
@@ -29,18 +29,16 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_LDAPSYNTAX_REGEX_INVALID_VALUE;
-import static org.opends.sdk.schema.SchemaConstants.AMR_DOUBLE_METAPHONE_OID;
-import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.regex.Pattern;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/Schema.java b/sdk/src/org/opends/sdk/schema/Schema.java
index b99fe16..bca449f 100644
--- a/sdk/src/org/opends/sdk/schema/Schema.java
+++ b/sdk/src/org/opends/sdk/schema/Schema.java
@@ -28,17 +28,20 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
-import com.sun.opends.sdk.util.Message;
import org.opends.sdk.*;
import org.opends.sdk.responses.SearchResultEntry;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/SchemaBuilder.java b/sdk/src/org/opends/sdk/schema/SchemaBuilder.java
index bfe949c..434954e 100644
--- a/sdk/src/org/opends/sdk/schema/SchemaBuilder.java
+++ b/sdk/src/org/opends/sdk/schema/SchemaBuilder.java
@@ -29,19 +29,15 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.*;
import java.util.regex.Pattern;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.StaticUtils;
-import org.opends.sdk.util.SubstringReader;
-import org.opends.sdk.util.Validator;
-import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.*;
diff --git a/sdk/src/org/opends/sdk/schema/SchemaConstants.java b/sdk/src/org/opends/sdk/schema/SchemaConstants.java
index e97549b..accba25 100644
--- a/sdk/src/org/opends/sdk/schema/SchemaConstants.java
+++ b/sdk/src/org/opends/sdk/schema/SchemaConstants.java
@@ -28,7 +28,7 @@
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/SchemaElement.java b/sdk/src/org/opends/sdk/schema/SchemaElement.java
index b7ce0bf..1e3e135 100644
--- a/sdk/src/org/opends/sdk/schema/SchemaElement.java
+++ b/sdk/src/org/opends/sdk/schema/SchemaElement.java
@@ -33,7 +33,7 @@
import java.util.Map;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/SchemaException.java b/sdk/src/org/opends/sdk/schema/SchemaException.java
index 6058ebb..f7fd18a 100644
--- a/sdk/src/org/opends/sdk/schema/SchemaException.java
+++ b/sdk/src/org/opends/sdk/schema/SchemaException.java
@@ -29,8 +29,8 @@
+import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.LocalizableException;
diff --git a/sdk/src/org/opends/sdk/schema/SchemaNotFoundException.java b/sdk/src/org/opends/sdk/schema/SchemaNotFoundException.java
index d85b79b..1adc140 100644
--- a/sdk/src/org/opends/sdk/schema/SchemaNotFoundException.java
+++ b/sdk/src/org/opends/sdk/schema/SchemaNotFoundException.java
@@ -29,8 +29,8 @@
+import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.LocalizableException;
diff --git a/sdk/src/org/opends/sdk/schema/SchemaUtils.java b/sdk/src/org/opends/sdk/schema/SchemaUtils.java
index 2ff2602..52664ee 100644
--- a/sdk/src/org/opends/sdk/schema/SchemaUtils.java
+++ b/sdk/src/org/opends/sdk/schema/SchemaUtils.java
@@ -28,15 +28,15 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.isAlpha;
-import static org.opends.sdk.util.StaticUtils.isDigit;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.util.*;
-import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.SubstringReader;
+
+import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.SubstringReader;
diff --git a/sdk/src/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java
index 5f901be..ad8e52c 100644
--- a/sdk/src/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java
@@ -29,14 +29,12 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_SUBSTRING_ASSERTION_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+import org.opends.sdk.ByteSequence;
+
+import com.sun.opends.sdk.messages.Messages;
import com.sun.opends.sdk.util.MessageBuilder;
-import com.sun.opends.sdk.util.Messages;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java
index aa981c3..a42d8d0 100644
--- a/sdk/src/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java
@@ -29,12 +29,11 @@
-import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_SUPPORTED_ALGORITHM_NAME;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/Syntax.java b/sdk/src/org/opends/sdk/schema/Syntax.java
index b50edb0..b8e02ee 100644
--- a/sdk/src/org/opends/sdk/schema/Syntax.java
+++ b/sdk/src/org/opends/sdk/schema/Syntax.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.Collections;
import java.util.Iterator;
@@ -37,10 +37,11 @@
import java.util.Map;
import java.util.regex.Pattern;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/schema/SyntaxImpl.java b/sdk/src/org/opends/sdk/schema/SyntaxImpl.java
index 5946af3..8b906be 100644
--- a/sdk/src/org/opends/sdk/schema/SyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/SyntaxImpl.java
@@ -29,8 +29,9 @@
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java
index 9c33ad0..7f356b4 100644
--- a/sdk/src/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java
@@ -28,9 +28,10 @@
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java
index 3d52f58..9fe1104 100644
--- a/sdk/src/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java
@@ -28,9 +28,10 @@
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java
index a63cf85..b3ec50f 100644
--- a/sdk/src/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java
@@ -29,18 +29,14 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEPHONE_EMPTY;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEPHONE_ILLEGAL_CHAR;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEPHONE_NO_DIGITS;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEPHONE_NO_PLUS;
-import static org.opends.sdk.schema.SchemaConstants.EMR_TELEPHONE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_TELEPHONE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_TELEPHONE_NAME;
-import static org.opends.sdk.util.StaticUtils.isDigit;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java
index e21fcef..36cf3ba 100644
--- a/sdk/src/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java
@@ -29,16 +29,14 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_TELETEX_TERM_ID_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
import java.util.HashSet;
+import org.opends.sdk.ByteSequence;
+
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/TelexNumberSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/TelexNumberSyntaxImpl.java
index fdb9150..0074134 100644
--- a/sdk/src/org/opends/sdk/schema/TelexNumberSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/TelexNumberSyntaxImpl.java
@@ -29,17 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEX_TOO_SHORT;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEX_TRUNCATED;
-import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_TELEX_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/UTCTimeSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/UTCTimeSyntaxImpl.java
index 92f349f..384a208 100644
--- a/sdk/src/org/opends/sdk/schema/UTCTimeSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/UTCTimeSyntaxImpl.java
@@ -29,18 +29,19 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
+
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java
index d58f489..842842b 100644
--- a/sdk/src/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java
@@ -28,14 +28,13 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH;
+import static com.sun.opends.sdk.messages.Messages.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java
index d0c6176..0297abe 100644
--- a/sdk/src/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java
@@ -28,14 +28,13 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH;
+import static com.sun.opends.sdk.messages.Messages.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/UUIDSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/UUIDSyntaxImpl.java
index cecb143..37d3dcc 100644
--- a/sdk/src/org/opends/sdk/schema/UUIDSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/UUIDSyntaxImpl.java
@@ -29,13 +29,12 @@
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX;
-import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_UUID_NAME;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java
index ec975da..5dbf775 100644
--- a/sdk/src/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java
@@ -28,8 +28,8 @@
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
diff --git a/sdk/src/org/opends/sdk/schema/UnknownSchemaElementException.java b/sdk/src/org/opends/sdk/schema/UnknownSchemaElementException.java
index 6ee9020..7b4243a 100644
--- a/sdk/src/org/opends/sdk/schema/UnknownSchemaElementException.java
+++ b/sdk/src/org/opends/sdk/schema/UnknownSchemaElementException.java
@@ -29,8 +29,8 @@
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
diff --git a/sdk/src/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java
index 43c03cd..f92decf 100644
--- a/sdk/src/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java
@@ -28,10 +28,11 @@
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
+
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/schema/UserPasswordSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/UserPasswordSyntaxImpl.java
index 9ec601f..3dfa84e2 100644
--- a/sdk/src/org/opends/sdk/schema/UserPasswordSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/UserPasswordSyntaxImpl.java
@@ -29,18 +29,15 @@
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_USERPW_NO_CLOSING_BRACE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_USERPW_NO_OPENING_BRACE;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_USERPW_NO_SCHEME;
-import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_USERPW_NO_VALUE;
-import static org.opends.sdk.schema.SchemaConstants.EMR_USER_PASSWORD_EXACT_OID;
-import static org.opends.sdk.schema.SchemaConstants.SYNTAX_USER_PASSWORD_NAME;
-import static org.opends.sdk.util.StaticUtils.toLowerCase;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
+import static org.opends.sdk.schema.SchemaConstants.*;
+
+import org.opends.sdk.ByteSequence;
+import org.opends.sdk.DecodeException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
diff --git a/sdk/src/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java b/sdk/src/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java
index 077a7c3..1879d35 100644
--- a/sdk/src/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java
+++ b/sdk/src/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java
@@ -28,15 +28,9 @@
-import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
-import static org.opends.sdk.util.StringPrepProfile.TRIM;
-import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
+import static com.sun.opends.sdk.util.StringPrepProfile.*;
-import org.opends.sdk.Assertion;
-import org.opends.sdk.ConditionResult;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.util.ByteSequence;
-import org.opends.sdk.util.ByteString;
+import org.opends.sdk.*;
diff --git a/sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java b/sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java
index ee4e80b..1b1b93d 100755
--- a/sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java
+++ b/sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java
@@ -31,13 +31,7 @@
import java.net.Socket;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.UnrecoverableKeyException;
+import java.security.*;
import java.security.cert.X509Certificate;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -47,7 +41,7 @@
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509KeyManager;
-import org.opends.sdk.util.Platform;
+import com.sun.opends.sdk.util.Platform;
diff --git a/sdk/src/org/opends/sdk/tools/Argument.java b/sdk/src/org/opends/sdk/tools/Argument.java
index 77df584..d45d080 100644
--- a/sdk/src/org/opends/sdk/tools/Argument.java
+++ b/sdk/src/org/opends/sdk/tools/Argument.java
@@ -28,8 +28,8 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.util.Iterator;
import java.util.LinkedList;
diff --git a/sdk/src/org/opends/sdk/tools/ArgumentException.java b/sdk/src/org/opends/sdk/tools/ArgumentException.java
index 83d0bea..8ab872b 100644
--- a/sdk/src/org/opends/sdk/tools/ArgumentException.java
+++ b/sdk/src/org/opends/sdk/tools/ArgumentException.java
@@ -28,8 +28,8 @@
+import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
-import org.opends.sdk.util.LocalizableException;
diff --git a/sdk/src/org/opends/sdk/tools/ArgumentParser.java b/sdk/src/org/opends/sdk/tools/ArgumentParser.java
index fc43397..43ea641 100644
--- a/sdk/src/org/opends/sdk/tools/ArgumentParser.java
+++ b/sdk/src/org/opends/sdk/tools/ArgumentParser.java
@@ -28,10 +28,10 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
-import static org.opends.sdk.util.StaticUtils.*;
import java.io.File;
import java.io.FileInputStream;
diff --git a/sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java b/sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java
index af94487..ca4008b 100644
--- a/sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java
+++ b/sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import java.io.File;
@@ -55,12 +55,11 @@
import org.opends.sdk.requests.BindRequest;
import org.opends.sdk.requests.Requests;
import org.opends.sdk.sasl.*;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.SSLUtils;
-import org.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.SSLUtils;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/tools/BooleanArgument.java b/sdk/src/org/opends/sdk/tools/BooleanArgument.java
index 08ffa8e..1b21806 100644
--- a/sdk/src/org/opends/sdk/tools/BooleanArgument.java
+++ b/sdk/src/org/opends/sdk/tools/BooleanArgument.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.Messages.ERR_BOOLEANARG_NO_VALUE_ALLOWED;
+import static com.sun.opends.sdk.messages.Messages.*;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
diff --git a/sdk/src/org/opends/sdk/tools/CLIException.java b/sdk/src/org/opends/sdk/tools/CLIException.java
index 093b70c..8f6f3f7 100755
--- a/sdk/src/org/opends/sdk/tools/CLIException.java
+++ b/sdk/src/org/opends/sdk/tools/CLIException.java
@@ -28,10 +28,10 @@
-import org.opends.sdk.util.LocalizableException;
+import com.sun.opends.sdk.messages.Messages;
+import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
-import com.sun.opends.sdk.util.Messages;
diff --git a/sdk/src/org/opends/sdk/tools/ConsoleApplication.java b/sdk/src/org/opends/sdk/tools/ConsoleApplication.java
index 56f7e42..35a2ac7 100755
--- a/sdk/src/org/opends/sdk/tools/ConsoleApplication.java
+++ b/sdk/src/org/opends/sdk/tools/ConsoleApplication.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.Utils.*;
import java.io.*;
diff --git a/sdk/src/org/opends/sdk/tools/DataSource.java b/sdk/src/org/opends/sdk/tools/DataSource.java
index b469d97..9a40b8a 100644
--- a/sdk/src/org/opends/sdk/tools/DataSource.java
+++ b/sdk/src/org/opends/sdk/tools/DataSource.java
@@ -34,7 +34,7 @@
import java.io.IOException;
import java.util.*;
-import org.opends.sdk.util.Validator;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/tools/FileBasedArgument.java b/sdk/src/org/opends/sdk/tools/FileBasedArgument.java
index da51150..7079bb4 100644
--- a/sdk/src/org/opends/sdk/tools/FileBasedArgument.java
+++ b/sdk/src/org/opends/sdk/tools/FileBasedArgument.java
@@ -28,8 +28,8 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.BufferedReader;
import java.io.File;
diff --git a/sdk/src/org/opends/sdk/tools/IntegerArgument.java b/sdk/src/org/opends/sdk/tools/IntegerArgument.java
index 5c60bb8..fe259b8 100644
--- a/sdk/src/org/opends/sdk/tools/IntegerArgument.java
+++ b/sdk/src/org/opends/sdk/tools/IntegerArgument.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
diff --git a/sdk/src/org/opends/sdk/tools/LDAPCompare.java b/sdk/src/org/opends/sdk/tools/LDAPCompare.java
index 7460f49..2335a2b 100644
--- a/sdk/src/org/opends/sdk/tools/LDAPCompare.java
+++ b/sdk/src/org/opends/sdk/tools/LDAPCompare.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
@@ -44,10 +44,9 @@
import org.opends.sdk.requests.Requests;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.Base64;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.Base64;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/tools/LDAPModify.java b/sdk/src/org/opends/sdk/tools/LDAPModify.java
index b22651d..cd51316 100644
--- a/sdk/src/org/opends/sdk/tools/LDAPModify.java
+++ b/sdk/src/org/opends/sdk/tools/LDAPModify.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
@@ -50,8 +50,8 @@
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java b/sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java
index 0befe1f..6afa574 100644
--- a/sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java
+++ b/sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java
@@ -1,20 +1,16 @@
package org.opends.sdk.tools;
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
import java.io.InputStream;
import java.io.OutputStream;
-import org.opends.sdk.Connection;
-import org.opends.sdk.DecodeException;
-import org.opends.sdk.ErrorResultException;
-import org.opends.sdk.ResultCode;
+import org.opends.sdk.*;
import org.opends.sdk.controls.Control;
import org.opends.sdk.extensions.PasswordModifyRequest;
import org.opends.sdk.extensions.PasswordModifyResult;
-import org.opends.sdk.util.ByteString;
import com.sun.opends.sdk.util.Message;
diff --git a/sdk/src/org/opends/sdk/tools/LDAPSearch.java b/sdk/src/org/opends/sdk/tools/LDAPSearch.java
index fc17aa8..78c4680 100644
--- a/sdk/src/org/opends/sdk/tools/LDAPSearch.java
+++ b/sdk/src/org/opends/sdk/tools/LDAPSearch.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import java.io.*;
@@ -48,11 +48,10 @@
import org.opends.sdk.responses.Result;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.responses.SearchResultReference;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.LocalizedIllegalArgumentException;
-import org.opends.sdk.util.StaticUtils;
+import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
diff --git a/sdk/src/org/opends/sdk/tools/ModRate.java b/sdk/src/org/opends/sdk/tools/ModRate.java
index 5fc365e..7878db6 100644
--- a/sdk/src/org/opends/sdk/tools/ModRate.java
+++ b/sdk/src/org/opends/sdk/tools/ModRate.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
diff --git a/sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java b/sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java
index 4152c6f..57629d2 100644
--- a/sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java
+++ b/sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java
@@ -28,7 +28,7 @@
-import static com.sun.opends.sdk.util.Messages.ERR_MCARG_VALUE_NOT_ALLOWED;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.util.Collection;
diff --git a/sdk/src/org/opends/sdk/tools/PromptingTrustManager.java b/sdk/src/org/opends/sdk/tools/PromptingTrustManager.java
index b2690ee..2fa188b 100644
--- a/sdk/src/org/opends/sdk/tools/PromptingTrustManager.java
+++ b/sdk/src/org/opends/sdk/tools/PromptingTrustManager.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import java.io.File;
import java.io.FileInputStream;
@@ -49,10 +49,9 @@
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
-import org.opends.sdk.util.Validator;
-
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/tools/SearchRate.java b/sdk/src/org/opends/sdk/tools/SearchRate.java
index eba12e5..65de1d1 100644
--- a/sdk/src/org/opends/sdk/tools/SearchRate.java
+++ b/sdk/src/org/opends/sdk/tools/SearchRate.java
@@ -29,7 +29,7 @@
-import static com.sun.opends.sdk.util.Messages.*;
+import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
diff --git a/sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java b/sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java
index cf137ad..15dc826 100644
--- a/sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java
+++ b/sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java
@@ -50,7 +50,8 @@
import org.opends.sdk.DN;
import org.opends.sdk.schema.Schema;
-import org.opends.sdk.util.Validator;
+
+import com.sun.opends.sdk.util.Validator;
diff --git a/sdk/src/org/opends/sdk/tools/Utils.java b/sdk/src/org/opends/sdk/tools/Utils.java
index d6a090f..54fde42 100644
--- a/sdk/src/org/opends/sdk/tools/Utils.java
+++ b/sdk/src/org/opends/sdk/tools/Utils.java
@@ -28,24 +28,24 @@
-import static com.sun.opends.sdk.util.Messages.*;
-import static org.opends.sdk.util.StaticUtils.*;
+import static com.sun.opends.sdk.messages.Messages.*;
+import static com.sun.opends.sdk.util.StaticUtils.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.StringTokenizer;
+import org.opends.sdk.ByteString;
import org.opends.sdk.Connection;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ErrorResultException;
import org.opends.sdk.AuthenticatedConnectionFactory.AuthenticatedConnection;
import org.opends.sdk.controls.*;
import org.opends.sdk.responses.BindResult;
-import org.opends.sdk.util.ByteString;
-import org.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Message;
+import com.sun.opends.sdk.util.StaticUtils;
--
Gitblit v1.10.0