Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7EFCADAA7 for ; Wed, 19 Dec 2012 17:36:04 +0000 (UTC) Received: (qmail 96762 invoked by uid 500); 19 Dec 2012 17:36:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 96703 invoked by uid 500); 19 Dec 2012 17:36:04 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 96662 invoked by uid 99); 19 Dec 2012 17:36:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2012 17:36:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2012 17:35:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 83E8D2388A36; Wed, 19 Dec 2012 17:35:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1423973 [14/17] - in /directory/apacheds/branches/apacheds-refact: core-annotations/src/main/java/org/apache/directory/server/core/factory/ core-api/src/main/java/org/apache/directory/server/core/api/ core-api/src/main/java/org/apache/dire... Date: Wed, 19 Dec 2012 17:34:18 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121219173502.83E8D2388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java Wed Dec 19 17:34:07 2012 @@ -25,20 +25,20 @@ import static org.junit.Assert.assertFal import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import org.apache.directory.api.ldap.model.constants.SchemaConstants; +import org.apache.directory.api.ldap.model.cursor.EntryCursor; +import org.apache.directory.api.ldap.model.entry.Attribute; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.message.SearchScope; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.cursor.EntryCursor; -import org.apache.directory.shared.ldap.model.entry.Attribute; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.message.SearchScope; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java Wed Dec 19 17:34:07 2012 @@ -28,6 +28,8 @@ import netscape.ldap.LDAPConstraints; import netscape.ldap.LDAPControl; import netscape.ldap.LDAPException; +import org.apache.directory.api.ldap.model.exception.LdapAuthenticationException; +import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.api.util.Strings; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; @@ -36,8 +38,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.exception.LdapAuthenticationException; -import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java Wed Dec 19 17:34:07 2012 @@ -24,6 +24,7 @@ import static org.junit.Assert.assertEqu import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.apache.directory.api.ldap.model.exception.LdapAuthenticationException; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.LdapNetworkConnection; @@ -38,7 +39,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.authn.StrongAuthenticator; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.exception.LdapAuthenticationException; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Wed Dec 19 17:34:07 2012 @@ -49,6 +49,9 @@ import netscape.ldap.LDAPUrl; import org.apache.commons.lang.ArrayUtils; import org.apache.directory.api.asn1.util.Asn1StringUtils; +import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; +import org.apache.directory.api.ldap.model.message.Control; +import org.apache.directory.api.ldap.model.message.controls.OpaqueControl; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -65,9 +68,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler; import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler; import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler; -import org.apache.directory.shared.ldap.model.constants.SupportedSaslMechanisms; -import org.apache.directory.shared.ldap.model.message.Control; -import org.apache.directory.shared.ldap.model.message.controls.OpaqueControl; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Wed Dec 19 17:34:07 2012 @@ -37,6 +37,20 @@ import javax.naming.directory.InitialDir import org.apache.commons.lang.ArrayUtils; import org.apache.commons.net.SocketClient; +import org.apache.directory.api.ldap.model.constants.SaslQoP; +import org.apache.directory.api.ldap.model.constants.SchemaConstants; +import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.message.BindRequest; +import org.apache.directory.api.ldap.model.message.BindRequestImpl; +import org.apache.directory.api.ldap.model.message.BindResponse; +import org.apache.directory.api.ldap.model.message.Message; +import org.apache.directory.api.ldap.model.message.ModifyRequest; +import org.apache.directory.api.ldap.model.message.ModifyRequestImpl; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.CramMd5Request; import org.apache.directory.ldap.client.api.DigestMd5Request; @@ -66,20 +80,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.api.LdapEncoder; import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.MessageDecorator; -import org.apache.directory.shared.ldap.model.constants.SaslQoP; -import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.constants.SupportedSaslMechanisms; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.message.BindRequest; -import org.apache.directory.shared.ldap.model.message.BindRequestImpl; -import org.apache.directory.shared.ldap.model.message.BindResponse; -import org.apache.directory.shared.ldap.model.message.Message; -import org.apache.directory.shared.ldap.model.message.ModifyRequest; -import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java Wed Dec 19 17:34:07 2012 @@ -34,6 +34,15 @@ import javax.naming.directory.SearchCont import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.exception.LdapOperationException; +import org.apache.directory.api.ldap.model.message.CompareRequest; +import org.apache.directory.api.ldap.model.message.CompareRequestImpl; +import org.apache.directory.api.ldap.model.message.CompareResponse; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.message.controls.ManageDsaIT; +import org.apache.directory.api.ldap.model.message.controls.ManageDsaITImpl; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.LdapNetworkConnection; @@ -43,15 +52,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.exception.LdapOperationException; -import org.apache.directory.shared.ldap.model.message.CompareRequest; -import org.apache.directory.shared.ldap.model.message.CompareRequestImpl; -import org.apache.directory.shared.ldap.model.message.CompareResponse; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT; -import org.apache.directory.shared.ldap.model.message.controls.ManageDsaITImpl; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java Wed Dec 19 17:34:07 2012 @@ -87,7 +87,7 @@ public class MatchingRuleCompareIT exten /** * Compare with caseIgnoreMatch matching rule. * - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ @Test public void testCaseIgnoreMatch() throws Exception @@ -125,7 +125,7 @@ public class MatchingRuleCompareIT exten /** * Compare with distinguishedNameMatch matching rule. * - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ @Test public void testDistinguishedNameMatch() throws Exception Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java Wed Dec 19 17:34:07 2012 @@ -24,6 +24,7 @@ import static org.apache.directory.serve import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -31,7 +32,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; import org.junit.Before; import org.junit.Rule; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java Wed Dec 19 17:34:07 2012 @@ -32,6 +32,16 @@ import javax.naming.NameNotFoundExceptio import javax.naming.ReferralException; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.model.exception.LdapContextNotEmptyException; +import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException; +import org.apache.directory.api.ldap.model.message.Control; +import org.apache.directory.api.ldap.model.message.DeleteRequest; +import org.apache.directory.api.ldap.model.message.DeleteRequestImpl; +import org.apache.directory.api.ldap.model.message.DeleteResponse; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.message.controls.ManageDsaIT; +import org.apache.directory.api.ldap.model.message.controls.ManageDsaITImpl; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -39,16 +49,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.exception.LdapContextNotEmptyException; -import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; -import org.apache.directory.shared.ldap.model.message.Control; -import org.apache.directory.shared.ldap.model.message.DeleteRequest; -import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl; -import org.apache.directory.shared.ldap.model.message.DeleteResponse; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT; -import org.apache.directory.shared.ldap.model.message.controls.ManageDsaITImpl; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/extended/DitUtilitiesProcedure.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/extended/DitUtilitiesProcedure.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/extended/DitUtilitiesProcedure.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/extended/DitUtilitiesProcedure.java Wed Dec 19 17:34:07 2012 @@ -20,9 +20,9 @@ package org.apache.directory.server.operations.extended; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.server.core.api.CoreSession; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.name.Dn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java Wed Dec 19 17:34:07 2012 @@ -32,6 +32,9 @@ import javax.naming.directory.BasicAttri import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; +import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer; +import org.apache.directory.api.ldap.model.schema.normalizers.OidNormalizer; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -44,9 +47,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler; import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler; import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler; -import org.apache.directory.shared.ldap.model.constants.SupportedSaslMechanisms; -import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer; -import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer; import org.apache.directory.shared.ldap.sp.JavaStoredProcUtils; import org.junit.Before; import org.junit.Rule; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java Wed Dec 19 17:34:07 2012 @@ -62,6 +62,23 @@ import netscape.ldap.LDAPResponse; import netscape.ldap.LDAPResponseListener; import netscape.ldap.LDAPSearchConstraints; +import org.apache.directory.api.ldap.model.constants.AuthenticationLevel; +import org.apache.directory.api.ldap.model.constants.SchemaConstants; +import org.apache.directory.api.ldap.model.csn.Csn; +import org.apache.directory.api.ldap.model.csn.CsnFactory; +import org.apache.directory.api.ldap.model.entry.Attribute; +import org.apache.directory.api.ldap.model.entry.DefaultAttribute; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.entry.DefaultModification; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.entry.Modification; +import org.apache.directory.api.ldap.model.entry.ModificationOperation; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.exception.LdapNoSuchAttributeException; +import org.apache.directory.api.ldap.model.exception.LdapOperationException; +import org.apache.directory.api.ldap.model.ldif.LdifUtils; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; @@ -81,23 +98,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.jndi.ServerLdapContext; import org.apache.directory.server.integ.ServerIntegrationUtils; -import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; -import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.csn.Csn; -import org.apache.directory.shared.ldap.model.csn.CsnFactory; -import org.apache.directory.shared.ldap.model.entry.Attribute; -import org.apache.directory.shared.ldap.model.entry.DefaultAttribute; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.entry.DefaultModification; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.Modification; -import org.apache.directory.shared.ldap.model.entry.ModificationOperation; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.exception.LdapNoSuchAttributeException; -import org.apache.directory.shared.ldap.model.exception.LdapOperationException; -import org.apache.directory.shared.ldap.model.ldif.LdifUtils; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/CompareIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/CompareIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/CompareIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/CompareIT.java Wed Dec 19 17:34:07 2012 @@ -42,6 +42,7 @@ import netscape.ldap.LDAPException; import netscape.ldap.LDAPResponse; import netscape.ldap.LDAPResponseListener; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; @@ -50,7 +51,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/DeleteIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/DeleteIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/DeleteIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/DeleteIT.java Wed Dec 19 17:34:07 2012 @@ -39,6 +39,9 @@ import netscape.ldap.LDAPResponse; import netscape.ldap.LDAPResponseListener; import netscape.ldap.LDAPSearchConstraints; +import org.apache.directory.api.ldap.model.exception.LdapContextNotEmptyException; +import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; @@ -47,9 +50,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.exception.LdapContextNotEmptyException; -import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/IllegalModificationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/IllegalModificationIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/IllegalModificationIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/IllegalModificationIT.java Wed Dec 19 17:34:07 2012 @@ -30,6 +30,12 @@ import netscape.ldap.LDAPEntry; import netscape.ldap.LDAPException; import netscape.ldap.LDAPModification; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.message.ModifyRequest; +import org.apache.directory.api.ldap.model.message.ModifyRequestImpl; +import org.apache.directory.api.ldap.model.message.ModifyResponse; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -37,12 +43,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.message.ModifyRequest; -import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.model.message.ModifyResponse; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyDnReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyDnReferralIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyDnReferralIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyDnReferralIT.java Wed Dec 19 17:34:07 2012 @@ -38,6 +38,7 @@ import netscape.ldap.LDAPResponse; import netscape.ldap.LDAPResponseListener; import netscape.ldap.LDAPSearchConstraints; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; @@ -45,7 +46,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyReferralIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyReferralIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/ModifyReferralIT.java Wed Dec 19 17:34:07 2012 @@ -40,6 +40,7 @@ import netscape.ldap.LDAPModification; import netscape.ldap.LDAPResponse; import netscape.ldap.LDAPResponseListener; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; import org.apache.directory.api.util.Strings; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; @@ -48,7 +49,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.operations.compare.CompareIT; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java Wed Dec 19 17:34:07 2012 @@ -25,6 +25,7 @@ import static org.junit.Assert.assertNot import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -32,7 +33,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.integ.ServerIntegrationUtils; -import org.apache.directory.shared.ldap.model.entry.Entry; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java Wed Dec 19 17:34:07 2012 @@ -29,6 +29,8 @@ import javax.naming.directory.Attributes import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.message.Control; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -38,8 +40,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.integ.ServerIntegrationUtils; import org.apache.directory.server.ldap.LdapServer; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.message.Control; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.Ignore; import org.junit.Rule; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java Wed Dec 19 17:34:07 2012 @@ -25,6 +25,16 @@ import static org.apache.directory.serve import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import org.apache.directory.api.ldap.model.entry.DefaultModification; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.entry.Modification; +import org.apache.directory.api.ldap.model.entry.ModificationOperation; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.message.ModifyRequest; +import org.apache.directory.api.ldap.model.message.ModifyRequestImpl; +import org.apache.directory.api.ldap.model.message.ModifyResponse; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -32,16 +42,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.entry.DefaultModification; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.Modification; -import org.apache.directory.shared.ldap.model.entry.ModificationOperation; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.message.ModifyRequest; -import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.model.message.ModifyResponse; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java Wed Dec 19 17:34:07 2012 @@ -45,14 +45,14 @@ import javax.naming.directory.NoSuchAttr import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.ldif.LdifUtils; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.ldif.LdifUtils; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java Wed Dec 19 17:34:07 2012 @@ -32,6 +32,13 @@ import javax.naming.directory.DirContext import javax.naming.directory.ModificationItem; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.model.message.ModifyRequest; +import org.apache.directory.api.ldap.model.message.ModifyRequestImpl; +import org.apache.directory.api.ldap.model.message.ModifyResponse; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.message.controls.ManageDsaIT; +import org.apache.directory.api.ldap.model.message.controls.ManageDsaITImpl; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -40,13 +47,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.operations.compare.CompareIT; -import org.apache.directory.shared.ldap.model.message.ModifyRequest; -import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.model.message.ModifyResponse; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT; -import org.apache.directory.shared.ldap.model.message.controls.ManageDsaITImpl; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java Wed Dec 19 17:34:07 2012 @@ -30,6 +30,17 @@ import static org.junit.Assert.fail; import javax.naming.ReferralException; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.exception.LdapOperationException; +import org.apache.directory.api.ldap.model.message.Control; +import org.apache.directory.api.ldap.model.message.ModifyDnRequest; +import org.apache.directory.api.ldap.model.message.ModifyDnRequestImpl; +import org.apache.directory.api.ldap.model.message.ModifyDnResponse; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.message.controls.ManageDsaIT; +import org.apache.directory.api.ldap.model.message.controls.ManageDsaITImpl; +import org.apache.directory.api.ldap.model.name.Dn; +import org.apache.directory.api.ldap.model.name.Rdn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -37,17 +48,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.exception.LdapOperationException; -import org.apache.directory.shared.ldap.model.message.Control; -import org.apache.directory.shared.ldap.model.message.ModifyDnRequest; -import org.apache.directory.shared.ldap.model.message.ModifyDnRequestImpl; -import org.apache.directory.shared.ldap.model.message.ModifyDnResponse; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT; -import org.apache.directory.shared.ldap.model.message.controls.ManageDsaITImpl; -import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.name.Rdn; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java Wed Dec 19 17:34:07 2012 @@ -38,6 +38,9 @@ import javax.naming.directory.SchemaViol import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.ldif.LdifUtils; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -46,9 +49,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.integ.ServerIntegrationUtils; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.ldif.LdifUtils; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -738,7 +738,7 @@ public class ModifyRdnIT extends Abstrac * - Keep old Rdn * - Attributes: cn, sn, description, telephoneNumber must exist * - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ @Test public void testModifyMultiValuedRdnVariant5() throws Exception @@ -784,7 +784,7 @@ public class ModifyRdnIT extends Abstrac * - Delete old Rdn * - Must fail with schema violation, cn cannot be deleted * - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ @Test public void testModifyMultiValuedRdnVariant6() throws Exception @@ -844,7 +844,7 @@ public class ModifyRdnIT extends Abstrac * - Keep old Rdn * - Attributes: cn, sn, description must exist * - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ @Test public void testModifyMultiValuedRdnVariant7() throws Exception @@ -886,7 +886,7 @@ public class ModifyRdnIT extends Abstrac * - Delete old Rdn * - Must fail with schema violation, cn cannot be deleted * - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ @Test public void testModifyMultiValuedRdnVariant8() throws Exception @@ -943,7 +943,7 @@ public class ModifyRdnIT extends Abstrac * in its Rdn. Must fail because an operational attribute can not be * deleted. * - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ @Test public void testModifyRdnOperationalAttribute() throws Exception @@ -988,7 +988,7 @@ public class ModifyRdnIT extends Abstrac * person in its Rdn (objectClass=person,ou=system). Must fail because the * structural object class can not be deleted. * - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ @Test public void testModifyRdnObjectClassAttribute() throws Exception Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java Wed Dec 19 17:34:07 2012 @@ -32,6 +32,7 @@ import javax.naming.directory.SearchCont import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.model.exception.LdapUnwillingToPerformException; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.server.annotations.CreateLdapServer; @@ -39,7 +40,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java Wed Dec 19 17:34:07 2012 @@ -33,6 +33,7 @@ import javax.naming.directory.DirContext import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -47,7 +48,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler; import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler; import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler; -import org.apache.directory.shared.ldap.model.constants.SupportedSaslMechanisms; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java Wed Dec 19 17:34:07 2012 @@ -39,6 +39,16 @@ import javax.naming.ldap.LdapContext; import javax.naming.ldap.PagedResultsResponseControl; import org.apache.directory.api.asn1.EncoderException; +import org.apache.directory.api.ldap.model.cursor.EntryCursor; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.message.Control; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.message.SearchRequest; +import org.apache.directory.api.ldap.model.message.SearchRequestImpl; +import org.apache.directory.api.ldap.model.message.SearchResultDone; +import org.apache.directory.api.ldap.model.message.SearchScope; +import org.apache.directory.api.ldap.model.message.controls.PagedResults; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.api.util.Strings; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.EntryCursorImpl; @@ -52,16 +62,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.shared.ldap.codec.api.LdapApiService; import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory; import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator; -import org.apache.directory.shared.ldap.model.cursor.EntryCursor; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.message.Control; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.message.SearchRequest; -import org.apache.directory.shared.ldap.model.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.model.message.SearchResultDone; -import org.apache.directory.shared.ldap.model.message.SearchScope; -import org.apache.directory.shared.ldap.model.message.controls.PagedResults; -import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.Rule; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java Wed Dec 19 17:34:07 2012 @@ -43,6 +43,13 @@ import javax.naming.event.ObjectChangeLi import javax.naming.ldap.HasControls; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.ldif.LdifUtils; +import org.apache.directory.api.ldap.model.message.Control; +import org.apache.directory.api.ldap.model.message.controls.ChangeType; +import org.apache.directory.api.ldap.model.message.controls.EntryChange; +import org.apache.directory.api.ldap.model.message.controls.PersistentSearch; +import org.apache.directory.api.ldap.model.message.controls.PersistentSearchImpl; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -55,13 +62,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.api.LdapApiService; import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeDecorator; import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.ldif.LdifUtils; -import org.apache.directory.shared.ldap.model.message.Control; -import org.apache.directory.shared.ldap.model.message.controls.ChangeType; -import org.apache.directory.shared.ldap.model.message.controls.EntryChange; -import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch; -import org.apache.directory.shared.ldap.model.message.controls.PersistentSearchImpl; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.After; import org.junit.Rule; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java Wed Dec 19 17:34:07 2012 @@ -45,15 +45,15 @@ import javax.naming.directory.SearchResu import javax.naming.ldap.LdapContext; import javax.naming.ldap.ManageReferralControl; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.ldif.LdifEntry; +import org.apache.directory.api.ldap.model.ldif.LdifReader; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifReader; import org.junit.Before; import org.junit.Rule; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchMoveAndRenameIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchMoveAndRenameIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchMoveAndRenameIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchMoveAndRenameIT.java Wed Dec 19 17:34:07 2012 @@ -34,15 +34,15 @@ import javax.naming.directory.SearchResu import javax.naming.ldap.LdapContext; import javax.naming.ldap.ManageReferralControl; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.ldif.LdifEntry; +import org.apache.directory.api.ldap.model.ldif.LdifReader; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifReader; import org.junit.Before; import org.junit.Rule; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchNoRevertIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchNoRevertIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchNoRevertIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchNoRevertIT.java Wed Dec 19 17:34:07 2012 @@ -32,6 +32,9 @@ import javax.naming.directory.SearchCont import javax.naming.ldap.LdapContext; import javax.naming.ldap.ManageReferralControl; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.ldif.LdifEntry; +import org.apache.directory.api.ldap.model.ldif.LdifReader; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -42,9 +45,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.annotations.CreatePartition; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifReader; import org.junit.After; import org.junit.Before; import org.junit.Rule; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Wed Dec 19 17:34:07 2012 @@ -46,6 +46,20 @@ import javax.naming.directory.SearchCont import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; +import org.apache.directory.api.ldap.model.constants.SchemaConstants; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.EntryCursor; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.message.Control; +import org.apache.directory.api.ldap.model.message.Response; +import org.apache.directory.api.ldap.model.message.SearchRequest; +import org.apache.directory.api.ldap.model.message.SearchRequestImpl; +import org.apache.directory.api.ldap.model.message.SearchScope; +import org.apache.directory.api.ldap.model.message.controls.Subentries; +import org.apache.directory.api.ldap.model.message.controls.SubentriesImpl; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.LdapNetworkConnection; @@ -54,20 +68,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.EntryCursor; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.message.Control; -import org.apache.directory.shared.ldap.model.message.Response; -import org.apache.directory.shared.ldap.model.message.SearchRequest; -import org.apache.directory.shared.ldap.model.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.model.message.SearchScope; -import org.apache.directory.shared.ldap.model.message.controls.Subentries; -import org.apache.directory.shared.ldap.model.message.controls.SubentriesImpl; -import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.Ignore; import org.junit.Rule; @@ -1738,7 +1738,7 @@ public class SearchIT extends AbstractLd { long sizeLimit = 7; LdapConnection connection = getAdminConnection( getLdapServer() ); - SearchRequest req = new org.apache.directory.shared.ldap.model.message.SearchRequestImpl(); + SearchRequest req = new org.apache.directory.api.ldap.model.message.SearchRequestImpl(); req.setBase( new Dn( "ou=system" ) ); req.setFilter( "(ou=*)" ); req.setScope( SearchScope.SUBTREE ); Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java Wed Dec 19 17:34:07 2012 @@ -23,6 +23,13 @@ package org.apache.directory.server.oper import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import org.apache.directory.api.ldap.model.cursor.EntryCursor; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.message.AliasDerefMode; +import org.apache.directory.api.ldap.model.message.SearchRequest; +import org.apache.directory.api.ldap.model.message.SearchRequestImpl; +import org.apache.directory.api.ldap.model.message.SearchScope; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.ldap.client.api.EntryCursorImpl; import org.apache.directory.ldap.client.api.LdapConnection; @@ -31,13 +38,6 @@ import org.apache.directory.server.annot import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.cursor.EntryCursor; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.message.AliasDerefMode; -import org.apache.directory.shared.ldap.model.message.SearchRequest; -import org.apache.directory.shared.ldap.model.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.model.message.SearchScope; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java Wed Dec 19 17:34:07 2012 @@ -30,6 +30,12 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.io.FileUtils; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.message.SearchRequest; +import org.apache.directory.api.ldap.model.message.SearchRequestImpl; +import org.apache.directory.api.ldap.model.name.Dn; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -47,12 +53,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.replication.SyncReplConfiguration; import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumer; import org.apache.directory.server.ldap.replication.provider.SyncReplRequestHandler; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.message.SearchRequest; -import org.apache.directory.shared.ldap.model.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java Wed Dec 19 17:34:07 2012 @@ -29,6 +29,18 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.directory.api.ldap.model.constants.SchemaConstants; +import org.apache.directory.api.ldap.model.csn.Csn; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.message.ModifyRequest; +import org.apache.directory.api.ldap.model.message.ModifyRequestImpl; +import org.apache.directory.api.ldap.model.message.SearchRequest; +import org.apache.directory.api.ldap.model.message.SearchRequestImpl; +import org.apache.directory.api.ldap.model.message.SearchScope; +import org.apache.directory.api.ldap.model.name.Dn; +import org.apache.directory.api.ldap.model.name.Rdn; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateConsumer; import org.apache.directory.server.annotations.CreateLdapServer; @@ -47,18 +59,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumer; import org.apache.directory.server.ldap.replication.consumer.ReplicationConsumerImpl; import org.apache.directory.server.ldap.replication.provider.SyncReplRequestHandler; -import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.csn.Csn; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.message.ModifyRequest; -import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.model.message.SearchRequest; -import org.apache.directory.shared.ldap.model.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.model.message.SearchScope; -import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.name.Rdn; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java Wed Dec 19 17:34:07 2012 @@ -32,6 +32,35 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.directory.api.ldap.model.constants.SchemaConstants; +import org.apache.directory.api.ldap.model.cursor.EntryCursor; +import org.apache.directory.api.ldap.model.entry.Attribute; +import org.apache.directory.api.ldap.model.entry.DefaultAttribute; +import org.apache.directory.api.ldap.model.entry.DefaultModification; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.entry.Modification; +import org.apache.directory.api.ldap.model.entry.ModificationOperation; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.filter.AndNode; +import org.apache.directory.api.ldap.model.filter.EqualityNode; +import org.apache.directory.api.ldap.model.filter.ExprNode; +import org.apache.directory.api.ldap.model.filter.NotNode; +import org.apache.directory.api.ldap.model.filter.OrNode; +import org.apache.directory.api.ldap.model.filter.PresenceNode; +import org.apache.directory.api.ldap.model.message.IntermediateResponse; +import org.apache.directory.api.ldap.model.message.Response; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.message.SearchRequest; +import org.apache.directory.api.ldap.model.message.SearchRequestImpl; +import org.apache.directory.api.ldap.model.message.SearchResultDone; +import org.apache.directory.api.ldap.model.message.SearchResultEntry; +import org.apache.directory.api.ldap.model.message.SearchResultReference; +import org.apache.directory.api.ldap.model.message.SearchScope; +import org.apache.directory.api.ldap.model.name.Dn; +import org.apache.directory.api.ldap.model.name.Rdn; +import org.apache.directory.api.ldap.model.schema.AttributeType; +import org.apache.directory.api.ldap.model.schema.AttributeTypeOptions; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.ldap.client.api.ConnectionClosedEventListener; import org.apache.directory.ldap.client.api.LdapNetworkConnection; @@ -54,35 +83,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum; import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator; import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueDecorator; -import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.cursor.EntryCursor; -import org.apache.directory.shared.ldap.model.entry.Attribute; -import org.apache.directory.shared.ldap.model.entry.DefaultAttribute; -import org.apache.directory.shared.ldap.model.entry.DefaultModification; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.Modification; -import org.apache.directory.shared.ldap.model.entry.ModificationOperation; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.filter.AndNode; -import org.apache.directory.shared.ldap.model.filter.EqualityNode; -import org.apache.directory.shared.ldap.model.filter.ExprNode; -import org.apache.directory.shared.ldap.model.filter.NotNode; -import org.apache.directory.shared.ldap.model.filter.OrNode; -import org.apache.directory.shared.ldap.model.filter.PresenceNode; -import org.apache.directory.shared.ldap.model.message.IntermediateResponse; -import org.apache.directory.shared.ldap.model.message.Response; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.message.SearchRequest; -import org.apache.directory.shared.ldap.model.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.model.message.SearchResultDone; -import org.apache.directory.shared.ldap.model.message.SearchResultEntry; -import org.apache.directory.shared.ldap.model.message.SearchResultReference; -import org.apache.directory.shared.ldap.model.message.SearchScope; -import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.name.Rdn; -import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1054,7 +1054,7 @@ public class MockSyncReplConsumer implem { String uuid = Strings.uuidToString( limitedUuidList.get( 0 ) ); filter = new EqualityNode( SchemaConstants.ENTRY_UUID_AT, - new org.apache.directory.shared.ldap.model.entry.StringValue( uuid ) ); + new org.apache.directory.api.ldap.model.entry.StringValue( uuid ) ); if ( isRefreshPresent ) { filter = new NotNode( filter ); @@ -1075,7 +1075,7 @@ public class MockSyncReplConsumer implem { String uuid = Strings.uuidToString( limitedUuidList.get( i ) ); ExprNode uuidEqNode = new EqualityNode( SchemaConstants.ENTRY_UUID_AT, - new org.apache.directory.shared.ldap.model.entry.StringValue( uuid ) ); + new org.apache.directory.api.ldap.model.entry.StringValue( uuid ) ); if ( isRefreshPresent ) { Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/schema/SchemaIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/schema/SchemaIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/schema/SchemaIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/schema/SchemaIT.java Wed Dec 19 17:34:07 2012 @@ -43,16 +43,16 @@ import javax.naming.directory.DirContext import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import org.apache.directory.api.ldap.model.name.Dn; +import org.apache.directory.api.ldap.model.schema.AttributeType; +import org.apache.directory.api.ldap.model.schema.ObjectClass; +import org.apache.directory.api.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser; +import org.apache.directory.api.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.ObjectClass; -import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser; -import org.apache.directory.shared.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.Rule; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java Wed Dec 19 17:34:07 2012 @@ -29,6 +29,8 @@ import javax.naming.directory.Attributes import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; +import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; +import org.apache.directory.api.ldap.model.ldif.LdifUtils; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -43,8 +45,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler; import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler; import org.apache.directory.server.operations.bind.BogusNtlmProvider; -import org.apache.directory.shared.ldap.model.constants.SupportedSaslMechanisms; -import org.apache.directory.shared.ldap.model.ldif.LdifUtils; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith;