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 95211D8FD for ; Thu, 20 Dec 2012 13:48:59 +0000 (UTC) Received: (qmail 46753 invoked by uid 500); 20 Dec 2012 13:48:59 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 46690 invoked by uid 500); 20 Dec 2012 13:48:59 -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 46680 invoked by uid 99); 20 Dec 2012 13:48:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Dec 2012 13:48:59 +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; Thu, 20 Dec 2012 13:48:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0810523889B3; Thu, 20 Dec 2012 13:48:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1424463 [2/5] - in /directory: apacheds/branches/apacheds-refact/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/branches/apacheds-refact/core-api/src/main/java/org/apache/directory/server/core/api/schema/... Date: Thu, 20 Dec 2012 13:48:23 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121220134834.0810523889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original) +++ directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Thu Dec 20 13:48:18 2012 @@ -36,10 +36,10 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.filter.GreaterEqNode; import org.apache.directory.api.ldap.model.schema.AttributeType; import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.schemaloader.JarLdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.core.api.subtree.RefinementLeafEvaluator; -import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original) +++ directory/apacheds/branches/apacheds-refact/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Thu Dec 20 13:48:18 2012 @@ -40,15 +40,15 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.schema.normalizers.ConcreteNameComponentNormalizer; import org.apache.directory.api.ldap.model.subtree.SubtreeSpecification; import org.apache.directory.api.ldap.model.subtree.SubtreeSpecificationModifier; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.core.shared.DefaultDnFactory; import org.apache.directory.server.core.api.DnFactory; import org.apache.directory.server.core.api.subtree.SubtreeEvaluator; import org.apache.directory.server.core.api.normalization.FilterNormalizingVisitor; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Thu Dec 20 13:48:18 2012 @@ -37,11 +37,11 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.cursor.Tuple; import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java Thu Dec 20 13:48:18 2012 @@ -36,12 +36,12 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.cursor.Tuple; import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.xdbm.Table; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Thu Dec 20 13:48:18 2012 @@ -35,14 +35,14 @@ import org.apache.directory.api.ldap.mod 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.SchemaManager; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java Thu Dec 20 13:48:18 2012 @@ -30,12 +30,12 @@ import jdbm.RecordManager; import jdbm.recman.BaseRecordManager; import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java Thu Dec 20 13:48:18 2012 @@ -33,16 +33,16 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.api.ldap.model.name.Rdn; import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.constants.ApacheSchemaConstants; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.ParentIdAndRdn; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Thu Dec 20 13:48:18 2012 @@ -47,6 +47,10 @@ import org.apache.directory.api.ldap.mod 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.SchemaManager; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.constants.ApacheSchemaConstants; @@ -61,10 +65,6 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.IndexNotFoundException; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.StoreUtils; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java Thu Dec 20 13:48:18 2012 @@ -34,12 +34,12 @@ import jdbm.recman.BaseRecordManager; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.xdbm.Table; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Thu Dec 20 13:48:18 2012 @@ -38,11 +38,11 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.cursor.Tuple; import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Thu Dec 20 13:48:18 2012 @@ -37,11 +37,11 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.cursor.Tuple; import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Thu Dec 20 13:48:18 2012 @@ -36,12 +36,12 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.cursor.Tuple; import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.xdbm.Table; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Thu Dec 20 13:48:18 2012 @@ -36,12 +36,12 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.api.ldap.model.schema.normalizers.OidNormalizer; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (original) +++ directory/apacheds/branches/apacheds-refact/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java Thu Dec 20 13:48:18 2012 @@ -32,14 +32,14 @@ import org.apache.directory.api.ldap.mod 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.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.core.api.partition.Partition; import org.apache.directory.server.core.partition.impl.btree.jdbm.DupsContainerCursorTest; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.tree.DnNode; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/AdsSchemaLoaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/AdsSchemaLoaderTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/AdsSchemaLoaderTest.java (original) +++ directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/AdsSchemaLoaderTest.java Thu Dec 20 13:48:18 2012 @@ -25,6 +25,7 @@ import static org.junit.Assert.assertTru import static org.junit.Assert.fail; import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.ldap.client.api.DefaultSchemaLoader; import org.apache.directory.ldap.client.api.LdapConnection; @@ -32,7 +33,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.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ServerSchemaLoaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ServerSchemaLoaderTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ServerSchemaLoaderTest.java (original) +++ directory/apacheds/branches/apacheds-refact/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ServerSchemaLoaderTest.java Thu Dec 20 13:48:18 2012 @@ -29,6 +29,7 @@ import static org.junit.Assert.fail; 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.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.DefaultSchemaLoader; @@ -36,7 +37,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.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java (original) +++ directory/apacheds/branches/apacheds-refact/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java Thu Dec 20 13:48:18 2012 @@ -47,6 +47,10 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.normalizers.ConcreteNameComponentNormalizer; import org.apache.directory.api.ldap.model.schema.normalizers.NameComponentNormalizer; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.core.api.CoreSession; import org.apache.directory.server.core.api.DirectoryService; @@ -63,10 +67,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.api.normalization.FilterNormalizingVisitor; import org.apache.directory.server.core.partition.ldif.LdifPartition; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; Modified: directory/apacheds/branches/apacheds-refact/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java (original) +++ directory/apacheds/branches/apacheds-refact/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java Thu Dec 20 13:48:18 2012 @@ -58,6 +58,10 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.normalizers.ConcreteNameComponentNormalizer; import org.apache.directory.api.ldap.model.schema.normalizers.NameComponentNormalizer; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.core.api.CoreSession; @@ -76,10 +80,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.api.normalization.FilterNormalizingVisitor; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java Thu Dec 20 13:48:18 2012 @@ -28,6 +28,8 @@ import java.util.Map; import org.apache.commons.collections.map.LRUMap; import org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator; +import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator; +import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueDecorator; 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.Attribute; @@ -85,8 +87,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum; import org.apache.directory.shared.ldap.extras.controls.SyncStateValue; 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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java Thu Dec 20 13:48:18 2012 @@ -37,6 +37,9 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueDecorator; +import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator; +import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator; 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.Entry; @@ -92,9 +95,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.extras.controls.SyncStateValue; import org.apache.directory.shared.ldap.extras.controls.SynchronizationInfoEnum; import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum; -import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueDecorator; -import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator; -import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplSearchListener.java Thu Dec 20 13:48:18 2012 @@ -20,6 +20,7 @@ package org.apache.directory.server.ldap.replication.provider; +import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator; 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.exception.LdapInvalidAttributeValueException; @@ -48,7 +49,6 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.replication.ReplicaEventMessage; import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum; import org.apache.directory.shared.ldap.extras.controls.SyncStateValue; -import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator; import org.apache.mina.core.future.WriteFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalTest.java (original) +++ directory/apacheds/branches/apacheds-refact/protocol-ldap/src/test/java/org/apache/directory/server/ldap/JournalTest.java Thu Dec 20 13:48:18 2012 @@ -38,15 +38,15 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.message.controls.ChangeType; import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.api.ldap.model.schema.comparators.SerializableComparator; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmTable; import org.apache.directory.server.core.partition.impl.btree.jdbm.StringSerializer; import org.apache.directory.server.ldap.replication.ReplicaEventMessage; import org.apache.directory.server.ldap.replication.ReplicaEventMessageSerializer; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java (original) +++ directory/apacheds/branches/apacheds-refact/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java Thu Dec 20 13:48:18 2012 @@ -35,10 +35,10 @@ import java.util.Map.Entry; import java.util.Stack; import java.util.regex.Pattern; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.ResourceMap; import org.apache.directory.api.util.Strings; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schemaextractor.impl.ResourceMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java (original) +++ directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java Thu Dec 20 13:48:18 2012 @@ -30,14 +30,14 @@ import org.apache.commons.io.FileUtils; 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.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.config.beans.ChangePasswordServerBean; import org.apache.directory.server.config.beans.ConfigBean; import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (original) +++ directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java Thu Dec 20 13:48:18 2012 @@ -30,14 +30,14 @@ import org.apache.commons.io.FileUtils; 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.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.config.beans.ConfigBean; import org.apache.directory.server.config.beans.DirectoryServiceBean; import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java (original) +++ directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java Thu Dec 20 13:48:18 2012 @@ -38,13 +38,13 @@ import org.apache.directory.api.ldap.mod 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.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.config.beans.ConfigBean; import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java (original) +++ directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java Thu Dec 20 13:48:18 2012 @@ -30,14 +30,14 @@ import org.apache.commons.io.FileUtils; 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.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.config.beans.ConfigBean; import org.apache.directory.server.config.beans.HttpServerBean; import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java (original) +++ directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java Thu Dec 20 13:48:18 2012 @@ -30,14 +30,14 @@ import org.apache.commons.io.FileUtils; 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.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.config.beans.ConfigBean; import org.apache.directory.server.config.beans.KdcServerBean; import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java (original) +++ directory/apacheds/branches/apacheds-refact/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java Thu Dec 20 13:48:18 2012 @@ -30,14 +30,14 @@ import org.apache.commons.io.FileUtils; 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.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.config.beans.ConfigBean; import org.apache.directory.server.config.beans.LdapServerBean; import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/IndexIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/IndexIT.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/IndexIT.java (original) +++ directory/apacheds/branches/apacheds-refact/server-integ/src/test/java/org/apache/directory/IndexIT.java Thu Dec 20 13:48:18 2012 @@ -32,16 +32,16 @@ import org.apache.directory.api.ldap.mod 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.SchemaManager; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.Before; 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=1424463&r1=1424462&r2=1424463&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 Thu Dec 20 13:48:18 2012 @@ -34,6 +34,8 @@ import java.util.concurrent.atomic.Atomi import org.apache.directory.api.ldap.codec.api.LdapApiService; import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory; +import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueDecorator; +import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueDecorator; 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; @@ -81,8 +83,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum; import org.apache.directory.shared.ldap.extras.controls.SyncStateValue; 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.slf4j.Logger; import org.slf4j.LoggerFactory; 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=1424463&r1=1424462&r2=1424463&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 Thu Dec 20 13:48:18 2012 @@ -37,6 +37,10 @@ import org.apache.directory.api.ldap.mod 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.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.constants.ApacheSchemaConstants; @@ -52,10 +56,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.schemaextractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/service/ApacheDS.launch URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/ApacheDS.launch?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service/ApacheDS.launch (original) +++ directory/apacheds/branches/apacheds-refact/service/ApacheDS.launch Thu Dec 20 13:48:18 2012 @@ -12,5 +12,5 @@ - + Modified: directory/apacheds/branches/apacheds-refact/service/apacheds.bat URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/apacheds.bat?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service/apacheds.bat (original) +++ directory/apacheds/branches/apacheds-refact/service/apacheds.bat Thu Dec 20 13:48:18 2012 @@ -38,11 +38,11 @@ IF NOT exist target/apacheds-service-2.0 set DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" -set EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" +set EXT_CTRLS="-Dextra.controls=org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" -set DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" +set DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" -set DEF_EXT_OP_RESP="-Ddefault.extendedOperation.responses=org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" +set DEF_EXT_OP_RESP="-Ddefault.extendedOperation.responses=org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" java %DEF_CTRLS% %EXT_CTRLS% %DEF_EXT_OP_REQ% %DEF_EXT_OP_RESP% -Dlog4j.configuration="file:///%cd%/target/instance/conf/log4j.properties" -jar target/apacheds-service-2.0.0-M8.jar %cd%/target/instance Modified: directory/apacheds/branches/apacheds-refact/service/apacheds.sh URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/service/apacheds.sh?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/service/apacheds.sh (original) +++ directory/apacheds/branches/apacheds-refact/service/apacheds.sh Thu Dec 20 13:48:18 2012 @@ -42,10 +42,10 @@ fi DEF_CTRLS="-Ddefault.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" -EXT_CTRLS="-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" +EXT_CTRLS="-Dextra.controls=org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" -DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" +DEF_EXT_OP_REQ="-Ddefault.extendedOperation.requests=org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" -DEF_EXT_OP_RESP="-Ddefault.extendedOperation.responses=org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" +DEF_EXT_OP_RESP="-Ddefault.extendedOperation.responses=org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" java $JAVA_OPTS $DEF_CTRLS $EXT_CTRLS $DEF_EXT_OP_REQ $DEF_EXT_OP_RESP -Dlog4j.configuration=file:./target/instance/conf/log4j.properties -Dapacheds.log.dir=./target/instance/log -jar $JAR ./target/instance 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=1424463&r1=1424462&r2=1424463&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 Thu Dec 20 13:48:18 2012 @@ -47,6 +47,10 @@ import org.apache.directory.api.ldap.mod 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.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.DateUtils; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.config.ConfigPartitionReader; @@ -73,10 +77,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.schemaextractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java (original) +++ directory/apacheds/branches/apacheds-refact/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java Thu Dec 20 13:48:18 2012 @@ -91,20 +91,20 @@ public class FrameworkRunner extends Blo "org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory" ); System.setProperty( StandaloneLdapApiService.EXTRA_CONTROLS_LIST, - "org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," + - "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," + - "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," + - "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," + - "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" ); + "org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," + + "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," + + "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," + + "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," + + "org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory" ); System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST, - "org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory," + - "org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory," + - "org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory," + - "org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" ); + "org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory," + + "org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory," + + "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory," + + "org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory" ); System.setProperty( StandaloneLdapApiService.DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST, - "org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" ); + "org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory" ); } Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java Thu Dec 20 13:48:18 2012 @@ -28,13 +28,13 @@ import java.io.File; import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.api.ldap.model.name.Rdn; import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.xdbm.impl.avl.AvlPartitionTest; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java Thu Dec 20 13:48:18 2012 @@ -46,14 +46,14 @@ import org.apache.directory.api.ldap.mod 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.SchemaManager; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.core.partition.impl.avl.AvlPartition; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; import org.apache.directory.server.xdbm.impl.avl.AvlPartitionTest; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java Thu Dec 20 13:48:18 2012 @@ -47,6 +47,10 @@ import org.apache.directory.api.ldap.mod 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.SchemaManager; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.constants.ApacheSchemaConstants; @@ -56,10 +60,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.IndexNotFoundException; import org.apache.directory.server.xdbm.StoreUtils; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java Thu Dec 20 13:48:18 2012 @@ -32,16 +32,16 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.entry.Entry; import org.apache.directory.api.ldap.model.name.Rdn; import org.apache.directory.api.ldap.model.schema.SchemaManager; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.constants.ApacheSchemaConstants; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.ParentIdAndRdn; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1424463&r1=1424462&r2=1424463&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original) +++ directory/apacheds/branches/apacheds-refact/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Thu Dec 20 13:48:18 2012 @@ -35,6 +35,10 @@ import org.apache.directory.api.ldap.mod import org.apache.directory.api.ldap.model.filter.ExprNode; import org.apache.directory.api.ldap.model.filter.FilterParser; import org.apache.directory.api.ldap.model.name.Dn; +import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.api.util.Strings; import org.apache.directory.api.util.exception.Exceptions; import org.apache.directory.server.core.api.LdapPrincipal; @@ -44,10 +48,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.partition.impl.avl.AvlPartition; import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; -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; -import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;