Author: pamarcelot Date: Tue Jan 18 13:56:20 2011 New Revision: 1060380 URL: http://svn.apache.org/viewvc?rev=1060380&view=rev Log: Fixed two issues related to the OSGI-fication of the Shared modules. Shared-ldap and shared-ldap-schema were sharing a package with the same name. Shared-ldap-schema's 'Import-Package' directive for MANIFEST.MF file was missing explicitely named package names. [Part 2] Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java (original) +++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java Tue Jan 18 13:56:20 2011 @@ -34,11 +34,11 @@ import org.apache.directory.server.core. import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Tue Jan 18 13:56:20 2011 @@ -62,9 +62,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.SchemaEntityFactory; import org.apache.directory.shared.ldap.schema.registries.Schema; import org.apache.directory.shared.ldap.schema.syntaxCheckers.NumericOidSyntaxChecker; +import org.apache.directory.shared.ldap.schemaloader.SchemaEntityFactory; import org.apache.directory.shared.ldap.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Tue Jan 18 13:56:20 2011 @@ -45,8 +45,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.SchemaObject; import org.apache.directory.shared.ldap.schema.SchemaObjectWrapper; -import org.apache.directory.shared.ldap.schema.loader.ldif.SchemaEntityFactory; import org.apache.directory.shared.ldap.schema.registries.Schema; +import org.apache.directory.shared.ldap.schemaloader.SchemaEntityFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Tue Jan 18 13:56:20 2011 @@ -44,9 +44,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.RDN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.SchemaEntityFactory; import org.apache.directory.shared.ldap.schema.registries.Registries; import org.apache.directory.shared.ldap.schema.registries.Schema; +import org.apache.directory.shared.ldap.schemaloader.SchemaEntityFactory; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java Tue Jan 18 13:56:20 2011 @@ -53,10 +53,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.BeforeClass; Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java Tue Jan 18 13:56:20 2011 @@ -56,10 +56,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.BeforeClass; Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java Tue Jan 18 13:56:20 2011 @@ -44,10 +44,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Tue Jan 18 13:56:20 2011 @@ -76,7 +76,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.SyntaxChecker; import org.apache.directory.shared.ldap.schema.comparators.BooleanComparator; -import org.apache.directory.shared.ldap.schema.loader.ldif.SchemaEntityFactory; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimNormalizer; import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription; @@ -89,6 +88,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.syntaxCheckers.OctetStringSyntaxChecker; +import org.apache.directory.shared.ldap.schemaloader.SchemaEntityFactory; import org.apache.directory.shared.ldap.util.Base64; import org.apache.directory.shared.ldap.util.DateUtils; import org.apache.directory.shared.ldap.util.JndiUtils; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java Tue Jan 18 13:56:20 2011 @@ -46,9 +46,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.ldif.LdifReader; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.ResourceMap; +import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; +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/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Tue Jan 18 13:56:20 2011 @@ -42,8 +42,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Tue Jan 18 13:56:20 2011 @@ -43,8 +43,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Tue Jan 18 13:56:20 2011 @@ -56,8 +56,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java Tue Jan 18 13:56:20 2011 @@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Tue Jan 18 13:56:20 2011 @@ -45,8 +45,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java Tue Jan 18 13:56:20 2011 @@ -36,9 +36,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.PresenceNode; import org.apache.directory.shared.ldap.name.NameComponentNormalizer; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer; +import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Tue Jan 18 13:56:20 2011 @@ -32,10 +32,10 @@ import org.apache.directory.junit.tools. import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java Tue Jan 18 13:56:20 2011 @@ -35,10 +35,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Tue Jan 18 13:56:20 2011 @@ -34,8 +34,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.NotNode; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.AfterClass; import org.junit.BeforeClass; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Tue Jan 18 13:56:20 2011 @@ -35,8 +35,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.GreaterEqNode; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.AfterClass; import org.junit.BeforeClass; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Tue Jan 18 13:56:20 2011 @@ -42,11 +42,11 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer; +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.subtree.SubtreeSpecification; import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationModifier; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Tue Jan 18 13:56:20 2011 @@ -37,10 +37,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.cursor.Tuple; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java Tue Jan 18 13:56:20 2011 @@ -38,10 +38,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.cursor.Tuple; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Tue Jan 18 13:56:20 2011 @@ -37,10 +37,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java Tue Jan 18 13:56:20 2011 @@ -30,10 +30,10 @@ import jdbm.RecordManager; import jdbm.recman.BaseRecordManager; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java Tue Jan 18 13:56:20 2011 @@ -37,10 +37,10 @@ import org.apache.directory.server.xdbm. import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.name.RDN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Tue Jan 18 13:56:20 2011 @@ -59,10 +59,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.RDN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java Tue Jan 18 13:56:20 2011 @@ -35,10 +35,10 @@ import org.apache.directory.server.xdbm. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Tue Jan 18 13:56:20 2011 @@ -38,10 +38,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.cursor.Tuple; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Tue Jan 18 13:56:20 2011 @@ -37,10 +37,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.cursor.Tuple; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Tue Jan 18 13:56:20 2011 @@ -37,10 +37,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.cursor.Tuple; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Tue Jan 18 13:56:20 2011 @@ -37,12 +37,12 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer; +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.LdapExceptionUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.BeforeClass; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java Tue Jan 18 13:56:20 2011 @@ -32,12 +32,12 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.InstanceLayout; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.Schema; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.AfterClass; import org.junit.BeforeClass; Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java Tue Jan 18 13:56:20 2011 @@ -31,7 +31,7 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java (original) +++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java Tue Jan 18 13:56:20 2011 @@ -60,11 +60,11 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.NameComponentNormalizer; import org.apache.directory.shared.ldap.name.RDN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer; +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.LdapExceptionUtils; import org.junit.Before; import org.junit.BeforeClass; Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java (original) +++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java Tue Jan 18 13:56:20 2011 @@ -73,11 +73,11 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.NameComponentNormalizer; import org.apache.directory.shared.ldap.name.RDN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer; +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.LdapExceptionUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Before; Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java (original) +++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java Tue Jan 18 13:56:20 2011 @@ -36,8 +36,8 @@ import java.util.Stack; import java.util.regex.Pattern; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.ResourceMap; +import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; +import org.apache.directory.shared.ldap.schemaextractor.impl.ResourceMap; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java (original) +++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java Tue Jan 18 13:56:20 2011 @@ -34,11 +34,11 @@ import org.apache.directory.server.confi import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.AfterClass; import org.junit.BeforeClass; Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (original) +++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java Tue Jan 18 13:56:20 2011 @@ -34,11 +34,11 @@ import org.apache.directory.server.confi import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java (original) +++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java Tue Jan 18 13:56:20 2011 @@ -44,11 +44,11 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java (original) +++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java Tue Jan 18 13:56:20 2011 @@ -34,11 +34,11 @@ import org.apache.directory.server.confi import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java (original) +++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java Tue Jan 18 13:56:20 2011 @@ -34,11 +34,11 @@ import org.apache.directory.server.confi import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java (original) +++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java Tue Jan 18 13:56:20 2011 @@ -34,11 +34,11 @@ import org.apache.directory.server.confi import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java (original) +++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java Tue Jan 18 13:56:20 2011 @@ -34,11 +34,11 @@ import org.apache.directory.server.confi import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java (original) +++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java Tue Jan 18 13:56:20 2011 @@ -34,11 +34,11 @@ import org.apache.directory.server.confi import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java (original) +++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java Tue Jan 18 13:56:20 2011 @@ -34,11 +34,11 @@ import org.apache.directory.server.confi import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original) +++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Tue Jan 18 13:56:20 2011 @@ -49,11 +49,11 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original) +++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Tue Jan 18 13:56:20 2011 @@ -66,14 +66,14 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.SchemaLoader; import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSyntaxChecker; import org.apache.directory.shared.ldap.schema.syntaxCheckers.GeneralizedTimeSyntaxChecker; import org.apache.directory.shared.ldap.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; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.DateUtils; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.slf4j.Logger; Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java Tue Jan 18 13:56:20 2011 @@ -46,10 +46,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1060380&r1=1060379&r2=1060380&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java Tue Jan 18 13:56:20 2011 @@ -36,10 +36,10 @@ import org.apache.directory.server.xdbm. import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.name.RDN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; +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.LdapExceptionUtils; import org.junit.After; import org.junit.Before;