Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 77879 invoked from network); 21 Jan 2009 05:40:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Jan 2009 05:40:09 -0000 Received: (qmail 6231 invoked by uid 500); 21 Jan 2009 05:40:09 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 6195 invoked by uid 500); 21 Jan 2009 05:40:09 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 6186 invoked by uid 99); 21 Jan 2009 05:40:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jan 2009 21:40:09 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jan 2009 05:40:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B6DB238889C; Tue, 20 Jan 2009 21:39:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r736223 - in /directory/apacheds/trunk: bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ core-entry/src/main/java/org/apache/directory/server/core/entry/ core-entry/src/test/java/org/apache/directory/server/... Date: Wed, 21 Jan 2009 05:39:45 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090121053947.4B6DB238889C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Tue Jan 20 21:39:43 2009 New Revision: 736223 URL: http://svn.apache.org/viewvc?rev=736223&view=rev Log: DIRSHARED-32: Renaming syntax package to syntaxes. Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.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/DescriptionParsers.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SyntaxImpl.java directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdNormalizer.java directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxCheckerProducer.java directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original) +++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Tue Jan 20 21:39:43 2009 @@ -77,7 +77,7 @@ import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.SchemaObject; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; import org.apache.directory.shared.ldap.util.DateUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java (original) +++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java Tue Jan 20 21:39:43 2009 @@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.Normalizer; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; import org.apache.directory.shared.ldap.util.StringTools; /** Modified: directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java (original) +++ directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java Tue Jan 20 21:39:43 2009 @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.ByteArrayComparator; import org.apache.directory.shared.ldap.schema.Normalizer; -import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker; import org.apache.directory.shared.ldap.util.StringTools; import static org.junit.Assert.assertEquals; Modified: directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java (original) +++ directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java Tue Jan 20 21:39:43 2009 @@ -38,8 +38,8 @@ import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.NoOpNormalizer; -import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Tue Jan 20 21:39:43 2009 @@ -33,8 +33,9 @@ import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Tue Jan 20 21:39:43 2009 @@ -33,7 +33,8 @@ import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Tue Jan 20 21:39:43 2009 @@ -25,8 +25,9 @@ import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext; import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext; import org.apache.directory.shared.ldap.name.LdapDN; -import org.apache.directory.shared.ldap.schema.syntax.AttributeTypeDescription; import org.apache.directory.shared.ldap.schema.syntax.parser.AttributeTypeDescriptionSchemaParser; +import org.apache.directory.shared.ldap.schema.syntaxes.AttributeTypeDescription; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; 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=736223&r1=736222&r2=736223&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 20 21:39:43 2009 @@ -34,15 +34,6 @@ import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer; -import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.AttributeTypeDescription; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; -import org.apache.directory.shared.ldap.schema.syntax.LdapSyntaxDescription; -import org.apache.directory.shared.ldap.schema.syntax.MatchingRuleDescription; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; -import org.apache.directory.shared.ldap.schema.syntax.ObjectClassDescription; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.schema.syntax.parser.AttributeTypeDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.syntax.parser.ComparatorDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.syntax.parser.LdapSyntaxDescriptionSchemaParser; @@ -50,6 +41,15 @@ import org.apache.directory.shared.ldap.schema.syntax.parser.NormalizerDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.syntax.parser.ObjectClassDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.syntax.parser.SyntaxCheckerDescriptionSchemaParser; +import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AttributeTypeDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.LdapSyntaxDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.MatchingRuleDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ObjectClassDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.util.Base64; import org.apache.directory.shared.ldap.util.DateUtils; import static org.junit.Assert.assertEquals; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java Tue Jan 20 21:39:43 2009 @@ -42,18 +42,6 @@ import org.apache.directory.shared.ldap.schema.NameForm; import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.AbstractSchemaDescription; -import org.apache.directory.shared.ldap.schema.syntax.AttributeTypeDescription; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; -import org.apache.directory.shared.ldap.schema.syntax.DITContentRuleDescription; -import org.apache.directory.shared.ldap.schema.syntax.DITStructureRuleDescription; -import org.apache.directory.shared.ldap.schema.syntax.LdapSyntaxDescription; -import org.apache.directory.shared.ldap.schema.syntax.MatchingRuleDescription; -import org.apache.directory.shared.ldap.schema.syntax.MatchingRuleUseDescription; -import org.apache.directory.shared.ldap.schema.syntax.NameFormDescription; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; -import org.apache.directory.shared.ldap.schema.syntax.ObjectClassDescription; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.schema.syntax.parser.AttributeTypeDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.syntax.parser.ComparatorDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.syntax.parser.DITContentRuleDescriptionSchemaParser; @@ -65,6 +53,18 @@ import org.apache.directory.shared.ldap.schema.syntax.parser.NormalizerDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.syntax.parser.ObjectClassDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.syntax.parser.SyntaxCheckerDescriptionSchemaParser; +import org.apache.directory.shared.ldap.schema.syntaxes.AbstractSchemaDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.AttributeTypeDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.DITContentRuleDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.DITStructureRuleDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.LdapSyntaxDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.MatchingRuleDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.MatchingRuleUseDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NameFormDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ObjectClassDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; /** Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java Tue Jan 20 21:39:43 2009 @@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; import org.apache.directory.shared.ldap.util.Base64; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java Tue Jan 20 21:39:43 2009 @@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.Normalizer; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; import org.apache.directory.shared.ldap.util.Base64; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java Tue Jan 20 21:39:43 2009 @@ -40,8 +40,8 @@ import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.util.Base64; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Tue Jan 20 21:39:43 2009 @@ -57,10 +57,10 @@ import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.Syntax; import org.apache.directory.shared.ldap.schema.MatchingRule; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.util.Base64; import org.slf4j.Logger; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java Tue Jan 20 21:39:43 2009 @@ -48,10 +48,10 @@ import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; import org.apache.directory.shared.ldap.schema.Syntax; import org.apache.directory.shared.ldap.schema.UsageEnum; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.util.Base64; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Tue Jan 20 21:39:43 2009 @@ -103,8 +103,8 @@ import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; import org.apache.directory.shared.ldap.schema.SchemaUtils; import org.apache.directory.shared.ldap.schema.UsageEnum; -import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java Tue Jan 20 21:39:43 2009 @@ -72,10 +72,10 @@ import org.apache.directory.shared.ldap.schema.NameForm; import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.AbstractSchemaDescription; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.AbstractSchemaDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.util.DateUtils; import org.slf4j.Logger; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Tue Jan 20 21:39:43 2009 @@ -61,7 +61,7 @@ import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.ObjectClass; -import org.apache.directory.shared.ldap.schema.syntax.NumericOidSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.NumericOidSyntaxChecker; import org.apache.directory.shared.ldap.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Tue Jan 20 21:39:43 2009 @@ -41,9 +41,9 @@ import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.SchemaUtils; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import javax.naming.NamingException; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Tue Jan 20 21:39:43 2009 @@ -50,10 +50,10 @@ import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.SchemaObject; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.AbstractSchemaDescription; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.AbstractSchemaDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.util.Base64; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SyntaxImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SyntaxImpl.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SyntaxImpl.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SyntaxImpl.java Tue Jan 20 21:39:43 2009 @@ -25,7 +25,7 @@ import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry; import org.apache.directory.shared.ldap.schema.AbstractSyntax; import org.apache.directory.shared.ldap.schema.MutableSchemaObject; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; class SyntaxImpl extends AbstractSyntax implements MutableSchemaObject Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Tue Jan 20 21:39:43 2009 @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.schema.OidNormalizer; import org.apache.directory.shared.ldap.schema.Syntax; import org.apache.directory.shared.ldap.schema.UsageEnum; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; import org.apache.directory.shared.ldap.util.StringTools; Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original) +++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Tue Jan 20 21:39:43 2009 @@ -26,7 +26,7 @@ import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.schema.SerializableComparator; import org.apache.directory.server.schema.registries.ComparatorRegistry; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; import org.junit.Before; import org.junit.After; import org.junit.Test; Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java (original) +++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java Tue Jan 20 21:39:43 2009 @@ -29,7 +29,7 @@ import org.apache.directory.server.xdbm.Table; import org.apache.directory.server.schema.SerializableComparator; import org.apache.directory.server.schema.registries.ComparatorRegistry; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; import java.io.File; import java.util.Comparator; Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original) +++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Tue Jan 20 21:39:43 2009 @@ -31,7 +31,7 @@ import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.schema.SerializableComparator; import org.apache.directory.server.schema.registries.ComparatorRegistry; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; import java.io.File; import java.util.Comparator; Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original) +++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Tue Jan 20 21:39:43 2009 @@ -38,7 +38,7 @@ import org.apache.directory.server.schema.SerializableComparator; import org.apache.directory.server.schema.registries.ComparatorRegistry; import org.apache.directory.server.xdbm.Tuple; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java (original) +++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java Tue Jan 20 21:39:43 2009 @@ -21,7 +21,7 @@ import org.apache.directory.server.schema.registries.ComparatorRegistry; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; import javax.naming.NamingException; import java.util.Comparator; Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original) +++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Tue Jan 20 21:39:43 2009 @@ -27,7 +27,7 @@ import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.schema.SerializableComparator; import org.apache.directory.server.schema.registries.ComparatorRegistry; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; import org.junit.Before; import org.junit.After; import org.junit.Test; Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java (original) +++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java Tue Jan 20 21:39:43 2009 @@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; import org.apache.directory.shared.ldap.schema.Syntax; import org.apache.directory.shared.ldap.schema.UsageEnum; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; /** Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java (original) +++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheSyntaxProducer.java Tue Jan 20 21:39:43 2009 @@ -25,11 +25,11 @@ import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.schema.AbstractSyntax; -import org.apache.directory.shared.ldap.schema.syntax.JavaByteSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.JavaIntegerSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.JavaLongSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.JavaShortSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.JavaByteSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.JavaIntegerSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.JavaLongSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.JavaShortSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java (original) +++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java Tue Jan 20 21:39:43 2009 @@ -23,11 +23,11 @@ import javax.naming.NamingException; import org.apache.directory.server.schema.registries.Registries; -import org.apache.directory.shared.ldap.schema.syntax.NumberSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.NumericOidSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.ObjectClassTypeSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.ObjectNameSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.NumberSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.NumericOidSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.ObjectClassTypeSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.ObjectNameSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java (original) +++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java Tue Jan 20 21:39:43 2009 @@ -26,12 +26,12 @@ import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.NotImplementedException; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.NumericOidSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.NumericStringSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.ObjectClassTypeSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.ObjectNameSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.OidSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.NumericOidSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.NumericStringSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.ObjectClassTypeSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.ObjectNameSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.OidSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; /** Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java (original) +++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java Tue Jan 20 21:39:43 2009 @@ -55,10 +55,10 @@ import org.apache.directory.shared.ldap.schema.Normalizer; import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdNormalizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdNormalizer.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdNormalizer.java (original) +++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdNormalizer.java Tue Jan 20 21:39:43 2009 @@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap.exception.LdapNamingException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.schema.Normalizer; -import org.apache.directory.shared.ldap.schema.syntax.NumericOidSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.NumericOidSyntaxChecker; import org.apache.directory.shared.ldap.util.StringTools; Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java (original) +++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java Tue Jan 20 21:39:43 2009 @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.NormalizingComparator; import org.apache.directory.shared.ldap.schema.ObjectIdentifierComparator; -import org.apache.directory.shared.ldap.schema.comparator.IntegerOrderingComparator; +import org.apache.directory.shared.ldap.schema.comparators.IntegerOrderingComparator; /** Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java (original) +++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java Tue Jan 20 21:39:43 2009 @@ -24,62 +24,62 @@ import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum; import org.apache.directory.server.schema.registries.Registries; -import org.apache.directory.shared.ldap.schema.syntax.ACIItemSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.AccessPointSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.AttributeTypeDescriptionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.AudioSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.BinarySyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.BitStringSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.BooleanSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.CertificateListSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.CertificatePairSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.CertificateSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.CountrySyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.DITContentRuleDescriptionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.DITStructureRuleDescriptionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.DLSubmitPermissionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.DNSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.DSAQualitySyntaxSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.DSETypeSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.DataQualitySyntaxSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.DeliveryMethodSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.DirectoryStringSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.EnhancedGuideSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.FacsimileTelephoneNumberSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.FaxSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.GeneralizedTimeSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.GuideSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.Ia5StringSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.IntegerSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.JpegSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.LdapSyntaxDescriptionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.MHSORAddressSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.MailPreferenceSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.MasterAndShadowAccessPointSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.MatchingRuleDescriptionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.MatchingRuleUseDescriptionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.NameAndOptionalUIDSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.NameFormDescriptionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.NumericStringSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.ObjectClassDescriptionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.OctetStringSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.OidSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.OtherMailboxSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.PostalAddressSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.PresentationAddressSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.PrintableStringSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.ProtocolInformationSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SubstringAssertionSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SubtreeSpecificationSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SupplierAndConsumerSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SupplierInformationSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SupplierOrConsumerSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SupportedAlgorithmSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.TelephoneNumberSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.TeletexTerminalIdentifierSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.TelexNumberSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.UtcTimeSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.ACIItemSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AccessPointSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AttributeTypeDescriptionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AudioSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.BinarySyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.BitStringSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.BooleanSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.CertificateListSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.CertificatePairSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.CertificateSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.CountrySyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.DITContentRuleDescriptionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.DITStructureRuleDescriptionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.DLSubmitPermissionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.DNSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.DSAQualitySyntaxSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.DSETypeSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.DataQualitySyntaxSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.DeliveryMethodSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.DirectoryStringSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.EnhancedGuideSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.FacsimileTelephoneNumberSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.FaxSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.GeneralizedTimeSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.GuideSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.Ia5StringSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.IntegerSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.JpegSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.LdapSyntaxDescriptionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.MHSORAddressSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.MailPreferenceSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.MasterAndShadowAccessPointSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.MatchingRuleDescriptionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.MatchingRuleUseDescriptionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.NameAndOptionalUIDSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.NameFormDescriptionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.NumericStringSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.ObjectClassDescriptionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.OctetStringSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.OidSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.OtherMailboxSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.PostalAddressSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.PresentationAddressSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.PrintableStringSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.ProtocolInformationSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SubstringAssertionSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SubtreeSpecificationSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SupplierAndConsumerSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SupplierInformationSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SupplierOrConsumerSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SupportedAlgorithmSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.TelephoneNumberSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.TeletexTerminalIdentifierSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.TelexNumberSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.UtcTimeSyntaxChecker; /** Modified: directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxCheckerProducer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxCheckerProducer.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxCheckerProducer.java (original) +++ directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxCheckerProducer.java Tue Jan 20 21:39:43 2009 @@ -26,8 +26,8 @@ import org.apache.directory.server.schema.bootstrap.ProducerCallback; import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum; import org.apache.directory.server.schema.registries.Registries; -import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; /** Modified: directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java (original) +++ directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/ComparatorRegistry.java Tue Jan 20 21:39:43 2009 @@ -25,7 +25,7 @@ import javax.naming.NamingException; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; /** Modified: directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java (original) +++ directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultComparatorRegistry.java Tue Jan 20 21:39:43 2009 @@ -29,7 +29,7 @@ import javax.naming.NamingException; -import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.ComparatorDescription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java (original) +++ directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultNormalizerRegistry.java Tue Jan 20 21:39:43 2009 @@ -29,7 +29,7 @@ import javax.naming.NamingException; import org.apache.directory.shared.ldap.schema.Normalizer; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java (original) +++ directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxCheckerRegistry.java Tue Jan 20 21:39:43 2009 @@ -28,8 +28,8 @@ import javax.naming.NamingException; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java (original) +++ directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/NormalizerRegistry.java Tue Jan 20 21:39:43 2009 @@ -25,7 +25,7 @@ import javax.naming.NamingException; import org.apache.directory.shared.ldap.schema.Normalizer; -import org.apache.directory.shared.ldap.schema.syntax.NormalizerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.NormalizerDescription; /** Modified: directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java (original) +++ directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxCheckerRegistry.java Tue Jan 20 21:39:43 2009 @@ -24,8 +24,8 @@ import javax.naming.NamingException; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; /** Modified: directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java (original) +++ directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java Tue Jan 20 21:39:43 2009 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.SchemaObject; import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; import org.apache.directory.shared.ldap.util.DateUtils; Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java Tue Jan 20 21:39:43 2009 @@ -21,8 +21,8 @@ import org.apache.directory.shared.ldap.schema.Syntax; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker; -import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxChecker; import javax.naming.NamingException; Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Tue Jan 20 21:39:43 2009 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.filter.GreaterEqNode; import org.apache.directory.shared.ldap.schema.*; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.commons.io.FileUtils; import org.junit.Before; Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=736223&r1=736222&r2=736223&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original) +++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Tue Jan 20 21:39:43 2009 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.filter.LessEqNode; import org.apache.directory.shared.ldap.schema.*; -import org.apache.directory.shared.ldap.schema.syntax.SyntaxCheckerDescription; +import org.apache.directory.shared.ldap.schema.syntaxes.SyntaxCheckerDescription; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.commons.io.FileUtils; import org.junit.Before;