From 70467a0277fe4ac8fdbc477f3d2756f1724dc503 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 10 Oct 2013 14:55:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-175: Decouple OpenDJ LDAP SDK from Grizzly
---
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java | 1
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java | 18
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java | 0
opendj-sdk/opendj3/pom.xml | 2
opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml | 9
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FutureResult.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java | 84 +++
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPMessageHandler.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java | 15
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java | 9
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnsupportedMessageException.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/pom.xml | 124 +++++
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java | 2
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPCompareFutureResultImpl.java | 25
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPClientFilter.java | 10
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/ConnectionState.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java | 31 +
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java | 7
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/javadoc/overview.html | 112 +++++
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Reader.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java | 34 +
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-rest2ldap/pom.xml | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriterTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java | 0
opendj-sdk/opendj3/opendj-core/pom.xml | 137 ++++++
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/LDAPConnectionFactoryTestCase.java | 20
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java | 108 ++++
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReaderTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPReader.java | 57 --
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java | 16
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/AbstractLDAPMessageHandler.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPSearchFutureResultImpl.java | 37 +
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPListener.java | 86 +++
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPServerFilter.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/ConnectionStateTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnexpectedResponseException.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/TimeoutChecker.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Writer.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPFutureResultImpl.java | 32 +
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Validator.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/LDAPListenerTestCase.java | 21
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java | 11
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1InputStreamReaderTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java | 7
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPExtendedFutureResultImpl.java | 45 +
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/TimeSource.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java | 23
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java | 0
opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml | 57 +-
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Function.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/AbstractLDAPFutureResultImpl.java | 55 ++
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPBindFutureResultImpl.java | 30 +
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListener.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPWriter.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnexpectedRequestException.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java | 0
opendj-sdk/opendj3/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider | 2
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java | 0
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java | 0
614 files changed, 1,072 insertions(+), 199 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-core/pom.xml b/opendj-sdk/opendj3/opendj-core/pom.xml
new file mode 100644
index 0000000..e7b2b95
--- /dev/null
+++ b/opendj-sdk/opendj3/opendj-core/pom.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! If applicable, add the following below this CDDL HEADER, with the
+ ! fields enclosed by brackets "[]" replaced with your own identifying
+ ! information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Copyright 2011-2012 ForgeRock AS
+ !
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>opendj-project</artifactId>
+ <groupId>org.forgerock.opendj</groupId>
+ <version>2.7.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>opendj-core</artifactId>
+ <name>OpenDJ LDAP SDK</name>
+ <description>
+ This module includes OpenDJ core APIs for implementing LDAP Directory
+ client and server applications.
+ </description>
+ <packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-build-tools</artifactId>
+ <version>${forgerockBuildToolsVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <opendj.osgi.import>
+ com.sun.security.auth*;resolution:=optional,
+ *
+ </opendj.osgi.import>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-messages</goal>
+ </goals>
+ <configuration>
+ <messageFiles>
+ <messageFile>com/forgerock/opendj/ldap/core.properties</messageFile>
+ </messageFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>cim</report>
+ <report>distribution-management</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ConnectionState.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/ConnectionState.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ConnectionState.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/ConnectionState.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
similarity index 96%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
index fd13cba..18dec0e 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
@@ -55,6 +55,11 @@
import org.forgerock.opendj.ldap.responses.ExtendedResult;
import org.forgerock.opendj.ldap.responses.Responses;
import org.forgerock.opendj.ldap.responses.Result;
+import org.forgerock.opendj.ldap.spi.AbstractLDAPFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPCompareFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPExtendedFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPSearchFutureResultImpl;
import com.forgerock.opendj.util.CompletedFutureResult;
import com.forgerock.opendj.util.Validator;
@@ -92,7 +97,7 @@
* {@inheritDoc}
*/
@Override
- BindResult newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
+ protected BindResult newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
final Throwable cause) {
return Responses.newBindResult(resultCode).setDiagnosticMessage(diagnosticMessage)
.setCause(cause);
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
similarity index 86%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
index 77e1572..2cc8f4c 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS.
*/
package com.forgerock.opendj.ldap;
@@ -33,14 +34,22 @@
import java.util.LinkedList;
import java.util.List;
+import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.opendj.asn1.ASN1Reader;
import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.ldap.Attribute;
+import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.DecodeOptions;
+import org.forgerock.opendj.ldap.Entry;
import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.FilterVisitor;
+import org.forgerock.opendj.ldap.responses.Responses;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
+import org.forgerock.opendj.ldap.schema.Schema;
/**
* Common LDAP utility methods which may be used when implementing new controls
@@ -292,7 +301,56 @@
*/
public static SearchResultEntry decodeSearchResultEntry(final ASN1Reader reader,
final DecodeOptions options) throws IOException {
- return LDAPReader.decodeEntry(reader, options);
+ Entry entry;
+
+ reader.readStartSequence(OP_TYPE_SEARCH_RESULT_ENTRY);
+ try {
+ final String dnString = reader.readOctetStringAsString();
+ final Schema schema = options.getSchemaResolver().resolveSchema(dnString);
+ DN dn;
+ try {
+ dn = DN.valueOf(dnString, schema);
+ } catch (final LocalizedIllegalArgumentException e) {
+ throw DecodeException.error(e.getMessageObject());
+ }
+
+ entry = options.getEntryFactory().newEntry(dn);
+ reader.readStartSequence();
+ try {
+ while (reader.hasNextElement()) {
+ reader.readStartSequence();
+ try {
+ final String ads = reader.readOctetStringAsString();
+ AttributeDescription ad;
+ try {
+ ad = AttributeDescription.valueOf(ads, schema);
+ } catch (final LocalizedIllegalArgumentException e) {
+ throw DecodeException.error(e.getMessageObject());
+ }
+
+ final Attribute attribute = options.getAttributeFactory().newAttribute(ad);
+
+ reader.readStartSet();
+ try {
+ while (reader.hasNextElement()) {
+ attribute.add(reader.readOctetString());
+ }
+ entry.addAttribute(attribute);
+ } finally {
+ reader.readEndSet();
+ }
+ } finally {
+ reader.readEndSequence();
+ }
+ }
+ } finally {
+ reader.readEndSequence();
+ }
+ } finally {
+ reader.readEndSequence();
+ }
+
+ return Responses.newSearchResultEntry(entry);
}
/**
@@ -334,10 +392,32 @@
public static ASN1Writer encodeSearchResultEntry(final ASN1Writer writer,
final SearchResultEntry entry) throws IOException {
// FIXME: this should include Controls.
- LDAPWriter.encodeEntry(writer, entry);
+ writer.writeStartSequence(OP_TYPE_SEARCH_RESULT_ENTRY);
+ writer.writeOctetString(entry.getName().toString());
+
+ writer.writeStartSequence();
+ for (final Attribute attr : entry.getAllAttributes()) {
+ encodeAttribute(writer, attr);
+ }
+ writer.writeEndSequence();
+ writer.writeEndSequence();
return writer;
}
+ private static void encodeAttribute(final ASN1Writer writer, final Attribute attribute)
+ throws IOException {
+ writer.writeStartSequence();
+ writer.writeOctetString(attribute.getAttributeDescriptionAsString());
+
+ writer.writeStartSet();
+ for (final ByteString value : attribute) {
+ writer.writeOctetString(value);
+ }
+ writer.writeEndSequence();
+
+ writer.writeEndSequence();
+ }
+
// Decodes an and filter.
private static Filter decodeAndFilter(final ASN1Reader reader) throws IOException {
Filter filter;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java
index efa811d..af6e668 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS.
*/
package com.forgerock.opendj.util;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Collections2.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Collections2.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Iterables.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Iterables.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Iterators.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Iterators.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Predicate.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Predicate.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/SubstringReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/SubstringReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/TimeSource.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/TimeSource.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/TimeSource.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/TimeSource.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Validator.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Validator.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/Validator.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/Validator.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/util/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1Reader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Reader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1Reader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Reader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1Writer.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Writer.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1Writer.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Writer.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AVA.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Assertion.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Assertion.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Attribute.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Attribute.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Attributes.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Attributes.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticatedConnectionFactory.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Base64.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Base64.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ByteString.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ByteString.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Connection.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Connection.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Connections.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Connections.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/DN.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/DecodeException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/DecodeException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Entries.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Entries.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Entry.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Entry.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ErrorResultIOException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Filter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Filter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Function.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Function.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Function.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Function.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Functions.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Functions.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FutureResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FutureResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/FutureResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/FutureResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListenerOptions.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPOptions.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Matcher.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Matcher.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Modification.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Modification.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ModificationType.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ModificationType.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RDN.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RDN.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ReferralException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ReferralException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestContext.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestContext.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ResultCode.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ResultCode.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultHandler.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RootDSE.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RootDSE.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SearchScope.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SearchScope.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SortKey.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/SortKey.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/Control.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/Control.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/Request.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/Request.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/Response.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/Response.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/Result.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/Result.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DefaultSchema.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EqualLengthApproximateMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/AbstractLDAPFutureResultImpl.java
similarity index 73%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/AbstractLDAPFutureResultImpl.java
index 0558a48..8c60cfd 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/AbstractLDAPFutureResultImpl.java
@@ -25,7 +25,7 @@
* Portions copyright 2011-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package org.forgerock.opendj.ldap.spi;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.ErrorResultException;
@@ -44,7 +44,7 @@
* @param <S>
* The type of result returned by this future.
*/
-abstract class AbstractLDAPFutureResultImpl<S extends Result>
+public abstract class AbstractLDAPFutureResultImpl<S extends Result>
extends AsynchronousFutureResult<S, ResultHandler<? super S>>
implements IntermediateResponseHandler {
private final Connection connection;
@@ -52,7 +52,20 @@
private IntermediateResponseHandler intermediateResponseHandler;
private volatile long timestamp;
- AbstractLDAPFutureResultImpl(final int requestID,
+ /**
+ * Creates a future result.
+ *
+ * @param requestID
+ * identifier of the request
+ * @param resultHandler
+ * handler that consumes the result
+ * @param intermediateResponseHandler
+ * handler that consumes intermediate responses from extended
+ * operations
+ * @param connection
+ * the connection to directory server
+ */
+ protected AbstractLDAPFutureResultImpl(final int requestID,
final ResultHandler<? super S> resultHandler,
final IntermediateResponseHandler intermediateResponseHandler,
final Connection connection) {
@@ -107,20 +120,46 @@
super.toString(sb);
}
- final void adaptErrorResult(final Result result) {
+ /**
+ * Sets the result associated to this future as an error result.
+ *
+ * @param result result of an operation
+ */
+ public final void adaptErrorResult(final Result result) {
final S errorResult =
newErrorResult(result.getResultCode(), result.getDiagnosticMessage(), result
.getCause());
setResultOrError(errorResult);
}
- final long getTimestamp() {
+ /**
+ * Returns the creation time of this future.
+ *
+ * @return the timestamp indicating creation time of this future
+ */
+ public final long getTimestamp() {
return timestamp;
}
- abstract S newErrorResult(ResultCode resultCode, String diagnosticMessage, Throwable cause);
+ /**
+ * Create a new error result.
+ *
+ * @param resultCode
+ * operation result code
+ * @param diagnosticMessage
+ * message associated to the error
+ * @param cause
+ * cause of the error
+ * @return the error result
+ */
+ protected abstract S newErrorResult(ResultCode resultCode, String diagnosticMessage, Throwable cause);
- final void setResultOrError(final S result) {
+ /**
+ * Sets the result associated to this future.
+ *
+ * @param result the result of operation
+ */
+ public final void setResultOrError(final S result) {
if (result.getResultCode().isExceptional()) {
handleErrorResult(ErrorResultException.newErrorResult(result));
} else {
@@ -141,7 +180,7 @@
* @return {@code true} if this request should be canceled once the timeout
* period expires.
*/
- boolean checkForTimeout() {
+ public boolean checkForTimeout() {
return true;
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPBindFutureResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPBindFutureResultImpl.java
similarity index 71%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPBindFutureResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPBindFutureResultImpl.java
index e8309ce..3aa3a52 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPBindFutureResultImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPBindFutureResultImpl.java
@@ -25,7 +25,7 @@
* Portions copyright 2011 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package org.forgerock.opendj.ldap.spi;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
@@ -38,10 +38,25 @@
/**
* Bind result future implementation.
*/
-final class LDAPBindFutureResultImpl extends AbstractLDAPFutureResultImpl<BindResult> {
+public final class LDAPBindFutureResultImpl extends AbstractLDAPFutureResultImpl<BindResult> {
private final BindClient bindClient;
- LDAPBindFutureResultImpl(final int requestID, final BindClient bindClient,
+ /**
+ * Creates an bind future result.
+ *
+ * @param requestID
+ * identifier of the request
+ * @param bindClient
+ * client that binds to the server
+ * @param resultHandler
+ * handler that consumes result of bind
+ * @param intermediateResponseHandler
+ * handler that consumes intermediate responses from extended
+ * operations
+ * @param connection
+ * the connection to directory server
+ */
+ public LDAPBindFutureResultImpl(final int requestID, final BindClient bindClient,
final ResultHandler<? super BindResult> resultHandler,
final IntermediateResponseHandler intermediateResponseHandler,
final Connection connection) {
@@ -68,7 +83,12 @@
return sb.toString();
}
- BindClient getBindClient() {
+ /**
+ * Returns the client.
+ *
+ * @return the bind client
+ */
+ public BindClient getBindClient() {
return bindClient;
}
@@ -76,7 +96,7 @@
* {@inheritDoc}
*/
@Override
- BindResult newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
+ protected BindResult newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
final Throwable cause) {
return Responses.newBindResult(resultCode).setDiagnosticMessage(diagnosticMessage)
.setCause(cause);
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPCompareFutureResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPCompareFutureResultImpl.java
similarity index 71%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPCompareFutureResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPCompareFutureResultImpl.java
index 8242731..209215b 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPCompareFutureResultImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPCompareFutureResultImpl.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package org.forgerock.opendj.ldap.spi;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
@@ -38,10 +38,25 @@
/**
* Compare result future implementation.
*/
-final class LDAPCompareFutureResultImpl extends AbstractLDAPFutureResultImpl<CompareResult> {
+public final class LDAPCompareFutureResultImpl extends AbstractLDAPFutureResultImpl<CompareResult> {
private final CompareRequest request;
- LDAPCompareFutureResultImpl(final int requestID, final CompareRequest request,
+ /**
+ * Creates a compare future result.
+ *
+ * @param requestID
+ * identifier of the request
+ * @param request
+ * compare request
+ * @param resultHandler
+ * handler that consumes compare result
+ * @param intermediateResponseHandler
+ * handler that consumes intermediate responses from extended
+ * operations
+ * @param connection
+ * the connection to directory server
+ */
+ public LDAPCompareFutureResultImpl(final int requestID, final CompareRequest request,
final ResultHandler<? super CompareResult> resultHandler,
final IntermediateResponseHandler intermediateResponseHandler,
final Connection connection) {
@@ -68,7 +83,7 @@
* {@inheritDoc}
*/
@Override
- CompareResult newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
+ protected CompareResult newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
final Throwable cause) {
return Responses.newCompareResult(resultCode).setDiagnosticMessage(diagnosticMessage)
.setCause(cause);
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPExtendedFutureResultImpl.java
similarity index 65%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPExtendedFutureResultImpl.java
index 7dfe521..545a00a 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPExtendedFutureResultImpl.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package org.forgerock.opendj.ldap.spi;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.DecodeException;
@@ -43,11 +43,26 @@
* @param <R>
* The type of result returned by this future.
*/
-final class LDAPExtendedFutureResultImpl<R extends ExtendedResult> extends
+public final class LDAPExtendedFutureResultImpl<R extends ExtendedResult> extends
AbstractLDAPFutureResultImpl<R> {
private final ExtendedRequest<R> request;
- LDAPExtendedFutureResultImpl(final int requestID, final ExtendedRequest<R> request,
+ /**
+ * Creates an extended future result.
+ *
+ * @param requestID
+ * identifier of the request
+ * @param request
+ * extended request
+ * @param resultHandler
+ * handler that consumes result
+ * @param intermediateResponseHandler
+ * handler that consumes intermediate responses from extended
+ * operations
+ * @param connection
+ * the connection to directory server
+ */
+ public LDAPExtendedFutureResultImpl(final int requestID, final ExtendedRequest<R> request,
final ResultHandler<? super R> resultHandler,
final IntermediateResponseHandler intermediateResponseHandler,
final Connection connection) {
@@ -74,11 +89,27 @@
return !request.getOID().equals(StartTLSExtendedRequest.OID);
}
- R decodeResult(final ExtendedResult result, final DecodeOptions options) throws DecodeException {
+ /**
+ * Decode an extended result.
+ *
+ * @param result
+ * extended result to decode
+ * @param options
+ * decoding options
+ * @return the decoded extended result
+ * @throws DecodeException
+ * if a problem occurs during decoding
+ */
+ public R decodeResult(final ExtendedResult result, final DecodeOptions options) throws DecodeException {
return request.getResultDecoder().decodeExtendedResult(result, options);
}
- ExtendedRequest<R> getRequest() {
+ /**
+ * Returns the extended request.
+ *
+ * @return the extended request
+ */
+ public ExtendedRequest<R> getRequest() {
return request;
}
@@ -86,7 +117,7 @@
* {@inheritDoc}
*/
@Override
- R newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
+ protected R newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
final Throwable cause) {
return request.getResultDecoder().newExtendedErrorResult(resultCode, "", diagnosticMessage);
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPFutureResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPFutureResultImpl.java
similarity index 69%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPFutureResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPFutureResultImpl.java
index 522ae61..75a40de 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPFutureResultImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPFutureResultImpl.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package org.forgerock.opendj.ldap.spi;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
@@ -38,10 +38,25 @@
/**
* Result future implementation.
*/
-final class LDAPFutureResultImpl extends AbstractLDAPFutureResultImpl<Result> {
+public final class LDAPFutureResultImpl extends AbstractLDAPFutureResultImpl<Result> {
private final Request request;
- LDAPFutureResultImpl(final int requestID, final Request request,
+ /**
+ * Creates a future result.
+ *
+ * @param requestID
+ * identifier of the request
+ * @param request
+ * the request sent to server
+ * @param resultHandler
+ * handler that consumes the result
+ * @param intermediateResponseHandler
+ * handler that consumes intermediate responses from extended
+ * operations
+ * @param connection
+ * the connection to directory server
+ */
+ public LDAPFutureResultImpl(final int requestID, final Request request,
final ResultHandler<? super Result> resultHandler,
final IntermediateResponseHandler intermediateResponseHandler,
final Connection connection) {
@@ -60,7 +75,12 @@
return sb.toString();
}
- Request getRequest() {
+ /**
+ * Returns the initial request.
+ *
+ * @return the request
+ */
+ public Request getRequest() {
return request;
}
@@ -68,7 +88,7 @@
* {@inheritDoc}
*/
@Override
- Result newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
+ protected Result newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
final Throwable cause) {
return Responses.newResult(resultCode).setDiagnosticMessage(diagnosticMessage).setCause(
cause);
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPSearchFutureResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPSearchFutureResultImpl.java
similarity index 79%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPSearchFutureResultImpl.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPSearchFutureResultImpl.java
index 39f2022..31828d8 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPSearchFutureResultImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPSearchFutureResultImpl.java
@@ -25,7 +25,7 @@
* Portions copyright 2011-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package org.forgerock.opendj.ldap.spi;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
@@ -41,13 +41,28 @@
/**
* Search result future implementation.
*/
-final class LDAPSearchFutureResultImpl extends AbstractLDAPFutureResultImpl<Result> implements
+public final class LDAPSearchFutureResultImpl extends AbstractLDAPFutureResultImpl<Result> implements
SearchResultHandler {
private SearchResultHandler searchResultHandler;
private final SearchRequest request;
private final boolean isPersistentSearch;
- LDAPSearchFutureResultImpl(final int requestID, final SearchRequest request,
+ /**
+ * Creates a search future result.
+ *
+ * @param requestID
+ * identifier of the request
+ * @param request
+ * search request
+ * @param resultHandler
+ * handler that consumes search result
+ * @param intermediateResponseHandler
+ * handler that consumes intermediate responses from extended
+ * operations
+ * @param connection
+ * the connection to directory server
+ */
+ public LDAPSearchFutureResultImpl(final int requestID, final SearchRequest request,
final SearchResultHandler resultHandler,
final IntermediateResponseHandler intermediateResponseHandler,
final Connection connection) {
@@ -57,6 +72,7 @@
this.isPersistentSearch = request.containsControl(PersistentSearchRequestControl.OID);
}
+ /** {@inheritDoc} */
public boolean handleEntry(final SearchResultEntry entry) {
// FIXME: there's a potential race condition here - the future could
// get cancelled between the isDone() call and the handler
@@ -73,6 +89,7 @@
return true;
}
+ /** {@inheritDoc} */
public boolean handleReference(final SearchResultReference reference) {
// FIXME: there's a potential race condition here - the future could
// get cancelled between the isDone() call and the handler
@@ -100,22 +117,28 @@
return sb.toString();
}
+ /**
+ * Returns the search request.
+ *
+ * @return the search request
+ */
SearchRequest getRequest() {
return request;
}
@Override
- Result newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
+ protected Result newErrorResult(final ResultCode resultCode, final String diagnosticMessage,
final Throwable cause) {
return Responses.newResult(resultCode).setDiagnosticMessage(diagnosticMessage).setCause(
cause);
}
- /**
- * Persistent searches should not time out.
- */
+
+ /** {@inheritDoc} */
@Override
+ public
boolean checkForTimeout() {
+ // Persistent searches should not time out.
return !isPersistentSearch;
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/EntryReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/EntryReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIF.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIF.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/package-info.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core.properties
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_de.properties b/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_de.properties
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_es.properties b/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_es.properties
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties b/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties b/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties b/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties b/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties b/opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java
new file mode 100644
index 0000000..9099ca4
--- /dev/null
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java
@@ -0,0 +1,108 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2013 ForgeRock AS.
+ */
+
+package com.forgerock.opendj.ldap;
+
+import static org.forgerock.opendj.ldap.ErrorResultException.*;
+
+import java.net.SocketAddress;
+
+import org.forgerock.opendj.ldap.Connection;
+import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.FutureResult;
+import org.forgerock.opendj.ldap.LDAPOptions;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.ResultHandler;
+import org.forgerock.opendj.ldap.spi.LDAPConnectionFactoryImpl;
+
+import com.forgerock.opendj.util.AsynchronousFutureResult;
+
+/**
+ * Basic LDAP connection factory implementation to use for tests only.
+ */
+public final class BasicLDAPConnectionFactory implements LDAPConnectionFactoryImpl {
+
+ private final LDAPOptions options;
+ private final SocketAddress socketAddress;
+
+ /**
+ * Creates a new LDAP connection factory which does nothing.
+ *
+ * @param address
+ * The address of the Directory Server to connect to.
+ * @param options
+ * The LDAP connection options to use when creating connections.
+ */
+ public BasicLDAPConnectionFactory(final SocketAddress address, final LDAPOptions options) {
+ this.socketAddress = address;
+ this.options = new LDAPOptions(options);
+ }
+
+ @Override
+ public void close() {
+ // nothing to do
+ }
+
+ @Override
+ public Connection getConnection() throws ErrorResultException {
+ try {
+ return getConnectionAsync(null).get();
+ } catch (final InterruptedException e) {
+ throw newErrorResult(ResultCode.CLIENT_SIDE_USER_CANCELLED, e);
+ }
+ }
+
+ @Override
+ public FutureResult<Connection> getConnectionAsync(
+ final ResultHandler<? super Connection> handler) {
+ final AsynchronousFutureResult<Connection, ResultHandler<? super Connection>> future =
+ new AsynchronousFutureResult<Connection, ResultHandler<? super Connection>>(handler);
+ future.handleResult(org.mockito.Mockito.mock(Connection.class));
+ return future;
+ }
+
+ /**
+ * Returns the address of the Directory Server.
+ *
+ * @return The address of the Directory Server.
+ */
+ public SocketAddress getSocketAddress() {
+ return socketAddress;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append("LDAPConnectionFactory(");
+ builder.append(getSocketAddress().toString());
+ builder.append(')');
+ return builder.toString();
+ }
+
+ LDAPOptions getLDAPOptions() {
+ return options;
+ }
+}
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPListener.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPListener.java
new file mode 100644
index 0000000..48ab9ab
--- /dev/null
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPListener.java
@@ -0,0 +1,86 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2013 ForgeRock AS.
+ */
+
+package com.forgerock.opendj.ldap;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import org.forgerock.opendj.ldap.LDAPClientContext;
+import org.forgerock.opendj.ldap.LDAPListenerOptions;
+import org.forgerock.opendj.ldap.ServerConnectionFactory;
+import org.forgerock.opendj.ldap.spi.LDAPListenerImpl;
+
+/**
+ * Basic LDAP listener implementation to use for tests only.
+ */
+public final class BasicLDAPListener implements LDAPListenerImpl {
+ private final ServerConnectionFactory<LDAPClientContext, Integer> connectionFactory;
+ private final SocketAddress socketAddress;
+
+ /**
+ * Creates a new LDAP listener implementation which does nothing.
+ *
+ * @param address
+ * The address to listen on.
+ * @param factory
+ * The server connection factory can be used to create
+ * server connections.
+ * @param options
+ * The LDAP listener options.
+ * @throws IOException
+ * is never thrown with this do-nothing implementation
+ */
+ public BasicLDAPListener(final SocketAddress address,
+ final ServerConnectionFactory<LDAPClientContext, Integer> factory,
+ final LDAPListenerOptions options) throws IOException {
+ this.connectionFactory = factory;
+ this.socketAddress = address;
+ }
+
+ @Override
+ public void close() {
+ // nothing to do
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public SocketAddress getSocketAddress() {
+ return socketAddress;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append("LDAPListener(");
+ builder.append(getSocketAddress().toString());
+ builder.append(')');
+ return builder.toString();
+ }
+
+ ServerConnectionFactory<LDAPClientContext, Integer> getConnectionFactory() {
+ return connectionFactory;
+ }
+}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyTransportProvider.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java
similarity index 73%
copy from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyTransportProvider.java
copy to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java
index 680dc9d..13f0194 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyTransportProvider.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java
@@ -37,29 +37,25 @@
import org.forgerock.opendj.ldap.spi.TransportProvider;
/**
- * Provides an implementation of {@code LDAPListener} using Grizzly as
- * transport.
+ * Provides an basic implementation of a transport provider doing nothing.
+ * This should be used for tests only.
* <p>
* To be used, this implementation must be declared in the
* provider-configuration file
- * {@code META-INF/services/org.forgerock.opendj.ldap.spi.LDAPListenerProvider}
+ * {@code META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider}
* with this single line:
*
* <pre>
- * com.forgerock.opendj.ldap.GrizzlyLDAPListenerProvider
+ * com.forgerock.opendj.ldap.BasicTransportProvider
* </pre>.
- * <p>
- * To require that this implementation is used, you must set the transport
- * provider to {@code Grizzly} using
- * {@code LDAPListenerOptions#setTransportProvider(String)} method. Otherwise
- * there is no guarantee that this implementation will be used.
*/
-public class GrizzlyTransportProvider implements TransportProvider {
+public class BasicTransportProvider implements TransportProvider {
/** {@inheritDoc} */
@Override
public LDAPConnectionFactoryImpl getLDAPConnectionFactory(SocketAddress address, LDAPOptions options) {
- return new GrizzlyLDAPConnectionFactory(address, options);
+ return new BasicLDAPConnectionFactory(address, options);
+ //return null;
}
/** {@inheritDoc} */
@@ -69,13 +65,14 @@
ServerConnectionFactory<LDAPClientContext, Integer> factory,
LDAPListenerOptions options)
throws IOException {
- return new GrizzlyLDAPListener(address, factory, options);
+ //return null;
+ return new BasicLDAPListener(address, factory, options);
}
/** {@inheritDoc} */
@Override
public String getName() {
- return "Grizzly";
+ return "Basic";
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ConnectionStateTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/ConnectionStateTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ConnectionStateTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/ConnectionStateTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/FutureResultTransformerTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReaderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReaderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReaderTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1InputStreamReaderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1InputStreamReaderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1InputStreamReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1InputStreamReaderTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriterTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriterTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriterTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java
index f8c65c2..15a852c 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java
@@ -64,11 +64,11 @@
@SuppressWarnings("javadoc")
public class AbstractAsynchronousConnectionTestCase extends SdkTestCase {
- private final class MockConnection extends AbstractAsynchronousConnection {
+ public final class MockConnection extends AbstractAsynchronousConnection {
private final ResultCode resultCode;
private final SearchResultEntry[] entries;
- private MockConnection(ResultCode resultCode, SearchResultEntry...entries) {
+ public MockConnection(ResultCode resultCode, SearchResultEntry...entries) {
this.resultCode = resultCode;
this.entries = entries;
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java
similarity index 87%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java
index c31c0dc..1d1d20d 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java
@@ -37,7 +37,7 @@
* A connection event listener which records events and signals when it has been
* notified.
*/
-final class MockConnectionEventListener implements ConnectionEventListener {
+public final class MockConnectionEventListener implements ConnectionEventListener {
private final CountDownLatch closedLatch = new CountDownLatch(1);
private final CountDownLatch errorLatch = new CountDownLatch(1);
private final CountDownLatch notificationLatch = new CountDownLatch(1);
@@ -76,27 +76,27 @@
notificationLatch.countDown();
}
- void awaitClose(long timeout, TimeUnit unit) {
+ public void awaitClose(long timeout, TimeUnit unit) {
await(closedLatch, timeout, unit);
}
- void awaitError(long timeout, TimeUnit unit) {
+ public void awaitError(long timeout, TimeUnit unit) {
await(errorLatch, timeout, unit);
}
- void awaitNotification(long timeout, TimeUnit unit) {
+ public void awaitNotification(long timeout, TimeUnit unit) {
await(notificationLatch, timeout, unit);
}
- Boolean isDisconnectNotification() {
+ public Boolean isDisconnectNotification() {
return isDisconnectNotification;
}
- ErrorResultException getError() {
+ public ErrorResultException getError() {
return error;
}
- ExtendedResult getNotification() {
+ public ExtendedResult getNotification() {
return notification;
}
@@ -108,7 +108,7 @@
}
}
- int getInvocationCount() {
+ public int getInvocationCount() {
return invocationCount.get();
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java
similarity index 93%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java
index a1ea03d..b70cf4c 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java
@@ -48,7 +48,7 @@
*
* @param exceptionClass expected exception
*/
- void failWasExpected(Class<? extends Throwable> exceptionClass) {
+ protected void failWasExpected(Class<? extends Throwable> exceptionClass) {
fail("should throw an exception " + exceptionClass.getSimpleName());
}
@@ -62,7 +62,7 @@
*
* @param level logging level to use
*/
- void setDefaultLogLevel(Level level) {
+ protected void setDefaultLogLevel(Level level) {
Logger.getLogger(StaticUtils.DEFAULT_LOG.getName()).setLevel(level);
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider b/opendj-sdk/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
similarity index 94%
copy from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
copy to opendj-sdk/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
index fa780e5..dffae95 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
+++ b/opendj-sdk/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
@@ -23,4 +23,4 @@
#
# Copyright 2013 ForgeRock AS.
#
-com.forgerock.opendj.ldap.GrizzlyTransportProvider
\ No newline at end of file
+com.forgerock.opendj.ldap.BasicTransportProvider
\ No newline at end of file
diff --git a/opendj-sdk/opendj3/opendj-grizzly/pom.xml b/opendj-sdk/opendj3/opendj-grizzly/pom.xml
new file mode 100644
index 0000000..b9a8230
--- /dev/null
+++ b/opendj-sdk/opendj3/opendj-grizzly/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! If applicable, add the following below this CDDL HEADER, with the
+ ! fields enclosed by brackets "[]" replaced with your own identifying
+ ! information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Copyright 2013 ForgeRock AS
+ !
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>opendj-project</artifactId>
+ <groupId>org.forgerock.opendj</groupId>
+ <version>2.7.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>opendj-grizzly</artifactId>
+ <name>Grizzly Provider for OpenDJ LDAP SDK</name>
+ <description>
+ This module includes a Grizzly-based implementation of transport provider for OpenDJ LDAP SDK.
+ </description>
+ <packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.grizzly</groupId>
+ <artifactId>grizzly-framework</artifactId>
+ <version>${grizzlyFrameworkVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-build-tools</artifactId>
+ <version>${forgerockBuildToolsVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <opendj.osgi.import>
+ com.sun.security.auth*;resolution:=optional,
+ *
+ </opendj.osgi.import>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>cim</report>
+ <report>distribution-management</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferReader.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferReader.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java
index 93e33ad..c2c12f8 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferReader.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java
@@ -25,7 +25,7 @@
* Portions copyright 2012-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static com.forgerock.opendj.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
import static com.forgerock.opendj.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferWriter.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferWriter.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java
index f300344..82fff73 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferWriter.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java
@@ -24,7 +24,7 @@
* Copyright 2010 Sun Microsystems, Inc.
* Portions copyright 2012-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static com.forgerock.opendj.ldap.CoreMessages.ERR_ASN1_SEQUENCE_WRITE_NOT_STARTED;
import static com.forgerock.opendj.util.StaticUtils.IO_LOG;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPMessageHandler.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/AbstractLDAPMessageHandler.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPMessageHandler.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/AbstractLDAPMessageHandler.java
index f28fd41..d653fcc 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPMessageHandler.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/AbstractLDAPMessageHandler.java
@@ -24,7 +24,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ConnectionSecurityLayerFilter.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ConnectionSecurityLayerFilter.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java
index 645a3c3..b826d14 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/ConnectionSecurityLayerFilter.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java
@@ -25,7 +25,7 @@
* Portions copyright 2012 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import org.forgerock.opendj.ldap.ConnectionSecurityLayer;
import org.forgerock.opendj.ldap.ErrorResultException;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java
index e39262f..0c31fce 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java
@@ -25,7 +25,7 @@
* Portions copyright 2011-2013 ForgeRock AS
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static com.forgerock.opendj.util.StaticUtils.DEFAULT_LOG;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnection.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnection.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
index d9c7968..40cd7b9 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnection.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
@@ -25,10 +25,11 @@
* Portions Copyright 2011-2013 ForgeRock AS
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
-import static com.forgerock.opendj.util.StaticUtils.DEFAULT_LOG;
-import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
+import static com.forgerock.opendj.util.StaticUtils.*;
+
+import static org.forgerock.opendj.ldap.ErrorResultException.*;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -52,8 +53,8 @@
import org.forgerock.opendj.ldap.LDAPOptions;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ResultHandler;
-import org.forgerock.opendj.ldap.SearchResultHandler;
import org.forgerock.opendj.ldap.SSLContextBuilder;
+import org.forgerock.opendj.ldap.SearchResultHandler;
import org.forgerock.opendj.ldap.TrustManagers;
import org.forgerock.opendj.ldap.requests.AbandonRequest;
import org.forgerock.opendj.ldap.requests.AddRequest;
@@ -74,6 +75,12 @@
import org.forgerock.opendj.ldap.responses.ExtendedResult;
import org.forgerock.opendj.ldap.responses.Responses;
import org.forgerock.opendj.ldap.responses.Result;
+import org.forgerock.opendj.ldap.spi.AbstractLDAPFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPBindFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPCompareFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPExtendedFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPSearchFutureResultImpl;
import org.glassfish.grizzly.CompletionHandler;
import org.glassfish.grizzly.filterchain.Filter;
import org.glassfish.grizzly.filterchain.FilterChain;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionFactory.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionFactory.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java
index 00d09a7..10e10e0 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionFactory.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java
@@ -25,11 +25,10 @@
* Portions copyright 2011-2013 ForgeRock AS
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
-import static com.forgerock.opendj.ldap.DefaultTCPNIOTransport.DEFAULT_TRANSPORT;
-import static com.forgerock.opendj.ldap.TimeoutChecker.TIMEOUT_CHECKER;
-
+import static com.forgerock.opendj.grizzly.DefaultTCPNIOTransport.DEFAULT_TRANSPORT;
+import static com.forgerock.opendj.grizzly.TimeoutChecker.TIMEOUT_CHECKER;
import static org.forgerock.opendj.ldap.ErrorResultException.*;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyLDAPListener.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListener.java
similarity index 97%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyLDAPListener.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListener.java
index d60d583..bcc0f88 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyLDAPListener.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyLDAPListener.java
@@ -25,9 +25,9 @@
* Portions copyright 2011-2013 ForgeRock AS
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
-import static com.forgerock.opendj.ldap.DefaultTCPNIOTransport.DEFAULT_TRANSPORT;
+import static com.forgerock.opendj.grizzly.DefaultTCPNIOTransport.DEFAULT_TRANSPORT;
import static com.forgerock.opendj.util.StaticUtils.DEFAULT_LOG;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyTransportProvider.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java
similarity index 79%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyTransportProvider.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java
index 680dc9d..8faafcc 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyTransportProvider.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java
@@ -23,7 +23,7 @@
*
* Copyright 2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import java.io.IOException;
import java.net.SocketAddress;
@@ -37,22 +37,24 @@
import org.forgerock.opendj.ldap.spi.TransportProvider;
/**
- * Provides an implementation of {@code LDAPListener} using Grizzly as
- * transport.
+ * Provides an implementation of a transport provider using Grizzly as
+ * transport. This provider is named "Grizzly".
* <p>
* To be used, this implementation must be declared in the
* provider-configuration file
- * {@code META-INF/services/org.forgerock.opendj.ldap.spi.LDAPListenerProvider}
+ * {@code META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider}
* with this single line:
*
* <pre>
- * com.forgerock.opendj.ldap.GrizzlyLDAPListenerProvider
+ * com.forgerock.opendj.ldap.GrizzlyTransportProvider
* </pre>.
* <p>
* To require that this implementation is used, you must set the transport
- * provider to {@code Grizzly} using
- * {@code LDAPListenerOptions#setTransportProvider(String)} method. Otherwise
- * there is no guarantee that this implementation will be used.
+ * provider to "Grizzly" using {@code LDAPOptions#setTransportProvider()}
+ * method if requesting a {@code LDAPConnectionFactory} or
+ * {@code LDAPListenerOptions#setTransportProvider()} method if requesting a
+ * {@code LDAPListener}. Otherwise there is no guarantee that this
+ * implementation will be used.
*/
public class GrizzlyTransportProvider implements TransportProvider {
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPClientFilter.java
similarity index 97%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPClientFilter.java
index eddd89c..9b8ab08 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPClientFilter.java
@@ -25,9 +25,9 @@
* Portions copyright 2012-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
-import static com.forgerock.opendj.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
+import static com.forgerock.opendj.ldap.LDAPConstants.*;
import java.io.EOFException;
import java.io.IOException;
@@ -53,6 +53,12 @@
import org.forgerock.opendj.ldap.responses.Result;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
import org.forgerock.opendj.ldap.responses.SearchResultReference;
+import org.forgerock.opendj.ldap.spi.AbstractLDAPFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPBindFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPCompareFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPExtendedFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPFutureResultImpl;
+import org.forgerock.opendj.ldap.spi.LDAPSearchFutureResultImpl;
import org.glassfish.grizzly.Buffer;
import org.glassfish.grizzly.Connection;
import org.glassfish.grizzly.EmptyCompletionHandler;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPMessageHandler.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPMessageHandler.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPMessageHandler.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPMessageHandler.java
index 048fc63..7104540 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPMessageHandler.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPMessageHandler.java
@@ -24,7 +24,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPReader.java
similarity index 95%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPReader.java
index b6b1ed4..6e129f3 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPReader.java
@@ -25,7 +25,7 @@
* Portions copyright 2011-2013 ForgeRock AS
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static com.forgerock.opendj.ldap.LDAPConstants.*;
import static com.forgerock.opendj.ldap.CoreMessages.ERR_LDAP_MODIFICATION_DECODE_INVALID_MOD_TYPE;
@@ -35,6 +35,7 @@
import static com.forgerock.opendj.util.StaticUtils.byteToHex;
import java.io.IOException;
+
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.opendj.asn1.ASN1;
import org.forgerock.opendj.asn1.ASN1Reader;
@@ -77,63 +78,13 @@
import org.forgerock.opendj.ldap.responses.SearchResultReference;
import org.forgerock.opendj.ldap.schema.Schema;
+import com.forgerock.opendj.ldap.LDAPUtils;
+
/**
* Static methods for decoding LDAP messages.
*/
final class LDAPReader {
- static SearchResultEntry decodeEntry(final ASN1Reader reader, final DecodeOptions options)
- throws IOException {
- Entry entry;
- reader.readStartSequence(OP_TYPE_SEARCH_RESULT_ENTRY);
- try {
- final String dnString = reader.readOctetStringAsString();
- final Schema schema = options.getSchemaResolver().resolveSchema(dnString);
- DN dn;
- try {
- dn = DN.valueOf(dnString, schema);
- } catch (final LocalizedIllegalArgumentException e) {
- throw DecodeException.error(e.getMessageObject());
- }
-
- entry = options.getEntryFactory().newEntry(dn);
- reader.readStartSequence();
- try {
- while (reader.hasNextElement()) {
- reader.readStartSequence();
- try {
- final String ads = reader.readOctetStringAsString();
- AttributeDescription ad;
- try {
- ad = AttributeDescription.valueOf(ads, schema);
- } catch (final LocalizedIllegalArgumentException e) {
- throw DecodeException.error(e.getMessageObject());
- }
-
- final Attribute attribute = options.getAttributeFactory().newAttribute(ad);
-
- reader.readStartSet();
- try {
- while (reader.hasNextElement()) {
- attribute.add(reader.readOctetString());
- }
- entry.addAttribute(attribute);
- } finally {
- reader.readEndSet();
- }
- } finally {
- reader.readEndSequence();
- }
- }
- } finally {
- reader.readEndSequence();
- }
- } finally {
- reader.readEndSequence();
- }
-
- return Responses.newSearchResultEntry(entry);
- }
private final DecodeOptions options;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPServerFilter.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPServerFilter.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPServerFilter.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPServerFilter.java
index 4bbee8c..6080156 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPServerFilter.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPServerFilter.java
@@ -25,7 +25,7 @@
* Portions copyright 2012-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static com.forgerock.opendj.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPWriter.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPWriter.java
index 9c5fddc..b3e2fa9 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPWriter.java
@@ -25,7 +25,7 @@
* Portions copyright 2011-2013 ForgeRock AS
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static com.forgerock.opendj.ldap.LDAPConstants.*;
import static com.forgerock.opendj.util.StaticUtils.IO_LOG;
@@ -33,6 +33,7 @@
import java.io.IOException;
import java.util.List;
+
import org.forgerock.opendj.asn1.ASN1Writer;
import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.ByteString;
@@ -59,6 +60,7 @@
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
import org.forgerock.opendj.ldap.responses.SearchResultReference;
+import com.forgerock.opendj.ldap.LDAPUtils;
import com.forgerock.opendj.util.StaticUtils;
/**
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/TimeoutChecker.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/TimeoutChecker.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/TimeoutChecker.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/TimeoutChecker.java
index 2ecdd37..7cf8bfc 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/TimeoutChecker.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/TimeoutChecker.java
@@ -25,7 +25,7 @@
* Portions copyright 2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static com.forgerock.opendj.util.StaticUtils.DEFAULT_LOG;
import static java.util.Collections.newSetFromMap;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedRequestException.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnexpectedRequestException.java
similarity index 97%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedRequestException.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnexpectedRequestException.java
index 6405247..368b264 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedRequestException.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnexpectedRequestException.java
@@ -24,7 +24,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedResponseException.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnexpectedResponseException.java
similarity index 97%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedResponseException.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnexpectedResponseException.java
index 540b78f..a386fd7 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedResponseException.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnexpectedResponseException.java
@@ -24,7 +24,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/UnsupportedMessageException.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnsupportedMessageException.java
similarity index 97%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/UnsupportedMessageException.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnsupportedMessageException.java
index 876b115..129ec01 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/UnsupportedMessageException.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/UnsupportedMessageException.java
@@ -24,7 +24,7 @@
* Copyright 2009 Sun Microsystems, Inc.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java
new file mode 100644
index 0000000..cf66b13
--- /dev/null
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2013 ForgeRock AS.
+ */
+
+/**
+ * Classes implementing Grizzly transport provider.
+ */
+package com.forgerock.opendj.grizzly;
+
diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/javadoc/overview.html b/opendj-sdk/opendj3/opendj-grizzly/src/main/javadoc/overview.html
new file mode 100644
index 0000000..69b8d30
--- /dev/null
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/javadoc/overview.html
@@ -0,0 +1,112 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<body>
+ The OpenDJ SDK for Java provides a high performance easy to use
+ library of classes and interfaces for accessing and implementing
+ LDAP Directory Services as defined in <a
+ href="http://tools.ietf.org/html/rfc4510">RFC 4510</a>.
+ <br>
+ For an introduction to LDAP, read the <em>OpenDJ SDK Developer's Guide</em>
+ chapter on <a
+ href="http://opendj.forgerock.org/doc/dev-guide/index.html#chap-understanding-ldap"
+ >Understanding LDAP</a>. Also see the chapter on <a
+ href="http://opendj.forgerock.org/doc/dev-guide/index.html#chap-best-practices"
+ >Best Practices For LDAP Application Developers</a>.
+ <br>
+ <h1>Getting Started</h1>
+ The following example shows how the OpenDJ SDK may be used to
+ connect to a directory server, authenticate, and then perform a
+ search. The search results are output as LDIF to the standard
+ output:
+ <br>
+ <table width="100%">
+ <tbody>
+ <tr>
+ <td>
+ <pre> // Create an LDIF writer which will write the search results to stdout.
+ final LDIFEntryWriter writer = new LDIFEntryWriter(System.out);
+ Connection connection = null;
+ try
+ {
+ // Connect and bind to the server.
+ final LDAPConnectionFactory factory = new LDAPConnectionFactory("localhost", 1389);
+
+ connection = factory.getConnection();
+ connection.bind(userName, password);
+
+ // Read the entries and output them as LDIF.
+ final ConnectionEntryReader reader = connection.search(baseDN, scope, filter, attributes);
+ while (reader.hasNext())
+ {
+ if (reader.isEntry())
+ {
+ // Got an entry.
+ final SearchResultEntry entry = reader.readEntry();
+ writer.writeComment("Search result entry: " + entry.getName().toString());
+ writer.writeEntry(entry);
+ }
+ else
+ {
+ // Got a continuation reference.
+ final SearchResultReference ref = reader.readReference();
+ writer.writeComment("Search result reference: " + ref.getURIs().toString());
+ }
+ }
+ writer.flush();
+ }
+ catch (final Exception e)
+ {
+ // Handle exceptions...
+ System.err.println(e.getMessage());
+ }
+ finally
+ {
+ if (connection != null)
+ {
+ connection.close();
+ }
+ }</pre>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br><!-- It seems the .zip is not packaged with the SDK. -->
+ Additional examples can be found online at the <a
+ href="http://opendj.forgerock.org/opendj-ldap-sdk-examples/"
+ >OpenDJ LDAP SDK Examples</a> site.
+ <br>
+ <h1>Creating Connections</h1>
+ The following classes can be used to create and manage connections to
+ LDAP directory servers:
+ <ul>
+ <li>{@link org.forgerock.opendj.ldap.LDAPConnectionFactory}</li>
+ <li>{@link org.forgerock.opendj.ldap.Connection}</li>
+ <li>{@link org.forgerock.opendj.ldap.Connections}</li>
+ </ul>
+ <br>
+ <h1>Creating Requests</h1>
+ The following classes can be used to create LDAP requests:
+ <ul>
+ <li>{@link org.forgerock.opendj.ldap.requests.Requests}</li>
+ <li>{@link org.forgerock.opendj.ldap.requests.Request}</li>
+ </ul>
+ <br>
+ <h1>Using Controls</h1>
+ Common LDAP control implementations can be found in
+ {@link org.forgerock.opendj.ldap.controls}.
+ <br>
+ <h1>Core Types</h1>
+ The following classes and interfaces represent core types:
+ <ul>
+ <li>{@link org.forgerock.opendj.ldap.AttributeDescription}</li>
+ <li>{@link org.forgerock.opendj.ldap.Attribute}</li>
+ <li>{@link org.forgerock.opendj.ldap.DN}</li>
+ <li>{@link org.forgerock.opendj.ldap.Entry}</li>
+ <li>{@link org.forgerock.opendj.ldap.Filter}</li>
+ </ul>
+ <br>
+@see <a href="http://tools.ietf.org/html/rfc4511">RFC 4511 - Lightweight
+ Directory Access Protocol (LDAP): The Protocol </a>
+@see org.forgerock.opendj.ldap
+</body>
+</html>
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider b/opendj-sdk/opendj3/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
similarity index 94%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
index fa780e5..d273aa2 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
@@ -23,4 +23,4 @@
#
# Copyright 2013 ForgeRock AS.
#
-com.forgerock.opendj.ldap.GrizzlyTransportProvider
\ No newline at end of file
+com.forgerock.opendj.grizzly.GrizzlyTransportProvider
\ No newline at end of file
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferReaderTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java
similarity index 97%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java
index 58bf6b5..6faf60b 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferReaderTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java
@@ -25,7 +25,7 @@
* Portions copyright 2011 ForgeRock AS
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java
index 27e2835..dcb54bb 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java
@@ -25,7 +25,7 @@
* Portions copyright 2011 ForgeRock AS
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionFactoryTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java
similarity index 94%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionFactoryTestCase.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java
index 8b66228..9a562e3 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionFactoryTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java
@@ -25,7 +25,7 @@
* Portions copyright 2011-2013 ForgeRock AS
*/
-package org.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static java.util.Arrays.*;
@@ -48,6 +48,32 @@
import javax.net.ssl.SSLContext;
+import org.forgerock.opendj.ldap.AttributeDescription;
+import org.forgerock.opendj.ldap.Connection;
+import org.forgerock.opendj.ldap.ConnectionFactory;
+import org.forgerock.opendj.ldap.ConnectionPool;
+import org.forgerock.opendj.ldap.Connections;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.FailoverLoadBalancingAlgorithm;
+import org.forgerock.opendj.ldap.FutureResult;
+import org.forgerock.opendj.ldap.IntermediateResponseHandler;
+import org.forgerock.opendj.ldap.LDAPClientContext;
+import org.forgerock.opendj.ldap.LDAPConnectionFactory;
+import org.forgerock.opendj.ldap.LDAPListener;
+import org.forgerock.opendj.ldap.LDAPOptions;
+import org.forgerock.opendj.ldap.LDAPServer;
+import org.forgerock.opendj.ldap.MockConnectionEventListener;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.ResultHandler;
+import org.forgerock.opendj.ldap.RoundRobinLoadBalancingAlgorithm;
+import org.forgerock.opendj.ldap.SSLContextBuilder;
+import org.forgerock.opendj.ldap.SdkTestCase;
+import org.forgerock.opendj.ldap.SearchScope;
+import org.forgerock.opendj.ldap.ServerConnection;
+import org.forgerock.opendj.ldap.ServerConnectionFactory;
+import org.forgerock.opendj.ldap.TestCaseUtils;
+import org.forgerock.opendj.ldap.TrustManagers;
import org.forgerock.opendj.ldap.requests.BindRequest;
import org.forgerock.opendj.ldap.requests.DigestMD5SASLBindRequest;
import org.forgerock.opendj.ldap.requests.Requests;
@@ -144,12 +170,12 @@
// AuthenticatedConnectionFactory
factories[2][0] =
- new AuthenticatedConnectionFactory(new LDAPConnectionFactory(getServerSocketAddress()),
+ Connections.newAuthenticatedConnectionFactory(new LDAPConnectionFactory(getServerSocketAddress()),
Requests.newSimpleBindRequest("", new char[0]));
// AuthenticatedConnectionFactory with multi-stage SASL
factories[3][0] =
- new AuthenticatedConnectionFactory(new LDAPConnectionFactory(getServerSocketAddress()),
+ Connections.newAuthenticatedConnectionFactory(new LDAPConnectionFactory(getServerSocketAddress()),
Requests.newCRAMMD5SASLBindRequest("id:user", "password".toCharArray()));
// LDAPConnectionFactory with default options
@@ -174,7 +200,7 @@
// localhost.localdomain).
// FIXME: enable QOP once OPENDJ-514 is fixed.
factories[6][0] =
- new AuthenticatedConnectionFactory(new LDAPConnectionFactory(
+ Connections.newAuthenticatedConnectionFactory(new LDAPConnectionFactory(
getServerSocketAddress(), options), Requests.newDigestMD5SASLBindRequest(
"id:user", "password".toCharArray()).setCipher(
DigestMD5SASLBindRequest.CIPHER_LOW));
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransportTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java
similarity index 89%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransportTestCase.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java
index 4f6f844..4e7a02b 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransportTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java
@@ -25,11 +25,11 @@
* Portions copyright 2012-2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
-import static com.forgerock.opendj.ldap.DefaultTCPNIOTransport.DEFAULT_TRANSPORT;
-import static org.forgerock.opendj.ldap.TestCaseUtils.findFreeSocketAddress;
-import static org.testng.Assert.assertTrue;
+import static org.forgerock.opendj.ldap.TestCaseUtils.*;
+import static com.forgerock.opendj.grizzly.DefaultTCPNIOTransport.DEFAULT_TRANSPORT;
+import static org.testng.Assert.*;
import java.net.Socket;
import java.net.SocketAddress;
@@ -37,6 +37,7 @@
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
import org.testng.annotations.Test;
+import com.forgerock.opendj.ldap.LDAPTestCase;
import com.forgerock.opendj.util.ReferenceCountedObject;
/**
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java
similarity index 93%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionTestCase.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java
index 8af2738..a77e2bd 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java
@@ -24,12 +24,10 @@
* Copyright 2013 ForgeRock AS.
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
-import static org.fest.assertions.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.fest.assertions.Assertions.*;
+import static org.mockito.Mockito.*;
import java.net.SocketAddress;
import java.util.concurrent.TimeUnit;
@@ -41,6 +39,7 @@
import org.forgerock.opendj.ldap.LDAPOptions;
import org.forgerock.opendj.ldap.RequestHandler;
import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.SdkTestCase;
import org.forgerock.opendj.ldap.SearchResultHandler;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.TestCaseUtils;
@@ -55,7 +54,7 @@
* Tests LDAP connection implementation class.
*/
@SuppressWarnings("javadoc")
-public class GrizzlyLDAPConnectionTestCase extends LDAPTestCase {
+public class GrizzlyLDAPConnectionTestCase extends SdkTestCase {
/**
* Tests that a normal request is subject to client side timeout checking.
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPConnectionFactoryTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/LDAPConnectionFactoryTestCase.java
similarity index 85%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPConnectionFactoryTestCase.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/LDAPConnectionFactoryTestCase.java
index 93c70d0..89976a3 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPConnectionFactoryTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/LDAPConnectionFactoryTestCase.java
@@ -23,17 +23,29 @@
*
* Copyright 2013 ForgeRock AS.
*/
-package org.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
-import static org.fest.assertions.Assertions.assertThat;
-import static org.forgerock.opendj.ldap.TestCaseUtils.findFreeSocketAddress;
-import static org.mockito.Mockito.mock;
+import static org.fest.assertions.Assertions.*;
+import static org.forgerock.opendj.ldap.TestCaseUtils.*;
+import static org.mockito.Mockito.*;
import java.io.IOException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import org.forgerock.opendj.ldap.Connection;
+import org.forgerock.opendj.ldap.ConnectionFactory;
+import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LDAPClientContext;
+import org.forgerock.opendj.ldap.LDAPConnectionFactory;
+import org.forgerock.opendj.ldap.LDAPListener;
+import org.forgerock.opendj.ldap.LDAPOptions;
+import org.forgerock.opendj.ldap.MockConnectionEventListener;
+import org.forgerock.opendj.ldap.ProviderNotFoundException;
+import org.forgerock.opendj.ldap.SdkTestCase;
+import org.forgerock.opendj.ldap.ServerConnection;
+import org.forgerock.opendj.ldap.ServerConnectionFactory;
import org.testng.annotations.Test;
/**
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPListenerTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/LDAPListenerTestCase.java
similarity index 96%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPListenerTestCase.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/LDAPListenerTestCase.java
index efa6588..231f6ba 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPListenerTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/LDAPListenerTestCase.java
@@ -24,7 +24,7 @@
* Copyright 2010 Sun Microsystems, Inc.
* Portions copyright 2011-2013 ForgeRock AS.
*/
-package org.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static org.fest.assertions.Assertions.*;
import static org.fest.assertions.Fail.*;
@@ -37,6 +37,25 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
+import org.forgerock.opendj.ldap.Connection;
+import org.forgerock.opendj.ldap.ConnectionException;
+import org.forgerock.opendj.ldap.ConnectionFactory;
+import org.forgerock.opendj.ldap.Connections;
+import org.forgerock.opendj.ldap.DecodeException;
+import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.IntermediateResponseHandler;
+import org.forgerock.opendj.ldap.LDAPClientContext;
+import org.forgerock.opendj.ldap.LDAPConnectionFactory;
+import org.forgerock.opendj.ldap.LDAPListener;
+import org.forgerock.opendj.ldap.LDAPListenerOptions;
+import org.forgerock.opendj.ldap.ProviderNotFoundException;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.ResultHandler;
+import org.forgerock.opendj.ldap.RoundRobinLoadBalancingAlgorithm;
+import org.forgerock.opendj.ldap.SdkTestCase;
+import org.forgerock.opendj.ldap.SearchResultHandler;
+import org.forgerock.opendj.ldap.ServerConnection;
+import org.forgerock.opendj.ldap.ServerConnectionFactory;
import org.forgerock.opendj.ldap.requests.AbandonRequest;
import org.forgerock.opendj.ldap.requests.AddRequest;
import org.forgerock.opendj.ldap.requests.BindRequest;
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml b/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
index d2da95c..ce6fc4f 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
@@ -59,7 +59,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <artifactSet>
+ <excludes>
+ <!-- avoid duplicate classes, as opendj-ldap-sdk already contains them -->
+ <exclude>org.forgerock.opendj:opendj-core</exclude>
+ <exclude>org.forgerock.opendj:opendj-grizzly</exclude>
+ </excludes>
+ </artifactSet>
</configuration>
<executions>
<execution>
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml b/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
index 71a8e6c..894a6db 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
@@ -37,26 +37,17 @@
This module includes OpenDJ core APIs for implementing LDAP Directory
client and server applications.
</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-core</artifactId>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-framework</artifactId>
- <version>${grizzlyFrameworkVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.forgerock</groupId>
- <artifactId>forgerock-build-tools</artifactId>
- <version>${forgerockBuildToolsVersion}</version>
- <scope>test</scope>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-grizzly</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<properties>
@@ -67,19 +58,26 @@
</properties>
<build>
<plugins>
+ <!-- Unpack opendj-core and opendj-grizzly to rebuild an unified jar with bundle -->
<plugin>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>i18n-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
<executions>
<execution>
- <phase>generate-sources</phase>
+ <id>unpack-dependencies</id>
+ <phase>package</phase>
<goals>
- <goal>generate-messages</goal>
+ <goal>unpack-dependencies</goal>
</goals>
<configuration>
- <messageFiles>
- <messageFile>com/forgerock/opendj/ldap/core.properties</messageFile>
- </messageFiles>
+ <includeArtifactIds>opendj-grizzly, opendj-core</includeArtifactIds>
+ <includes>**/*.class,**\/services\/*</includes>
+ <excludes>**/*.properties</excludes>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
@@ -88,6 +86,19 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+ <Include-Resource>META-INF/services=target/classes/META-INF/services</Include-Resource>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml b/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
index 7674419..06047e3 100644
--- a/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
+++ b/opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-ldap-sdk</artifactId>
+ <artifactId>opendj-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/opendj-sdk/opendj3/pom.xml b/opendj-sdk/opendj3/pom.xml
index c32e4af..0957081 100644
--- a/opendj-sdk/opendj3/pom.xml
+++ b/opendj-sdk/opendj3/pom.xml
@@ -89,6 +89,8 @@
</site>
</distributionManagement>
<modules>
+ <module>opendj-core</module>
+ <module>opendj-grizzly</module>
<module>opendj-ldap-sdk</module>
<module>opendj-ldap-toolkit</module>
<module>opendj-ldap-sdk-examples</module>
--
Gitblit v1.10.0