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 01130DAA8 for ; Wed, 19 Dec 2012 17:36:18 +0000 (UTC) Received: (qmail 97144 invoked by uid 500); 19 Dec 2012 17:36:17 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 97104 invoked by uid 500); 19 Dec 2012 17:36:17 -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 97096 invoked by uid 99); 19 Dec 2012 17:36:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2012 17:36:17 +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:36:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 889612388A40; 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 [15/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.889612388A40@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/ssl/LdapsUpdateCertificateIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java Wed Dec 19 17:34:07 2012 @@ -31,6 +31,9 @@ import javax.naming.directory.DirContext import javax.naming.directory.InitialDirContext; import javax.naming.directory.ModificationItem; +import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; +import org.apache.directory.api.ldap.model.entry.Entry; +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.server.annotations.CreateLdapServer; @@ -47,9 +50,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.entry.Entry; -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/ssl/StartTlsConfidentialityIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java Wed Dec 19 17:34:07 2012 @@ -52,6 +52,8 @@ import javax.naming.ldap.StartTlsRespons import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -61,8 +63,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.handlers.extended.StartTlsHandler; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.name.Dn; 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/ssl/StartTlsIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java Wed Dec 19 17:34:07 2012 @@ -45,6 +45,8 @@ import javax.naming.ldap.StartTlsRespons import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.junit.tools.MultiThreadedMultiInvoker; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; @@ -53,8 +55,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.ldap.handlers.extended.StartTlsHandler; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.name.Dn; 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/ssl/StartTlsUpdateCertificateIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java Wed Dec 19 17:34:07 2012 @@ -42,6 +42,8 @@ import javax.naming.ldap.StartTlsRespons import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; +import org.apache.directory.api.ldap.model.entry.Entry; +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.server.annotations.CreateLdapServer; @@ -52,8 +54,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.security.TlsKeyGenerator; import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.After; import org.junit.Before; import org.junit.Rule; Modified: directory/apacheds/branches/apacheds-refact/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original) +++ directory/apacheds/branches/apacheds-refact/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Wed Dec 19 17:34:07 2012 @@ -32,6 +32,11 @@ import java.util.Set; import javax.naming.NamingException; import org.apache.commons.lang.StringUtils; +import org.apache.directory.api.ldap.model.constants.SchemaConstants; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.name.Dn; +import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.constants.ApacheSchemaConstants; @@ -47,11 +52,6 @@ import org.apache.directory.server.i18n. import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.protocol.shared.store.LdifFileLoader; import org.apache.directory.server.protocol.shared.store.LdifLoadFilter; -import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; -import org.apache.directory.shared.ldap.model.schema.registries.SchemaLoader; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader; Modified: directory/apacheds/branches/apacheds-refact/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java (original) +++ directory/apacheds/branches/apacheds-refact/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java Wed Dec 19 17:34:07 2012 @@ -32,6 +32,16 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; +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.exception.LdapInvalidDnException; +import org.apache.directory.api.ldap.model.ldif.LdapLdifException; +import org.apache.directory.api.ldap.model.ldif.LdifEntry; +import org.apache.directory.api.ldap.model.ldif.LdifReader; +import org.apache.directory.api.ldap.model.message.AliasDerefMode; +import org.apache.directory.api.ldap.model.message.SearchScope; +import org.apache.directory.api.ldap.model.schema.AttributeType; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.server.config.ConfigSchemaConstants; import org.apache.directory.server.config.ConfigurationException; @@ -98,16 +108,6 @@ import org.apache.directory.server.proto import org.apache.directory.server.protocol.shared.transport.UdpTransport; import org.apache.directory.server.xdbm.Index; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; -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.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.model.ldif.LdapLdifException; -import org.apache.directory.shared.ldap.model.ldif.LdifEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifReader; -import org.apache.directory.shared.ldap.model.message.AliasDerefMode; -import org.apache.directory.shared.ldap.model.message.SearchScope; -import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -593,7 +593,7 @@ public class ServiceBuilder * * @param ntpServerBean The NtpServerBean containing the NtpServer configuration * @return Instance of NtpServer - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ public static NtpServer createNtpServer( NtpServerBean ntpServerBean, DirectoryService directoryService ) throws LdapException @@ -650,7 +650,7 @@ public class ServiceBuilder * * @param kdcServerBean The KdcServerBean containing the KdcServer configuration * @return Instance of KdcServer - * @throws org.apache.directory.shared.ldap.model.exception.LdapException + * @throws org.apache.directory.api.ldap.model.exception.LdapException */ public static KdcServer createKdcServer( KdcServerBean kdcServerBean, DirectoryService directoryService ) throws LdapException Modified: directory/apacheds/branches/apacheds-refact/service/src/main/java/org/apache/directory/server/ApacheDsService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original) +++ directory/apacheds/branches/apacheds-refact/service/src/main/java/org/apache/directory/server/ApacheDsService.java Wed Dec 19 17:34:07 2012 @@ -28,6 +28,25 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.apache.directory.api.ldap.model.constants.SchemaConstants; +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.filter.ExprNode; +import org.apache.directory.api.ldap.model.filter.PresenceNode; +import org.apache.directory.api.ldap.model.message.AliasDerefMode; +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.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.ldap.model.schema.registries.SchemaLoader; +import org.apache.directory.api.ldap.model.schema.syntaxCheckers.CsnSyntaxChecker; +import org.apache.directory.api.ldap.model.schema.syntaxCheckers.GeneralizedTimeSyntaxChecker; +import org.apache.directory.api.ldap.model.schema.syntaxCheckers.UuidSyntaxChecker; import org.apache.directory.api.util.DateUtils; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.config.ConfigPartitionReader; @@ -54,25 +73,6 @@ import org.apache.directory.server.integ import org.apache.directory.server.kerberos.kdc.KdcServer; import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.ntp.NtpServer; -import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -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.filter.ExprNode; -import org.apache.directory.shared.ldap.model.filter.PresenceNode; -import org.apache.directory.shared.ldap.model.message.AliasDerefMode; -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.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; -import org.apache.directory.shared.ldap.model.schema.registries.SchemaLoader; -import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.CsnSyntaxChecker; -import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.GeneralizedTimeSyntaxChecker; -import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.UuidSyntaxChecker; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader; Modified: directory/apacheds/branches/apacheds-refact/service/src/test/java/org/apache/directory/server/UberJarMainTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/src/test/java/org/apache/directory/server/UberJarMainTest.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service/src/test/java/org/apache/directory/server/UberJarMainTest.java (original) +++ directory/apacheds/branches/apacheds-refact/service/src/test/java/org/apache/directory/server/UberJarMainTest.java Wed Dec 19 17:34:07 2012 @@ -26,13 +26,13 @@ import java.io.File; import java.util.Calendar; import org.apache.commons.io.FileUtils; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.ldap.client.api.LdapConnectionConfig; import org.apache.directory.ldap.client.api.LdapNetworkConnection; import org.apache.directory.server.constants.ServerDNConstants; import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.shared.ldap.codec.api.SchemaBinaryAttributeDetector; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java (original) +++ directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java Wed Dec 19 17:34:07 2012 @@ -20,14 +20,14 @@ package org.apache.directory.server.core.integ; +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.exception.LdapOperationErrorException; import org.apache.directory.server.core.api.filtering.EntryFilter; import org.apache.directory.server.core.api.filtering.EntryFilteringCursor; import org.apache.directory.server.core.api.interceptor.BaseInterceptor; import org.apache.directory.server.core.api.interceptor.Interceptor; import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; -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.exception.LdapOperationErrorException; /** Modified: directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java (original) +++ directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java Wed Dec 19 17:34:07 2012 @@ -22,9 +22,9 @@ package org.apache.directory.server.core import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.annotations.CreateDS; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java (original) +++ directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java Wed Dec 19 17:34:07 2012 @@ -21,9 +21,9 @@ package org.apache.directory.server.core import static org.junit.Assert.assertTrue; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.annotations.CreateDS; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java (original) +++ directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java Wed Dec 19 17:34:07 2012 @@ -22,8 +22,8 @@ package org.apache.directory.server.core import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.server.core.annotations.ApplyLdifFiles; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java (original) +++ directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java Wed Dec 19 17:34:07 2012 @@ -21,8 +21,8 @@ package org.apache.directory.server.core import static org.junit.Assert.assertTrue; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.server.core.annotations.ApplyLdifFiles; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java (original) +++ directory/apacheds/branches/apacheds-refact/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java Wed Dec 19 17:34:07 2012 @@ -22,10 +22,10 @@ package org.apache.directory.server.core import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import org.apache.directory.api.ldap.model.name.Dn; import org.apache.directory.server.annotations.CreateLdapServer; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ApplyLdifFiles; -import org.apache.directory.shared.ldap.model.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java Wed Dec 19 17:34:07 2012 @@ -22,6 +22,9 @@ package org.apache.directory.server.core import java.net.URI; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.model.schema.comparators.UuidComparator; import org.apache.directory.server.constants.ApacheSchemaConstants; import org.apache.directory.server.core.api.partition.Partition; import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition; @@ -34,9 +37,6 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.search.impl.DefaultSearchEngine; import org.apache.directory.server.xdbm.search.impl.EvaluatorBuilder; import org.apache.directory.server.xdbm.search.impl.NoOpOptimizer; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; -import org.apache.directory.shared.ldap.model.schema.comparators.UuidComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Wed Dec 19 17:34:07 2012 @@ -33,6 +33,29 @@ import java.util.concurrent.atomic.Atomi import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +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.entry.Attribute; +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.Value; +import org.apache.directory.api.ldap.model.exception.LdapAliasDereferencingException; +import org.apache.directory.api.ldap.model.exception.LdapAliasException; +import org.apache.directory.api.ldap.model.exception.LdapContextNotEmptyException; +import org.apache.directory.api.ldap.model.exception.LdapEntryAlreadyExistsException; +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.LdapNoSuchObjectException; +import org.apache.directory.api.ldap.model.exception.LdapOperationErrorException; +import org.apache.directory.api.ldap.model.exception.LdapSchemaViolationException; +import org.apache.directory.api.ldap.model.exception.LdapUnwillingToPerformException; +import org.apache.directory.api.ldap.model.message.ResultCodeEnum; +import org.apache.directory.api.ldap.model.name.Ava; +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.MatchingRule; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.MultiException; import org.apache.directory.server.constants.ApacheSchemaConstants; @@ -62,29 +85,6 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.search.Optimizer; import org.apache.directory.server.xdbm.search.PartitionSearchResult; import org.apache.directory.server.xdbm.search.SearchEngine; -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.entry.Attribute; -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.Value; -import org.apache.directory.shared.ldap.model.exception.LdapAliasDereferencingException; -import org.apache.directory.shared.ldap.model.exception.LdapAliasException; -import org.apache.directory.shared.ldap.model.exception.LdapContextNotEmptyException; -import org.apache.directory.shared.ldap.model.exception.LdapEntryAlreadyExistsException; -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.LdapNoSuchObjectException; -import org.apache.directory.shared.ldap.model.exception.LdapOperationErrorException; -import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException; -import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; -import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.name.Ava; -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.MatchingRule; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java Wed Dec 19 17:34:07 2012 @@ -19,7 +19,7 @@ package org.apache.directory.server.core.partition.impl.btree; -import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java Wed Dec 19 17:34:07 2012 @@ -22,16 +22,16 @@ package org.apache.directory.server.core import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.AbstractCursor; +import org.apache.directory.api.ldap.model.cursor.ClosureMonitor; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +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.filter.ExprNode; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.search.Evaluator; import org.apache.directory.server.xdbm.search.PartitionSearchResult; -import org.apache.directory.shared.ldap.model.cursor.AbstractCursor; -import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -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.filter.ExprNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java Wed Dec 19 17:34:07 2012 @@ -20,7 +20,7 @@ package org.apache.directory.server.core.partition.impl.btree; -import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Wed Dec 19 17:34:07 2012 @@ -24,14 +24,14 @@ import java.io.IOException; import java.util.Iterator; import org.apache.directory.api.i18n.I18n; +import org.apache.directory.api.ldap.model.cursor.ClosureMonitor; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.CursorIterator; +import org.apache.directory.api.ldap.model.cursor.Tuple; +import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexEntry; -import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.CursorIterator; -import org.apache.directory.shared.ldap.model.cursor.Tuple; -import org.apache.directory.shared.ldap.model.exception.LdapException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java Wed Dec 19 17:34:07 2012 @@ -26,9 +26,9 @@ import java.util.regex.Pattern; import javax.naming.NamingEnumeration; import javax.naming.NamingException; +import org.apache.directory.api.ldap.model.cursor.Tuple; import org.apache.directory.api.util.exception.NotImplementedException; import org.apache.directory.server.xdbm.IndexEntry; -import org.apache.directory.shared.ldap.model.cursor.Tuple; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java Wed Dec 19 17:34:07 2012 @@ -20,7 +20,7 @@ package org.apache.directory.server.core.partition.impl.btree; -import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java Wed Dec 19 17:34:07 2012 @@ -19,7 +19,7 @@ package org.apache.directory.server.core.partition.impl.btree; -import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java Wed Dec 19 17:34:07 2012 @@ -20,7 +20,7 @@ package org.apache.directory.server.core.partition.impl.btree; -import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java Wed Dec 19 17:34:07 2012 @@ -22,7 +22,7 @@ package org.apache.directory.server.core import java.io.Serializable; -import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java Wed Dec 19 17:34:07 2012 @@ -20,8 +20,8 @@ package org.apache.directory.server.xdbm; +import org.apache.directory.api.ldap.model.schema.AttributeType; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.model.schema.AttributeType; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java Wed Dec 19 17:34:07 2012 @@ -22,9 +22,9 @@ package org.apache.directory.server.xdbm import java.io.IOException; -import org.apache.directory.shared.ldap.model.cursor.AbstractCursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.cursor.AbstractCursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.exception.LdapException; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractTable.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractTable.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractTable.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractTable.java Wed Dec 19 17:34:07 2012 @@ -23,8 +23,8 @@ package org.apache.directory.server.xdbm import java.io.IOException; import java.util.Comparator; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java Wed Dec 19 17:34:07 2012 @@ -21,10 +21,10 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException; +import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -import org.apache.directory.shared.ldap.model.exception.LdapException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java Wed Dec 19 17:34:07 2012 @@ -22,9 +22,9 @@ package org.apache.directory.server.xdbm import java.net.URI; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.schema.AttributeType; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.schema.AttributeType; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java Wed Dec 19 17:34:07 2012 @@ -20,8 +20,8 @@ package org.apache.directory.server.xdbm; -import org.apache.directory.shared.ldap.model.cursor.Tuple; -import org.apache.directory.shared.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.cursor.Tuple; +import org.apache.directory.api.ldap.model.entry.Entry; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java Wed Dec 19 17:34:07 2012 @@ -21,14 +21,14 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.AbstractCursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException; +import org.apache.directory.api.ldap.model.cursor.Tuple; +import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.server.core.avltree.ArrayTree; import org.apache.directory.server.core.avltree.ArrayTreeCursor; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.model.cursor.AbstractCursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -import org.apache.directory.shared.ldap.model.cursor.Tuple; -import org.apache.directory.shared.ldap.model.exception.LdapException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/MasterTable.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/MasterTable.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/MasterTable.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/MasterTable.java Wed Dec 19 17:34:07 2012 @@ -20,7 +20,7 @@ package org.apache.directory.server.xdbm; -import org.apache.directory.shared.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.entry.Entry; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java Wed Dec 19 17:34:07 2012 @@ -27,7 +27,7 @@ import java.io.ObjectOutput; import java.util.Arrays; import java.util.List; -import org.apache.directory.shared.ldap.model.name.Rdn; +import org.apache.directory.api.ldap.model.name.Rdn; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java Wed Dec 19 17:34:07 2012 @@ -21,7 +21,7 @@ package org.apache.directory.server.xdbm; -import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java Wed Dec 19 17:34:07 2012 @@ -21,10 +21,10 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException; +import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -import org.apache.directory.shared.ldap.model.exception.LdapException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Wed Dec 19 17:34:07 2012 @@ -27,14 +27,14 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import org.apache.directory.api.ldap.model.constants.SchemaConstants; +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.exception.LdapException; +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.server.constants.ApacheSchemaConstants; -import org.apache.directory.shared.ldap.model.constants.SchemaConstants; -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.exception.LdapException; -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; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Table.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Table.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Table.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Table.java Wed Dec 19 17:34:07 2012 @@ -22,8 +22,8 @@ package org.apache.directory.server.xdbm import java.util.Comparator; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.Tuple; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.Tuple; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java Wed Dec 19 17:34:07 2012 @@ -22,21 +22,21 @@ package org.apache.directory.server.xdbm import java.net.URI; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.EmptyCursor; +import org.apache.directory.api.ldap.model.cursor.Tuple; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.schema.AttributeType; +import org.apache.directory.api.ldap.model.schema.LdapComparator; +import org.apache.directory.api.ldap.model.schema.MatchingRule; +import org.apache.directory.api.ldap.model.schema.Normalizer; +import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.model.schema.comparators.UuidComparator; import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.AbstractIndex; import org.apache.directory.server.xdbm.EmptyIndexCursor; import org.apache.directory.server.xdbm.IndexEntry; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.EmptyCursor; -import org.apache.directory.shared.ldap.model.cursor.Tuple; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; -import org.apache.directory.shared.ldap.model.schema.MatchingRule; -import org.apache.directory.shared.ldap.model.schema.Normalizer; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; -import org.apache.directory.shared.ldap.model.schema.comparators.UuidComparator; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java Wed Dec 19 17:34:07 2012 @@ -23,8 +23,8 @@ package org.apache.directory.server.xdbm import java.util.Comparator; import java.util.UUID; +import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.server.xdbm.MasterTable; -import org.apache.directory.shared.ldap.model.entry.Entry; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java Wed Dec 19 17:34:07 2012 @@ -21,14 +21,14 @@ package org.apache.directory.server.xdbm.impl.avl; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.schema.AttributeType; +import org.apache.directory.api.ldap.model.schema.MatchingRule; +import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.model.schema.comparators.UuidComparator; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.ParentIdAndRdn; import org.apache.directory.server.xdbm.ParentIdAndRdnComparator; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.MatchingRule; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; -import org.apache.directory.shared.ldap.model.schema.comparators.UuidComparator; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java Wed Dec 19 17:34:07 2012 @@ -22,6 +22,11 @@ package org.apache.directory.server.xdbm import java.util.Comparator; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.EmptyCursor; +import org.apache.directory.api.ldap.model.cursor.SingletonCursor; +import org.apache.directory.api.ldap.model.cursor.Tuple; +import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.server.core.avltree.AvlSingletonOrOrderedSetCursor; import org.apache.directory.server.core.avltree.AvlTree; import org.apache.directory.server.core.avltree.AvlTreeCursor; @@ -32,11 +37,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.avltree.LinkedAvlMapNode; import org.apache.directory.server.core.avltree.SingletonOrOrderedSet; import org.apache.directory.server.xdbm.AbstractTable; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.EmptyCursor; -import org.apache.directory.shared.ldap.model.cursor.SingletonCursor; -import org.apache.directory.shared.ldap.model.cursor.Tuple; -import org.apache.directory.shared.ldap.model.exception.LdapException; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java Wed Dec 19 17:34:07 2012 @@ -22,17 +22,17 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.AbstractCursor; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException; +import org.apache.directory.api.ldap.model.cursor.SingletonCursor; +import org.apache.directory.api.ldap.model.cursor.Tuple; +import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.server.core.avltree.AvlSingletonOrOrderedSetCursor; import org.apache.directory.server.core.avltree.AvlTree; import org.apache.directory.server.core.avltree.AvlTreeCursor; import org.apache.directory.server.core.avltree.SingletonOrOrderedSet; -import org.apache.directory.shared.ldap.model.cursor.AbstractCursor; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -import org.apache.directory.shared.ldap.model.cursor.SingletonCursor; -import org.apache.directory.shared.ldap.model.cursor.Tuple; -import org.apache.directory.shared.ldap.model.exception.LdapException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java Wed Dec 19 17:34:07 2012 @@ -20,10 +20,10 @@ package org.apache.directory.server.xdbm.search; +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.filter.ExprNode; import org.apache.directory.server.xdbm.IndexEntry; -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.filter.ExprNode; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java Wed Dec 19 17:34:07 2012 @@ -20,7 +20,7 @@ package org.apache.directory.server.xdbm.search; -import org.apache.directory.shared.ldap.model.filter.ExprNode; +import org.apache.directory.api.ldap.model.filter.ExprNode; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/PartitionSearchResult.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/PartitionSearchResult.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/PartitionSearchResult.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/PartitionSearchResult.java Wed Dec 19 17:34:07 2012 @@ -22,11 +22,11 @@ package org.apache.directory.server.xdbm import java.util.Set; +import org.apache.directory.api.ldap.model.cursor.SetCursor; +import org.apache.directory.api.ldap.model.filter.ExprNode; +import org.apache.directory.api.ldap.model.message.AliasDerefMode; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.server.xdbm.IndexEntry; -import org.apache.directory.shared.ldap.model.cursor.SetCursor; -import org.apache.directory.shared.ldap.model.filter.ExprNode; -import org.apache.directory.shared.ldap.model.message.AliasDerefMode; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java Wed Dec 19 17:34:07 2012 @@ -20,10 +20,10 @@ package org.apache.directory.server.xdbm.search; +import org.apache.directory.api.ldap.model.constants.JndiPropertyConstants; +import org.apache.directory.api.ldap.model.filter.ExprNode; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; -import org.apache.directory.shared.ldap.model.constants.JndiPropertyConstants; -import org.apache.directory.shared.ldap.model.filter.ExprNode; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; /** Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AllEntriesCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AllEntriesCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AllEntriesCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AllEntriesCursor.java Wed Dec 19 17:34:07 2012 @@ -22,13 +22,13 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.Store; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.exception.LdapException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AndCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AndCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AndCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AndCursor.java Wed Dec 19 17:34:07 2012 @@ -25,16 +25,16 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.filter.ExprNode; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.search.Evaluator; import org.apache.directory.server.xdbm.search.impl.ScanCountComparator; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.filter.ExprNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java Wed Dec 19 17:34:07 2012 @@ -22,19 +22,19 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.entry.Value; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.schema.AttributeType; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.search.evaluator.ApproximateEvaluator; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.Value; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java Wed Dec 19 17:34:07 2012 @@ -22,14 +22,14 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.exception.LdapException; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.ParentIdAndRdn; import org.apache.directory.server.xdbm.Store; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.exception.LdapException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java Wed Dec 19 17:34:07 2012 @@ -23,15 +23,15 @@ package org.apache.directory.server.xdbm import java.io.IOException; import org.apache.commons.collections.ArrayStack; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.name.Rdn; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.ParentIdAndRdn; import org.apache.directory.server.xdbm.Store; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.name.Rdn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java Wed Dec 19 17:34:07 2012 @@ -22,19 +22,19 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException; +import org.apache.directory.api.ldap.model.entry.Entry; +import org.apache.directory.api.ldap.model.entry.Value; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.schema.AttributeType; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.search.evaluator.EqualityEvaluator; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.Value; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java Wed Dec 19 17:34:07 2012 @@ -22,18 +22,18 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException; +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.schema.AttributeType; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.search.evaluator.GreaterEqEvaluator; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -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.schema.AttributeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java?rev=1423973&r1=1423972&r2=1423973&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java Wed Dec 19 17:34:07 2012 @@ -22,18 +22,18 @@ package org.apache.directory.server.xdbm import java.io.IOException; +import org.apache.directory.api.ldap.model.cursor.Cursor; +import org.apache.directory.api.ldap.model.cursor.CursorException; +import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException; +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.schema.AttributeType; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.AbstractIndexCursor; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.search.evaluator.LessEqEvaluator; -import org.apache.directory.shared.ldap.model.cursor.Cursor; -import org.apache.directory.shared.ldap.model.cursor.CursorException; -import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; -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.schema.AttributeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory;