directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r806854 - in /directory: apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ ...
Date Sat, 22 Aug 2009 13:52:58 GMT
Author: elecharny
Date: Sat Aug 22 13:52:56 2009
New Revision: 806854

URL: http://svn.apache.org/viewvc?rev=806854&view=rev
Log:
Rename the Syntax class to LdapSyntax, to fit the RFC name

Added:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java
      - copied, changed from r806632, directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Syntax.java
Removed:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Syntax.java
Modified:
    directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
    directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleImpl.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
    directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java
    directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
    directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
    directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java
    directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
    directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdMatch.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java
    directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
    directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
    directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NoMatchingRuleAttributeType.java
    directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrderingOnlyMatchingRuleAttributeType.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractLdapSyntax.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AttributeType.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java
    directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java

Modified: directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/branches/apacheds-schema/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Sat Aug 22 13:52:56 2009
@@ -80,7 +80,7 @@
 import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.SchemaObject;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.util.DateUtils;
 import org.apache.maven.plugin.AbstractMojo;
@@ -608,7 +608,7 @@
 
         SyntaxRegistry syntaxRegistry = registries.getSyntaxRegistry();
 
-        for ( Syntax syntax : syntaxRegistry )
+        for ( LdapSyntax syntax : syntaxRegistry )
         {
             getLog().info( "\t\t o [" + syntax.getSchema() + "] - " + getNameOrNumericoid( syntax ) );
             LdapDN dn = checkCreateSchema( syntax.getSchema() );

Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java Sat Aug 22 13:52:56 2009
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.schema.AttributeType;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.comparators.ByteArrayComparator;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
@@ -53,7 +53,7 @@
     {
         private static final long serialVersionUID = 0L;
         AttributeType superior;
-        Syntax syntax;
+        LdapSyntax syntax;
         MatchingRule equality;
         MatchingRule ordering;
         MatchingRule substr;
@@ -69,7 +69,7 @@
         }
 
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return syntax;
         }
@@ -99,7 +99,7 @@
         }
 
 
-        public void setSyntax( Syntax syntax )
+        public void setSyntax( LdapSyntax syntax )
         {
             this.syntax = syntax;
         }
@@ -129,7 +129,7 @@
     static class MR extends AbstractMatchingRule
     {
         private static final long serialVersionUID = 0L;
-        Syntax syntax;
+        LdapSyntax syntax;
         Comparator comparator;
         Normalizer normalizer;
 
@@ -138,7 +138,7 @@
             super( oid );
         }
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return syntax;
         }
@@ -155,7 +155,7 @@
         }
 
 
-        public void setSyntax( Syntax syntax )
+        public void setSyntax( LdapSyntax syntax )
         {
             this.syntax = syntax;
         }

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Sat Aug 22 13:52:56 2009
@@ -36,7 +36,7 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 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.LdapSyntax;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
@@ -567,7 +567,7 @@
             return null;
         }
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return null;
         }

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Sat Aug 22 13:52:56 2009
@@ -34,7 +34,7 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
 
@@ -570,7 +570,7 @@
             return null;
         }
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return null;
         }

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Sat Aug 22 13:52:56 2009
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxChecker.AcceptAllSyntaxChecker;
 
@@ -576,7 +576,7 @@
     }
 
     
-    class DummySyntax implements Syntax
+    class DummySyntax implements LdapSyntax
     {
         private static final long serialVersionUID = 1L;
 

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Sat Aug 22 13:52:56 2009
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.syntaxChecker.AcceptAllSyntaxChecker;
 
 import static org.junit.Assert.assertEquals;
@@ -235,7 +235,7 @@
     {
         testAddSyntax();
         
-        Syntax syntax = getSyntaxRegistry().lookup( OID );
+        LdapSyntax syntax = getSyntaxRegistry().lookup( OID );
         assertEquals( syntax.getDescription(), DESCRIPTION0 );
 
         LdapDN dn = getSyntaxContainer( "apachemeta" );
@@ -262,7 +262,7 @@
     {
         testAddSyntax();
         
-        Syntax syntax = getSyntaxRegistry().lookup( OID );
+        LdapSyntax syntax = getSyntaxRegistry().lookup( OID );
         assertEquals( syntax.getDescription(), DESCRIPTION0 );
 
         LdapDN dn = getSyntaxContainer( "apachemeta" );

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java Sat Aug 22 13:52:56 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.schema.AbstractAttributeType;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 
 
@@ -48,7 +48,7 @@
     private String syntaxOid;
     
     /** The syntax associated with the syntaxID */
-    private Syntax syntax;
+    private LdapSyntax syntax;
     
     /** The equality OID associated with this AttributeType */
     private String equalityOid;
@@ -237,7 +237,7 @@
     /* (non-Javadoc)
      * @see org.apache.directory.shared.ldap.schema.AttributeType#getSyntax()
      */
-    public Syntax getSyntax() throws NamingException
+    public LdapSyntax getSyntax() throws NamingException
     {
         if ( syntax == null )
         {
@@ -262,7 +262,7 @@
      * @return the Syntax for the attributeType
      * @throws NamingException if no syntax can be found for the attributeType
      */
-    private Syntax findSyntax( AttributeType at ) throws NamingException
+    private LdapSyntax findSyntax( AttributeType at ) throws NamingException
     {
         if ( at == null )
         {

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java Sat Aug 22 13:52:56 2009
@@ -41,7 +41,7 @@
 import org.apache.directory.shared.ldap.schema.NameForm;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaDescription;
 import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
 import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
@@ -84,7 +84,7 @@
     private static final LdapComparatorDescription[] EMPTY_COMPARATORS = new LdapComparatorDescription[0];
     private static final NormalizerDescription[] EMPTY_NORMALIZERS = new NormalizerDescription[0];
     private static final SyntaxCheckerDescription[] EMPTY_SYNTAX_CHECKERS = new SyntaxCheckerDescription[0];
-    private static final Syntax[] EMPTY_SYNTAXES = new Syntax[0];
+    private static final LdapSyntax[] EMPTY_SYNTAXES = new LdapSyntax[0];
     private static final MatchingRule[] EMPTY_MATCHING_RULES = new MatchingRule[0];
     private static final AttributeType[] EMPTY_ATTRIBUTE_TYPES = new AttributeType[0];
     private static final ObjectClass[] EMPTY_OBJECT_CLASSES = new ObjectClass[0];
@@ -518,14 +518,14 @@
      * @return the set of Syntax objects for the descriptions 
      * @throws NamingException if there are problems parsing the descriptions
      */
-    public Syntax[] parseSyntaxes( EntryAttribute attr ) throws Exception
+    public LdapSyntax[] parseSyntaxes( EntryAttribute attr ) throws Exception
     {
         if ( attr == null || attr.size() == 0 )
         {
             return EMPTY_SYNTAXES;
         }
         
-        Syntax[] syntaxes = new Syntax[attr.size()];
+        LdapSyntax[] syntaxes = new LdapSyntax[attr.size()];
 
         int pos = 0;
         

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleImpl.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleImpl.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleImpl.java Sat Aug 22 13:52:56 2009
@@ -30,7 +30,7 @@
 import org.apache.directory.server.schema.registries.SyntaxRegistry;
 import org.apache.directory.shared.ldap.schema.AbstractMatchingRule;
 import org.apache.directory.shared.ldap.schema.Normalizer;
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 
 
 class MatchingRuleImpl extends AbstractMatchingRule implements MutableSchemaObject
@@ -56,7 +56,7 @@
     }
 
 
-    public Syntax getSyntax() throws NamingException
+    public LdapSyntax getSyntax() throws NamingException
     {
         return syntaxRegistry.lookup( syntaxOid );
     }

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxHandler.java Sat Aug 22 13:52:56 2009
@@ -35,7 +35,7 @@
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 
 
 /**
@@ -66,7 +66,7 @@
     {
         String oid = getOid( entry );
         Schema schema = getSchema( name );
-        Syntax syntax = factory.getSyntax( targetEntry, targetRegistries, schema.getSchemaName() );
+        LdapSyntax syntax = factory.getSyntax( targetEntry, targetRegistries, schema.getSchemaName() );
         
         if ( ! schema.isDisabled() )
         {
@@ -88,7 +88,7 @@
         checkOidIsUnique( entry );
         
         String schemaName = getSchemaName( name );
-        Syntax syntax = factory.getSyntax( entry, targetRegistries, schemaName );
+        LdapSyntax syntax = factory.getSyntax( entry, targetRegistries, schemaName );
         add( syntax );
     }
 
@@ -110,12 +110,12 @@
         
         
         String schemaName = getSchemaName( name );
-        Syntax syntax = factory.getSyntax( entry, targetRegistries, schemaName );
+        LdapSyntax syntax = factory.getSyntax( entry, targetRegistries, schemaName );
         delete( syntax, cascade );
     }
 
 
-    public void delete( Syntax syntax, boolean cascade ) throws Exception
+    public void delete( LdapSyntax syntax, boolean cascade ) throws Exception
     {
         Schema schema = loader.getSchema( syntax.getSchema() );
         if ( ! schema.isDisabled() )
@@ -149,7 +149,7 @@
         checkOidIsUnique( newOid );
         
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
-        Syntax syntax = factory.getSyntax( targetEntry, targetRegistries, schema.getSchemaName() );
+        LdapSyntax syntax = factory.getSyntax( targetEntry, targetRegistries, schema.getSchemaName() );
         
         if ( ! schema.isDisabled() )
         {
@@ -191,7 +191,7 @@
         checkOidIsUnique( newOid );
         
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
-        Syntax syntax = factory.getSyntax( targetEntry, targetRegistries, newSchema.getSchemaName() );
+        LdapSyntax syntax = factory.getSyntax( targetEntry, targetRegistries, newSchema.getSchemaName() );
 
         if ( ! oldSchema.isDisabled() )
         {
@@ -232,7 +232,7 @@
         Schema oldSchema = getSchema( oriChildName );
         Schema newSchema = getSchema( newParentName );
         
-        Syntax syntax = factory.getSyntax( entry, targetRegistries, newSchema.getSchemaName() );
+        LdapSyntax syntax = factory.getSyntax( entry, targetRegistries, newSchema.getSchemaName() );
         
         if ( ! oldSchema.isDisabled() )
         {
@@ -279,7 +279,7 @@
      * @param syntax the syntax that is to be added to this handler's registries
      * @throws NamingException if there are problems access schema data
      */
-    public void add( Syntax syntax ) throws Exception
+    public void add( LdapSyntax syntax ) throws Exception
     {
         Schema schema = loader.getSchema( syntax.getSchema() );
         

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Sat Aug 22 13:52:56 2009
@@ -56,7 +56,7 @@
 import org.apache.directory.shared.ldap.schema.LdapComparator;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
@@ -664,7 +664,7 @@
             LdapDN resultDN = result.getDn();
             resultDN.normalize( atRegistry.getNormalizerMapping() );
             ServerEntry attrs = lookupPartition( resultDN );
-            Syntax syntax = factory.getSyntax( attrs, targetRegistries, schema.getSchemaName() );
+            LdapSyntax syntax = factory.getSyntax( attrs, targetRegistries, schema.getSchemaName() );
             targetRegistries.getSyntaxRegistry().register( syntax );
         }
     }

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java Sat Aug 22 13:52:56 2009
@@ -47,7 +47,7 @@
 import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.schema.SchemaObject;
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
@@ -548,7 +548,7 @@
     }
 
 
-    public Syntax getSyntax( ServerEntry entry, Registries targetRegistries, String schema ) throws NamingException
+    public LdapSyntax getSyntax( ServerEntry entry, Registries targetRegistries, String schema ) throws NamingException
     {
         String oid = entry.get( MetaSchemaConstants.M_OID_AT ).getString();
         SyntaxImpl syntax = new SyntaxImpl( oid, targetRegistries.getSyntaxCheckerRegistry() );

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java Sat Aug 22 13:52:56 2009
@@ -71,7 +71,7 @@
 import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaDescription;
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
@@ -708,9 +708,9 @@
                 break;
             case( SYNTAX_INDEX ):
                 MetaSyntaxHandler syntaxHandler = ( MetaSyntaxHandler ) handler;
-                Syntax[] syntaxes = parsers.parseSyntaxes( mods );
+                LdapSyntax[] syntaxes = parsers.parseSyntaxes( mods );
                 
-                for ( Syntax syntax : syntaxes )
+                for ( LdapSyntax syntax : syntaxes )
                 {
                     syntaxHandler.delete( syntax, doCascadeModify );
                     subentryModifier.deleteSchemaObject( opContext, syntax );
@@ -847,9 +847,9 @@
                 break;
             case( SYNTAX_INDEX ):
                 MetaSyntaxHandler syntaxHandler = ( MetaSyntaxHandler ) handler;
-                Syntax[] syntaxes = parsers.parseSyntaxes( mods );
+                LdapSyntax[] syntaxes = parsers.parseSyntaxes( mods );
                 
-                for ( Syntax syntax : syntaxes )
+                for ( LdapSyntax syntax : syntaxes )
                 {
                     syntaxHandler.add( syntax );
                     subentryModifier.addSchemaObject( opContext, syntax );

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Sat Aug 22 13:52:56 2009
@@ -40,7 +40,7 @@
 import org.apache.directory.shared.ldap.schema.NameForm;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
@@ -262,11 +262,11 @@
         ServerAttribute attr = new DefaultServerAttribute( 
             registries.getAttributeTypeRegistry().lookup( SchemaConstants.LDAP_SYNTAXES_AT ) );
 
-        Iterator<Syntax> list = registries.getSyntaxRegistry().iterator();
+        Iterator<LdapSyntax> list = registries.getSyntaxRegistry().iterator();
 
         while ( list.hasNext() )
         {
-            Syntax syntax = list.next();
+            LdapSyntax syntax = list.next();
             attr.add( SchemaUtils.render( syntax ).toString() );
         }
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Sat Aug 22 13:52:56 2009
@@ -49,7 +49,7 @@
 import org.apache.directory.shared.ldap.schema.NameForm;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
@@ -110,7 +110,7 @@
         StringBuffer buf = new StringBuffer();
         buf.append( "m-oid=" ).append( obj.getOid() ).append( ",ou=" );
 
-        if ( obj instanceof Syntax )
+        if ( obj instanceof LdapSyntax )
         {
             buf.append( "syntaxes" );
         }

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Sat Aug 22 13:52:56 2009
@@ -35,7 +35,7 @@
 import org.apache.directory.shared.ldap.schema.AttributeType;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
@@ -99,7 +99,7 @@
                 }
 
 
-                public Syntax getSyntax() throws NamingException
+                public LdapSyntax getSyntax() throws NamingException
                 {
                     return null;
                 }
@@ -117,7 +117,7 @@
                     {
                         private static final long serialVersionUID = 1L;
 
-                        public Syntax getSyntax() throws NamingException
+                        public LdapSyntax getSyntax() throws NamingException
                         {
                             return null;
                         }
@@ -284,9 +284,9 @@
                 }
 
 
-                public Syntax getSyntax() throws NamingException
+                public LdapSyntax getSyntax() throws NamingException
                 {
-                    return new Syntax()
+                    return new LdapSyntax()
                     {
 
                         private static final long serialVersionUID = 1L;
@@ -350,9 +350,9 @@
                     {
                         private static final long serialVersionUID = 1L;
 
-                        public Syntax getSyntax() throws NamingException
+                        public LdapSyntax getSyntax() throws NamingException
                         {
-                            return new Syntax()
+                            return new LdapSyntax()
                             {
                                 private static final long serialVersionUID = 1L;
 

Modified: directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java (original)
+++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java Sat Aug 22 13:52:56 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 
 import javax.naming.NamingException;
@@ -66,7 +66,7 @@
     }
 
 
-    public Syntax getSyntax() throws NamingException
+    public LdapSyntax getSyntax() throws NamingException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java Sat Aug 22 13:52:56 2009
@@ -41,7 +41,7 @@
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 
@@ -201,7 +201,7 @@
 
         // accessors
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return syntaxRegistry.lookup( syntaxOid );
         }
@@ -254,7 +254,7 @@
         private String syntaxId;
         
         /** The Syntax associated with the syntaxID */
-        private Syntax syntax;
+        private LdapSyntax syntax;
 
 
         public BootstrapAttributeType(String oid, Registries registries)
@@ -395,7 +395,7 @@
         /**
          * @return The Syntax associated with the AttributeType
          */
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             if ( syntax == null )
             {

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java Sat Aug 22 13:52:56 2009
@@ -34,7 +34,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.comparators.ObjectIdentifierComparator;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
@@ -92,7 +92,7 @@
     {
         private static final long serialVersionUID = 1L;
         private static final String OID = "1.3.6.1.4.1.18060.0.4.0.1.4";
-        private final Syntax syntax;
+        private final LdapSyntax syntax;
         private final String[] NAMES = new String[] { "ruleIdMatch" };
         
         
@@ -111,7 +111,7 @@
             return new DeepTrimToLowerNormalizer();
         }
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return syntax;
         }
@@ -158,7 +158,7 @@
         private static final String OID = "1.3.6.1.4.1.18060.0.4.0.1.3";
         private static final long serialVersionUID = 1L;
         String[] NAMES = new String[] { "supDITStructureRuleMatch" };
-        Syntax syntax;
+        LdapSyntax syntax;
         
         
         public SupDITStructureRuleMatch( SyntaxRegistry registry ) throws NamingException
@@ -177,7 +177,7 @@
             return new DeepTrimToLowerNormalizer();
         }
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return syntax;
         }
@@ -226,7 +226,7 @@
         private static final long serialVersionUID = 1L;
 
         final String[] NAMES = new String[] { "numericOidMatch" };
-        Syntax syntax;
+        LdapSyntax syntax;
         
         public NumericOidMatch( SyntaxRegistry registry ) throws NamingException
         {
@@ -243,7 +243,7 @@
             return new ObjectIdentifierNormalizer();
         }
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return syntax;
         }
@@ -290,7 +290,7 @@
         private static final long serialVersionUID = 1L;
         public static final Comparator COMPARATOR = new ApachemetaComparatorProducer.ObjectClassTypeComparator(); 
         public static final Normalizer NORMALIZER = new NoOpNormalizer();
-        public static final Syntax SYNTAX = new ApachemetaSyntaxProducer.ObjectClassTypeSyntax();
+        public static final LdapSyntax SYNTAX = new ApachemetaSyntaxProducer.ObjectClassTypeSyntax();
         public static final String OID = "1.3.6.1.4.1.18060.0.4.0.1.1";
         
         private static final String[] NAMES = new String[] { "objectClassTypeMatch" };
@@ -306,7 +306,7 @@
             return NORMALIZER;
         }
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return SYNTAX;
         }

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java Sat Aug 22 13:52:56 2009
@@ -25,7 +25,7 @@
 import org.apache.directory.server.constants.MetaSchemaConstants;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxChecker.NumericOidSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxChecker.NumericStringSyntaxChecker;
@@ -60,7 +60,7 @@
     public void produce( Registries registries, ProducerCallback cb )
         throws NamingException
     {
-        Syntax syntax = null;
+        LdapSyntax syntax = null;
         
         syntax = new NameOrNumericIdSyntax();
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
@@ -79,7 +79,7 @@
     }
     
     
-    public static class NumericOidSyntax implements Syntax
+    public static class NumericOidSyntax implements LdapSyntax
     {
         private static final long serialVersionUID = 1L;
         private final static String OID = "1.3.6.1.4.1.18060.0.4.0.0.2";
@@ -133,7 +133,7 @@
     }
 
 
-    public static class NameOrNumericIdSyntax implements Syntax
+    public static class NameOrNumericIdSyntax implements LdapSyntax
     {
         private static final long serialVersionUID = 1L;
         private final static String OID = "1.3.6.1.4.1.18060.0.4.0.0.0";
@@ -187,7 +187,7 @@
     }
 
 
-    public static class ObjectClassTypeSyntax implements Syntax
+    public static class ObjectClassTypeSyntax implements LdapSyntax
     {
         private static final long serialVersionUID = 1L;
         private final static String OID = "1.3.6.1.4.1.18060.0.4.0.0.1";
@@ -241,7 +241,7 @@
     }
 
 
-    public static class NumberSyntax implements Syntax
+    public static class NumberSyntax implements LdapSyntax
     {
         private static final long serialVersionUID = 1L;
         private final static String OID = "1.3.6.1.4.1.18060.0.4.0.0.4";
@@ -294,7 +294,7 @@
         }
     }
 
-    public static class ObjectNameSyntax implements Syntax
+    public static class ObjectNameSyntax implements LdapSyntax
     {
         private static final long serialVersionUID = 1L;
         private final static String OID = "1.3.6.1.4.1.18060.0.4.0.0.6";

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java Sat Aug 22 13:52:56 2009
@@ -54,7 +54,7 @@
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription;
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
@@ -267,7 +267,7 @@
                 break;
                 
             case SYNTAX_PRODUCER :
-                Syntax syntax = ( Syntax ) schemaObject;
+                LdapSyntax syntax = ( LdapSyntax ) schemaObject;
                 
                 if ( schemaObject instanceof BootstrapSyntax )
                 {

Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdMatch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdMatch.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdMatch.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdMatch.java Sat Aug 22 13:52:56 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.NotImplementedException;
 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.LdapSyntax;
 
 /**
  * Document me!
@@ -44,7 +44,7 @@
     private final static String OID = "1.3.6.1.4.1.18060.0.4.0.1.0";
     private transient Normalizer normalizer;
     private transient Comparator comparator;
-    private transient Syntax syntax;
+    private transient LdapSyntax syntax;
     private final String schema;
     
     
@@ -93,7 +93,7 @@
     /* (non-Javadoc)
      * @see org.apache.directory.shared.ldap.schema.MatchingRule#getSyntax()
      */
-    public Syntax getSyntax() throws NamingException
+    public LdapSyntax getSyntax() throws NamingException
     {
         return syntax;
     }

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultRegistries.java Sat Aug 22 13:52:56 2009
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 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.LdapSyntax;
 
 
 /**
@@ -208,7 +208,7 @@
         list = syntaxRegistry.iterator();
         while ( list.hasNext() )
         {
-            Syntax syntax = ( Syntax ) list.next();
+            LdapSyntax syntax = ( LdapSyntax ) list.next();
             resolve( syntax, errors );
         }
 
@@ -223,7 +223,7 @@
      * @param errors the list of errors to add exceptions to
      * @return true if it succeeds, false otherwise
      */
-    private boolean resolve( Syntax syntax, List<Throwable> errors )
+    private boolean resolve( LdapSyntax syntax, List<Throwable> errors )
     {
         if ( syntax == null )
         {

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java Sat Aug 22 13:52:56 2009
@@ -27,7 +27,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.shared.asn1.primitives.OID;
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,7 +48,7 @@
     private static final boolean IS_DEBUG = LOG.isDebugEnabled();
     
     /** a map of entries using an OID for the key and a Syntax for the value */
-    private final Map<String,Syntax> byOidSyntax;
+    private final Map<String,LdapSyntax> byOidSyntax;
     
     /** the OID oidRegistry this oidRegistry uses to register new syntax OIDs */
     private final OidRegistry oidRegistry;
@@ -67,7 +67,7 @@
     public DefaultSyntaxRegistry( OidRegistry registry )
     {
         this.oidRegistry = registry;
-        byOidSyntax = new ConcurrentHashMap<String,Syntax>();
+        byOidSyntax = new ConcurrentHashMap<String,LdapSyntax>();
     }
 
 
@@ -77,10 +77,10 @@
     /**
      * {@inheritDoc}
      */
-    public Syntax lookup( String id ) throws NamingException
+    public LdapSyntax lookup( String id ) throws NamingException
     {
         id = oidRegistry.getOid( id );
-        Syntax syntax = byOidSyntax.get( id );
+        LdapSyntax syntax = byOidSyntax.get( id );
 
         if ( syntax != null )
         {
@@ -101,7 +101,7 @@
     /**
      * {@inheritDoc}
      */
-    public void register( Syntax syntax ) throws NamingException
+    public void register( LdapSyntax syntax ) throws NamingException
     {
         String oid = syntax.getOid();
         
@@ -166,7 +166,7 @@
         }
 
         String oid = oidRegistry.getOid( id );
-        Syntax syntax = byOidSyntax.get( oid );
+        LdapSyntax syntax = byOidSyntax.get( oid );
        
         if ( syntax != null )
         {
@@ -182,7 +182,7 @@
     /**
      * {@inheritDoc}
      */
-    public Iterator<Syntax> iterator()
+    public Iterator<LdapSyntax> iterator()
     {
         return byOidSyntax.values().iterator();
     }

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/SyntaxRegistry.java Sat Aug 22 13:52:56 2009
@@ -24,7 +24,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 
 
 /**
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface SyntaxRegistry extends SchemaObjectRegistry, Iterable<Syntax>
+public interface SyntaxRegistry extends SchemaObjectRegistry, Iterable<LdapSyntax>
 {
     /**
      * Looks up a Syntax by its unique Object Identifier or by name.
@@ -43,7 +43,7 @@
      * @throws NamingException if there is a backing store failure or the Syntax
      * does not exist.
      */
-    Syntax lookup( String id ) throws NamingException;
+    LdapSyntax lookup( String id ) throws NamingException;
 
 
     /**
@@ -53,7 +53,7 @@
      * @throws NamingException if the syntax is already registered or the 
      * registration operation is not supported
      */
-    void register( Syntax syntax ) throws NamingException;
+    void register( LdapSyntax syntax ) throws NamingException;
 
 
     /**
@@ -71,5 +71,5 @@
      *
      * @return an Iterator over all the Syntaxes within this registry
      */
-    Iterator<Syntax> iterator();
+    Iterator<LdapSyntax> iterator();
 }

Modified: directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java (original)
+++ directory/apacheds/branches/apacheds-schema/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java Sat Aug 22 13:52:56 2009
@@ -41,7 +41,7 @@
 import org.apache.directory.shared.ldap.schema.Normalizer;
 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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.util.DateUtils;
 
@@ -57,9 +57,9 @@
 {
     public ServerEntry getAttributes( SchemaObject obj, Schema schema, Registries registries ) throws NamingException
     {
-        if ( obj instanceof Syntax )
+        if ( obj instanceof LdapSyntax )
         {
-            return getAttributes( ( Syntax ) obj, schema, registries );
+            return getAttributes( ( LdapSyntax ) obj, schema, registries );
         }
         else if ( obj instanceof MatchingRule )
         {
@@ -140,7 +140,7 @@
     }
 
     
-    public ServerEntry getAttributes( Syntax syntax, Schema schema, Registries registries ) throws NamingException
+    public ServerEntry getAttributes( LdapSyntax syntax, Schema schema, Registries registries ) throws NamingException
     {
         ServerEntry entry = new DefaultServerEntry( registries );
 

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java Sat Aug 22 13:52:56 2009
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm.search.impl;
 
 
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxChecker.AcceptAllSyntaxChecker;
 
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class BogusSyntax implements Syntax
+public class BogusSyntax implements LdapSyntax
 {
     private static final long serialVersionUID = 1L;
 

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NoMatchingRuleAttributeType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NoMatchingRuleAttributeType.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NoMatchingRuleAttributeType.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NoMatchingRuleAttributeType.java Sat Aug 22 13:52:56 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
-import org.apache.directory.shared.ldap.schema.Syntax;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 
@@ -71,7 +71,7 @@
     }
 
 
-    public Syntax getSyntax() throws NamingException
+    public LdapSyntax getSyntax() throws NamingException
     {
         return new BogusSyntax();
     }

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrderingOnlyMatchingRuleAttributeType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrderingOnlyMatchingRuleAttributeType.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrderingOnlyMatchingRuleAttributeType.java (original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrderingOnlyMatchingRuleAttributeType.java Sat Aug 22 13:52:56 2009
@@ -72,7 +72,7 @@
     }
 
 
-    public Syntax getSyntax() throws NamingException
+    public LdapSyntax getSyntax() throws NamingException
     {
         return new BogusSyntax();
     }
@@ -97,7 +97,7 @@
             private static final long serialVersionUID = 1L;
 
 
-            public Syntax getSyntax() throws NamingException
+            public LdapSyntax getSyntax() throws NamingException
             {
                 return new BogusSyntax();
             }

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractLdapSyntax.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractLdapSyntax.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractLdapSyntax.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractLdapSyntax.java Sat Aug 22 13:52:56 2009
@@ -26,7 +26,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664290 $
  */
-public abstract class AbstractLdapSyntax extends AbstractSchemaObject implements Syntax
+public abstract class AbstractLdapSyntax extends AbstractSchemaObject implements LdapSyntax
 {
     /** the human readable flag */
     private boolean isHumanReadable = false;
@@ -106,7 +106,7 @@
     // ------------------------------------------------------------------------
 
     /**
-     * @see org.apache.directory.shared.ldap.schema.Syntax#isHumanReadable()
+     * @see org.apache.directory.shared.ldap.schema.LdapSyntax#isHumanReadable()
      * @return true if the syntax can be interpreted by humans, false otherwise
      */
     public final boolean isHumanReadable()
@@ -161,7 +161,7 @@
             return false;
         }
 
-        if ( obj instanceof Syntax )
+        if ( obj instanceof LdapSyntax )
         {
             return true;
         }

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AttributeType.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AttributeType.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AttributeType.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AttributeType.java Sat Aug 22 13:52:56 2009
@@ -181,7 +181,7 @@
      * @throws NamingException
      *             if there is a failure to resolve the syntax
      */
-    Syntax getSyntax() throws NamingException;
+    LdapSyntax getSyntax() throws NamingException;
 
 
     /**

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java Sat Aug 22 13:52:56 2009
@@ -661,7 +661,7 @@
      *            the Syntax to generate a description for
      * @return the description in the SyntaxDescription syntax
      */
-    public static String getDescription( Syntax syntax )
+    public static String getDescription( LdapSyntax syntax )
     {
         StringBuffer buf = new StringBuffer( "( " );
         buf.append( syntax.getOid() );

Copied: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java (from r806632, directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Syntax.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java?p2=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java&p1=directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Syntax.java&r1=806632&r2=806854&rev=806854&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Syntax.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapSyntax.java Sat Aug 22 13:52:56 2009
@@ -67,7 +67,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 437007 $
  */
-public interface Syntax extends SchemaObject
+public interface LdapSyntax extends SchemaObject
 {
     /**
      * Gets whether or not the Syntax is human readable.

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/MatchingRule.java Sat Aug 22 13:52:56 2009
@@ -84,7 +84,7 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    Syntax getSyntax() throws NamingException;
+    LdapSyntax getSyntax() throws NamingException;
 
 
     /**

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java Sat Aug 22 13:52:56 2009
@@ -88,8 +88,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface NameForm extends SchemaObject
+public class NameForm extends SchemaObject
 {
+    /** A reference to all the registries */
+    private final Registries registries;
+    
+    /** The ObjectClass OID on which this NameForm is applied */
+    private String objectClassOid;
+
+    /** The list of MAY AttributeTypes OIDs */
+    private String[] mayUseOids = StringTools.EMPTY_STRINGS;
+    
+    /** The list of MAY AttributeTypes for this NameForm */
+    private AttributeType[] mayUse = EMPTY_ATTR_ARRAY;
+    
+    /** The list of MUST AttributeTypes OIDs */
+    private String[] mustUseOids = StringTools.EMPTY_STRINGS;
+
+    /** The list of MUST AttributeTypes for this NameForm */
+    private AttributeType[] mustUse = EMPTY_ATTR_ARRAY;
+
     /**
      * Gets the STRUCTURAL ObjectClass this name form specifies naming
      * attributes for.
@@ -98,7 +116,10 @@
      * @throws NamingException
      *             if there is a failure resolving the object
      */
-    ObjectClass getObjectClass() throws NamingException;
+    public ObjectClass getObjectClass() throws NamingException
+    {
+        
+    }
 
 
     /**

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java Sat Aug 22 13:52:56 2009
@@ -848,7 +848,7 @@
      * @param syntax the Syntax to render the description for
      * @return the StringBuffer containing the rendered syntax description
      */
-    public static StringBuffer render( Syntax syntax )
+    public static StringBuffer render( LdapSyntax syntax )
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "( " ).append( syntax.getOid() ).append( " " );

Modified: directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java?rev=806854&r1=806853&r2=806854&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java Sat Aug 22 13:52:56 2009
@@ -37,7 +37,7 @@
  */
 public class SchemaUtilsTest
 {
-    public static Syntax[] getSyntaxes()
+    public static LdapSyntax[] getSyntaxes()
     {
         SyntaxImpl[] syntaxes = new SyntaxImpl[3];
         syntaxes[0] = new SyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.12", "DN syntax", true );
@@ -187,7 +187,7 @@
     {
         private static final long serialVersionUID = 1L;
 
-        Syntax syntax;
+        LdapSyntax syntax;
 
         AttributeType sup;
 
@@ -210,7 +210,7 @@
         }
 
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return syntax;
         }
@@ -250,17 +250,17 @@
     {
         private static final long serialVersionUID = 1L;
 
-        Syntax syntax;
+        LdapSyntax syntax;
 
 
-        protected MatchingRuleImpl(String oid, Syntax syntax)
+        protected MatchingRuleImpl(String oid, LdapSyntax syntax)
         {
             super( oid );
             this.syntax = syntax;
         }
 
 
-        public Syntax getSyntax() throws NamingException
+        public LdapSyntax getSyntax() throws NamingException
         {
             return syntax;
         }



Mime
View raw message