You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/12/18 16:17:44 UTC
svn commit: r1646475 - in /directory/shared/trunk/ldap/schema: converter/
converter/src/main/antlr/
converter/src/main/java/org/apache/directory/api/converter/
converter/src/main/java/org/apache/directory/api/ldap/
converter/src/main/java/org/apache/di...
Author: elecharny
Date: Thu Dec 18 15:17:43 2014
New Revision: 1646475
URL: http://svn.apache.org/r1646475
Log:
Applied the package changes exposed in DIRAPI-212
Added:
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/AttributeTypeHolder.java
- copied, changed from r1646473, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/AttributeTypeHolder.java
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ObjectClassHolder.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/ObjectClassHolder.java
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ParserException.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/ParserException.java
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/Schema.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/Schema.java
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElement.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaElement.java
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElementImpl.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaElementImpl.java
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaParser.java
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaToLdif.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaToLdif.java
directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/ldap/
directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/ldap/schema/
directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/ldap/schema/converter/
directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/ldap/schema/converter/TestSchemaToLdif.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/converter/schema/TestSchemaToLdif.java
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/test.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/test.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/test2.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/test2.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATCollective.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATCollective.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATDesc.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATDesc.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATDescWithEscaped.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATDescWithEscaped.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATEquality.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATEquality.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATEqualityOID.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATEqualityOID.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATMinimal.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATMinimal.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATName2.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATName2.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATNameMany.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATNameMany.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATNameOne.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATNameOne.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATNoName.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATNoName.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATNoUserModification.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATNoUserModification.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATObsolete.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATObsolete.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATOrdering.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATOrdering.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATOrderingOID.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATOrderingOID.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATSingleValue.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATSingleValue.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATSubstr.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATSubstr.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATSubstrOID.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATSubstrOID.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATSup.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATSup.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATSupOID.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATSupOID.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATSyntax.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATSyntax.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATSyntaxOidLen.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATSyntaxOidLen.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATUsageDirOp.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATUsageDirOp.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATUsageDistrOp.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATUsageDistrOp.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATUsageDsaOp.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATUsageDsaOp.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testATUsageUserApp.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testATUsageUserApp.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testMozillaATWithOidLen.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testMozillaATWithOidLen.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOC.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOC.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCAbstract.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCAbstract.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCAuxiliary.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCAuxiliary.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCDesc.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCDesc.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCMay2.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCMay2.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCMayMany.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCMayMany.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCMayOne.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCMayOne.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCMinimal.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCMinimal.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCMust2.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCMust2.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCMustMany.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCMustMany.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCMustOne.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCMustOne.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCName2.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCName2.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCNameMany.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCNameMany.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCNameOne.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCNameOne.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCNoName.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCNoName.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCObsolete.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCObsolete.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCSup2.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCSup2.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCSupMany.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCSupMany.schema
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/ldap/schema/converter/testOCSupOne.schema
- copied unchanged from r1645925, directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/schema/testOCSupOne.schema
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractor.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/SchemaLdifExtractor.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/UniqueResourceException.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/UniqueResourceException.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/DefaultSchemaLdifExtractor.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/DefaultSchemaLdifExtractor.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/ResourceMap.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/ResourceMap.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/AttributeClassLoader.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/EntityFactory.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/EntityFactory.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoader.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/JarLdifSchemaLoader.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoader.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/LdifSchemaLoader.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/SchemaEntityFactory.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SingleLdifSchemaLoader.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/SingleLdifSchemaLoader.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManager.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/impl/DefaultSchemaManager.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/extractor/
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractorTest.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaextractor/impl/SchemaLdifExtractorTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoaderTest.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/JarLdifSchemaLoaderTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoaderTest.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/LdifSchemaLoaderTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/MatchingRuleTest.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/MatchingRuleTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerAddTest.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerAddTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerDelTest.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerDelTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadWithDepsTest.java
- copied, changed from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java
Removed:
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/
directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/converter/
directory/shared/trunk/ldap/schema/converter/src/test/resources/org/apache/directory/api/converter/
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaextractor/
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/
Modified:
directory/shared/trunk/ldap/schema/converter/pom.xml
directory/shared/trunk/ldap/schema/converter/src/main/antlr/schemaConverter.g
Modified: directory/shared/trunk/ldap/schema/converter/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/pom.xml?rev=1646475&r1=1646474&r2=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/pom.xml (original)
+++ directory/shared/trunk/ldap/schema/converter/pom.xml Thu Dec 18 15:17:43 2014
@@ -113,7 +113,7 @@
<instructions>
<Bundle-SymbolicName>${project.groupId}.ldap.schema.converter</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.api.converter.schema;version="${project.version}";-noimport:=true
+ org.apache.directory.api.ldap.schema.converter;version="${project.version}";-noimport:=true
</Export-Package>
<Import-Package>
<![CDATA[
Modified: directory/shared/trunk/ldap/schema/converter/src/main/antlr/schemaConverter.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/antlr/schemaConverter.g?rev=1646475&r1=1646474&r2=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/antlr/schemaConverter.g (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/antlr/schemaConverter.g Thu Dec 18 15:17:43 2014
@@ -33,13 +33,13 @@ header {
* Keep the semicolon right next to the package name or else there will be a
* bug that comes into the foreground in the new antlr release.
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
import java.util.List ;
import java.util.ArrayList ;
import java.util.Collections;
import java.io.IOException;
-import org.apache.directory.api.converter.schema.SchemaElement;
+import org.apache.directory.api.ldap.schema.converter.SchemaElement;
import org.apache.directory.api.ldap.model.schema.UsageEnum;
import org.apache.directory.api.ldap.model.schema.ObjectClassTypeEnum;
}
Copied: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/AttributeTypeHolder.java (from r1646473, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/AttributeTypeHolder.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/AttributeTypeHolder.java?p2=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/AttributeTypeHolder.java&p1=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/AttributeTypeHolder.java&r1=1646473&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/AttributeTypeHolder.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/AttributeTypeHolder.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
Copied: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ObjectClassHolder.java (from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/ObjectClassHolder.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ObjectClassHolder.java?p2=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ObjectClassHolder.java&p1=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/ObjectClassHolder.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/ObjectClassHolder.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ObjectClassHolder.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
import java.util.ArrayList;
Copied: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ParserException.java (from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/ParserException.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ParserException.java?p2=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ParserException.java&p1=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/ParserException.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/ParserException.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/ParserException.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
/**
Copied: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/Schema.java (from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/Schema.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/Schema.java?p2=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/Schema.java&p1=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/Schema.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/Schema.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/Schema.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
import java.io.InputStream;
Copied: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElement.java (from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaElement.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElement.java?p2=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElement.java&p1=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaElement.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaElement.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElement.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
import java.util.List;
Copied: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElementImpl.java (from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaElementImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElementImpl.java?p2=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElementImpl.java&p1=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaElementImpl.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaElementImpl.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaElementImpl.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
import org.apache.directory.api.ldap.model.entry.Attribute;
Copied: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java (from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java?p2=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java&p1=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaParser.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaParser.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
import java.io.ByteArrayInputStream;
Copied: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaToLdif.java (from r1645796, directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaToLdif.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaToLdif.java?p2=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaToLdif.java&p1=directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaToLdif.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/converter/schema/SchemaToLdif.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaToLdif.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
import org.apache.directory.api.i18n.I18n;
Copied: directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/ldap/schema/converter/TestSchemaToLdif.java (from r1645796, directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/converter/schema/TestSchemaToLdif.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/ldap/schema/converter/TestSchemaToLdif.java?p2=directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/ldap/schema/converter/TestSchemaToLdif.java&p1=directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/converter/schema/TestSchemaToLdif.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/converter/schema/TestSchemaToLdif.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/api/ldap/schema/converter/TestSchemaToLdif.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.converter.schema;
+package org.apache.directory.api.ldap.schema.converter;
import static org.junit.Assert.assertEquals;
@@ -31,9 +31,9 @@ import java.util.List;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.api.converter.schema.ParserException;
-import org.apache.directory.api.converter.schema.Schema;
-import org.apache.directory.api.converter.schema.SchemaToLdif;
+import org.apache.directory.api.ldap.schema.converter.ParserException;
+import org.apache.directory.api.ldap.schema.converter.Schema;
+import org.apache.directory.api.ldap.schema.converter.SchemaToLdif;
import org.junit.Test;
import org.junit.runner.RunWith;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractor.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/SchemaLdifExtractor.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractor.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractor.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/SchemaLdifExtractor.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/SchemaLdifExtractor.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractor.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaextractor;
+package org.apache.directory.api.ldap.schema.extractor;
import java.io.IOException;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/UniqueResourceException.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/UniqueResourceException.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/UniqueResourceException.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/UniqueResourceException.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/UniqueResourceException.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/UniqueResourceException.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/UniqueResourceException.java Thu Dec 18 15:17:43 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.directory.api.ldap.schemaextractor;
+package org.apache.directory.api.ldap.schema.extractor;
import java.net.URL;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/DefaultSchemaLdifExtractor.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/DefaultSchemaLdifExtractor.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/DefaultSchemaLdifExtractor.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/DefaultSchemaLdifExtractor.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/DefaultSchemaLdifExtractor.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/DefaultSchemaLdifExtractor.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/DefaultSchemaLdifExtractor.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaextractor.impl;
+package org.apache.directory.api.ldap.schema.extractor.impl;
import java.io.File;
@@ -41,8 +41,8 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.ldif.LdapLdifException;
import org.apache.directory.api.ldap.model.ldif.LdifEntry;
import org.apache.directory.api.ldap.model.ldif.LdifReader;
-import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemaextractor.UniqueResourceException;
+import org.apache.directory.api.ldap.schema.extractor.SchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.UniqueResourceException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/ResourceMap.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/ResourceMap.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/ResourceMap.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/ResourceMap.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/ResourceMap.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/ResourceMap.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/extractor/impl/ResourceMap.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaextractor.impl;
+package org.apache.directory.api.ldap.schema.extractor.impl;
import java.io.BufferedReader;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/AttributeClassLoader.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/AttributeClassLoader.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/AttributeClassLoader.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import org.apache.directory.api.i18n.I18n;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/EntityFactory.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/EntityFactory.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/EntityFactory.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/EntityFactory.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/EntityFactory.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/EntityFactory.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/EntityFactory.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import org.apache.directory.api.ldap.model.entry.Entry;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoader.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/JarLdifSchemaLoader.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoader.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoader.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/JarLdifSchemaLoader.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/JarLdifSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoader.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import java.io.File;
@@ -37,8 +37,8 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.ldif.LdifReader;
import org.apache.directory.api.ldap.model.schema.registries.AbstractSchemaLoader;
import org.apache.directory.api.ldap.model.schema.registries.Schema;
-import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemaextractor.impl.ResourceMap;
+import org.apache.directory.api.ldap.schema.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.impl.ResourceMap;
import org.apache.directory.api.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoader.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/LdifSchemaLoader.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoader.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoader.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/LdifSchemaLoader.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/LdifSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoader.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import java.io.File;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/SchemaEntityFactory.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/SchemaEntityFactory.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import java.lang.reflect.Constructor;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SingleLdifSchemaLoader.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/SingleLdifSchemaLoader.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SingleLdifSchemaLoader.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SingleLdifSchemaLoader.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/SingleLdifSchemaLoader.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaloader/SingleLdifSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SingleLdifSchemaLoader.java Thu Dec 18 15:17:43 2014
@@ -18,7 +18,7 @@
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import java.io.IOException;
Copied: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManager.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/impl/DefaultSchemaManager.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManager.java?p2=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManager.java&p1=directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/impl/DefaultSchemaManager.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManager.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemamanager.impl;
+package org.apache.directory.api.ldap.schema.manager.impl;
import java.io.IOException;
@@ -77,9 +77,9 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.registries.Schema;
import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader;
import org.apache.directory.api.ldap.model.schema.registries.SyntaxCheckerRegistry;
-import org.apache.directory.api.ldap.schemaloader.EntityFactory;
-import org.apache.directory.api.ldap.schemaloader.JarLdifSchemaLoader;
-import org.apache.directory.api.ldap.schemaloader.SchemaEntityFactory;
+import org.apache.directory.api.ldap.schema.loader.EntityFactory;
+import org.apache.directory.api.ldap.schema.loader.JarLdifSchemaLoader;
+import org.apache.directory.api.ldap.schema.loader.SchemaEntityFactory;
import org.apache.directory.api.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractorTest.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaextractor/impl/SchemaLdifExtractorTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractorTest.java?p2=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractorTest.java&p1=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaextractor/impl/SchemaLdifExtractorTest.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaextractor/impl/SchemaLdifExtractorTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/extractor/SchemaLdifExtractorTest.java Thu Dec 18 15:17:43 2014
@@ -17,23 +17,22 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaextractor.impl;
+package org.apache.directory.api.ldap.schema.extractor;
import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
-import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.impl.DefaultSchemaLdifExtractor;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the DefaultSchemaLdifExtractor class.
Copied: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoaderTest.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/JarLdifSchemaLoaderTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoaderTest.java?p2=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoaderTest.java&p1=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/JarLdifSchemaLoaderTest.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/JarLdifSchemaLoaderTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/JarLdifSchemaLoaderTest.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import static org.junit.Assert.assertFalse;
@@ -27,8 +27,8 @@ import com.mycila.junit.concurrent.Concu
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
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.ldap.schema.loader.JarLdifSchemaLoader;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.junit.Test;
import org.junit.runner.RunWith;
Copied: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoaderTest.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/LdifSchemaLoaderTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoaderTest.java?p2=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoaderTest.java&p1=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/LdifSchemaLoaderTest.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/LdifSchemaLoaderTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/LdifSchemaLoaderTest.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import static org.junit.Assert.assertTrue;
@@ -27,20 +27,19 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
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.ldap.schema.extractor.SchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.apache.directory.api.util.exception.Exceptions;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* Tests the LdifSchemaLoader.
Copied: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/MatchingRuleTest.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/MatchingRuleTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/MatchingRuleTest.java?p2=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/MatchingRuleTest.java&p1=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/MatchingRuleTest.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/MatchingRuleTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/MatchingRuleTest.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import static org.junit.Assert.assertEquals;
@@ -40,9 +40,9 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.normalizers.NumericNormalizer;
import org.apache.directory.api.ldap.model.schema.normalizers.TelephoneNumberNormalizer;
import org.apache.directory.api.ldap.model.schema.registries.Schema;
-import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.api.ldap.schema.extractor.SchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Copied: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerAddTest.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerAddTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerAddTest.java?p2=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerAddTest.java&p1=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerAddTest.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerAddTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerAddTest.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import static org.junit.Assert.assertEquals;
@@ -33,9 +33,6 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.io.FileUtils;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.exception.LdapSchemaException;
import org.apache.directory.api.ldap.model.schema.AttributeType;
@@ -57,15 +54,17 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.normalizers.NoOpNormalizer;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.RegexSyntaxChecker;
-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.ldap.schema.extractor.SchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* A test class for SchemaManager, testig the addition of a SchemaObject.
Copied: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerDelTest.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerDelTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerDelTest.java?p2=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerDelTest.java&p1=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerDelTest.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerDelTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerDelTest.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import static org.junit.Assert.assertEquals;
@@ -31,9 +31,6 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.exception.LdapProtocolErrorException;
import org.apache.directory.api.ldap.model.schema.AttributeType;
@@ -48,15 +45,17 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.comparators.BooleanComparator;
import org.apache.directory.api.ldap.model.schema.normalizers.BooleanNormalizer;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.BooleanSyntaxChecker;
-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.ldap.schema.extractor.SchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* A test class for SchemaManager, testing the deletion of a SchemaObject.
Copied: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java?p2=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java&p1=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import static org.junit.Assert.assertEquals;
@@ -36,9 +36,9 @@ import org.apache.commons.io.FileUtils;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.model.schema.registries.Schema;
-import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.api.ldap.schema.extractor.SchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.apache.directory.api.util.Strings;
import org.junit.AfterClass;
import org.junit.Before;
Copied: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java?p2=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java&p1=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadTest.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import static org.junit.Assert.assertEquals;
@@ -36,10 +36,9 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.model.schema.registries.DefaultSchema;
import org.apache.directory.api.ldap.model.schema.registries.Schema;
-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.ldap.schema.extractor.SchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
Copied: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadWithDepsTest.java (from r1645796, directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadWithDepsTest.java?p2=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadWithDepsTest.java&p1=directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java&r1=1645796&r2=1646475&rev=1646475&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadWithDepsTest.java Thu Dec 18 15:17:43 2014
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.api.ldap.schemaloader;
+package org.apache.directory.api.ldap.schema.loader;
import static org.junit.Assert.assertEquals;
@@ -34,9 +34,9 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.model.schema.registries.DefaultSchema;
import org.apache.directory.api.ldap.model.schema.registries.Schema;
-import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.api.ldap.schema.extractor.SchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;