directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r781877 [1/2] - in /directory: apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/ shared/trunk/ldap-constants/...
Date Fri, 05 Jun 2009 00:20:44 GMT
Author: elecharny
Date: Fri Jun  5 00:20:42 2009
New Revision: 781877

URL: http://svn.apache.org/viewvc?rev=781877&view=rev
Log:
Last constant String removal from the code, replaced all the syntaxes.

Modified:
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemMatchingRuleProducer.java
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java
    directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisMatchingRuleProducer.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/EnhancedGuideSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FacsimileTelephoneNumberSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FaxSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/GuideSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/Ia5StringSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/JpegSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/LdapSyntaxDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MHSORAddressSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MailPreferenceSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MasterAndShadowAccessPointSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleUseDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameAndOptionalUIDSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameFormDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumericStringSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OctetStringSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OidSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OtherMailboxSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PostalAddressSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PresentationAddressSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PrintableStringSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ProtocolInformationSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubstringAssertionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubtreeSpecificationSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierAndConsumerSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierInformationSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierOrConsumerSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupportedAlgorithmSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelephoneNumberSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TeletexTerminalIdentifierSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelexNumberSyntaxChecker.java

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java Fri Jun  5 00:20:42 2009
@@ -98,7 +98,7 @@
         
         RuleIdMatch( SyntaxRegistry registry ) throws NamingException
         {
-            syntax = registry.lookup( "1.3.6.1.4.1.1466.115.121.1.26" );
+            syntax = registry.lookup( SchemaConstants.IA5_STRING_SYNTAX );
         }
         
         public Comparator getComparator() throws NamingException
@@ -230,7 +230,7 @@
         
         public NumericOidMatch( SyntaxRegistry registry ) throws NamingException
         {
-            this.syntax = registry.lookup( "1.3.6.1.4.1.1466.115.121.1.38" );
+            this.syntax = registry.lookup( SchemaConstants.OID_SYNTAX );
         }
         
         public Comparator getComparator() throws NamingException

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemMatchingRuleProducer.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemMatchingRuleProducer.java (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemMatchingRuleProducer.java Fri Jun  5 00:20:42 2009
@@ -59,7 +59,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.OBJECT_IDENTIFIER_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.OBJECT_IDENTIFIER_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.38" );
+        mrule.setSyntaxOid( SchemaConstants.OID_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -99,7 +99,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_SUBSTRING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_IGNORE_SUBSTRING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
+        mrule.setSyntaxOid( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -129,7 +129,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_EXACT_SUBSTRING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_EXACT_SUBSTRING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
+        mrule.setSyntaxOid( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
         
         /*
@@ -139,7 +139,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.NUMERIC_STRING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.NUMERIC_STRING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.36" );
+        mrule.setSyntaxOid( SchemaConstants.NUMERIC_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -149,7 +149,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.NUMERIC_STRING_ORDERING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.NUMERIC_STRING_ORDERING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.36" );
+        mrule.setSyntaxOid( SchemaConstants.NUMERIC_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
         
         /*
@@ -159,7 +159,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.NUMERIC_STRING_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.NUMERIC_STRING_SUBSTRINGS_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
+        mrule.setSyntaxOid( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -169,7 +169,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_LIST_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_IGNORE_LIST_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.41" );
+        mrule.setSyntaxOid( SchemaConstants.POSTAL_ADDRESS_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -179,7 +179,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
+        mrule.setSyntaxOid( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -229,7 +229,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.OCTET_STRING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.OCTET_STRING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
+        mrule.setSyntaxOid( SchemaConstants.OCTET_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -239,7 +239,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.OCTET_STRING_ORDERING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.OCTET_STRING_ORDERING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
+        mrule.setSyntaxOid( SchemaConstants.OCTET_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -249,7 +249,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.OCTET_STRING_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.OCTET_STRING_SUBSTRINGS_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
+        mrule.setSyntaxOid( SchemaConstants.OCTET_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
         
         /*
@@ -259,7 +259,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.TELEPHONE_NUMBER_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.TELEPHONE_NUMBER_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.50" );
+        mrule.setSyntaxOid( SchemaConstants.TELEPHONE_NUMBER_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -269,7 +269,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
+        mrule.setSyntaxOid( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -281,7 +281,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.PRESENTATION_ADDRESS_MATCH_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.PRESENTATION_ADDRESS_MATCH_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.43" );
+        mrule.setSyntaxOid( SchemaConstants.PRESENTATION_ADDRESS_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -291,7 +291,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.UNIQUE_MEMBER_MATCH_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.UNIQUE_MEMBER_MATCH_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.34" );
+        mrule.setSyntaxOid( SchemaConstants.NAME_AND_OPTIONAL_UID_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -303,7 +303,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.PROTOCOL_INFORMATION_MATCH_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.PROTOCOL_INFORMATION_MATCH_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.42" );
+        mrule.setSyntaxOid( SchemaConstants.PROTOCOL_INFORMATION_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         // "2.5.13.25" is not used ...
@@ -347,7 +347,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.OBJECT_IDENTIFIER_FIRST_COMPONENT_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.OBJECT_IDENTIFIER_FIRST_COMPONENT_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.38" );
+        mrule.setSyntaxOid( SchemaConstants.OID_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -387,7 +387,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_EXACT_IA5_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_EXACT_IA5_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
+        mrule.setSyntaxOid( SchemaConstants.IA5_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -397,7 +397,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_IA5_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_IGNORE_IA5_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
+        mrule.setSyntaxOid( SchemaConstants.IA5_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
@@ -407,7 +407,7 @@
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_IA5_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_IGNORE_IA5_SUBSTRINGS_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
+        mrule.setSyntaxOid( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
     }
 }

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=781877&r1=781876&r2=781877&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 Fri Jun  5 00:20:42 2009
@@ -175,16 +175,16 @@
          * 28 Master And Shadow Access Points Y  1.3.6.1.4.1.1466.115.121.1.29
          * 29 Matching Rule Description       Y  1.3.6.1.4.1.1466.115.121.1.30
          */
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.21", new EnhancedGuideSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.22", new FacsimileTelephoneNumberSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.23", new FaxSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.ENHANCED_GUIDE_SYNTAX, new EnhancedGuideSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.FACSIMILE_TELEPHONE_NUMBER_SYNTAX, new FacsimileTelephoneNumberSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.FAX_SYNTAX, new FaxSyntaxChecker() );
         cb.schemaObjectProduced( this, SchemaConstants.GENERALIZED_TIME_SYNTAX, new GeneralizedTimeSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.25", new GuideSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.26", new Ia5StringSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.GUIDE_SYNTAX, new GuideSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.IA5_STRING_SYNTAX, new Ia5StringSyntaxChecker() );
         cb.schemaObjectProduced( this, SchemaConstants.INTEGER_SYNTAX, new IntegerSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.28", new JpegSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.29", new MasterAndShadowAccessPointSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.30", new MatchingRuleDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.JPEG_SYNTAX, new JpegSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.MASTER_AND_SHADOW_ACCESS_POINTS_SYNTAX, new MasterAndShadowAccessPointSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.MATCHING_RULE_DESCRIPTION_SYNTAX, new MatchingRuleDescriptionSyntaxChecker() );
 
         /* 30 Matching Rule Use Description   Y  1.3.6.1.4.1.1466.115.121.1.31
          * 31 Mail Preference                 Y  1.3.6.1.4.1.1466.115.121.1.32
@@ -197,16 +197,16 @@
          * 38 Other Mailbox                   Y  1.3.6.1.4.1.1466.115.121.1.39
          * 39 Octet String                    Y  1.3.6.1.4.1.1466.115.121.1.40
          */
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.31", new MatchingRuleUseDescriptionSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.32", new MailPreferenceSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.33", new MHSORAddressSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.34", new NameAndOptionalUIDSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.35", new NameFormDescriptionSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.36", new NumericStringSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.37", new ObjectClassDescriptionSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.38", new OidSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.39", new OtherMailboxSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.40", new OctetStringSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.MATCHING_RULE_USE_DESCRIPTION_SYNTAX, new MatchingRuleUseDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.MAIL_PREFERENCE_SYNTAX, new MailPreferenceSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.MHS_OR_ADDRESS_SYNTAX, new MHSORAddressSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.NAME_AND_OPTIONAL_UID_SYNTAX, new NameAndOptionalUIDSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.NAME_FORM_DESCRIPTION_SYNTAX, new NameFormDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.NUMERIC_STRING_SYNTAX, new NumericStringSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.OBJECT_CLASS_DESCRIPTION_SYNTAX, new ObjectClassDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.OID_SYNTAX, new OidSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.OTHER_MAILBOX_SYNTAX, new OtherMailboxSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.OCTET_STRING_SYNTAX, new OctetStringSyntaxChecker() );
 
         /*
          * 40 Postal Address                  Y  1.3.6.1.4.1.1466.115.121.1.41
@@ -220,16 +220,16 @@
          * 48 Supported Algorithm             N  1.3.6.1.4.1.1466.115.121.1.49
          * 49 Telephone Number                Y  1.3.6.1.4.1.1466.115.121.1.50
          */
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.41", new PostalAddressSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.42", new ProtocolInformationSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.43", new PresentationAddressSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.44", new PrintableStringSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.45", new SubtreeSpecificationSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.46", new SupplierInformationSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.47", new SupplierOrConsumerSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.48", new SupplierAndConsumerSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.49", new SupportedAlgorithmSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.50", new TelephoneNumberSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.POSTAL_ADDRESS_SYNTAX, new PostalAddressSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.PROTOCOL_INFORMATION_SYNTAX, new ProtocolInformationSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.PRESENTATION_ADDRESS_SYNTAX, new PresentationAddressSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.PRINTABLE_STRING_SYNTAX, new PrintableStringSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.SUBTREE_SPECIFICATION_SYNTAX, new SubtreeSpecificationSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.SUPPLIER_INFORMATION_SYNTAX, new SupplierInformationSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.SUPPLIER_OR_CONSUMER_SYNTAX, new SupplierOrConsumerSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.SUPPLIER_AND_CONSUMER_SYNTAX, new SupplierAndConsumerSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.SUPPORTED_ALGORITHM_SYNTAX, new SupportedAlgorithmSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.TELEPHONE_NUMBER_SYNTAX, new TelephoneNumberSyntaxChecker() );
 
         /*
          * 50 Teletex Terminal Identifier     Y  1.3.6.1.4.1.1466.115.121.1.51
@@ -241,23 +241,23 @@
          * 56 LDAP BootstrapSchema DescriptionY  1.3.6.1.4.1.1466.115.121.1.57  (No defined SC yet)
          * 57 Substring Assertion             Y  1.3.6.1.4.1.1466.115.121.1.58
          */
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.51", new TeletexTerminalIdentifierSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.52", new TelexNumberSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.TELETEX_TERMINAL_IDENTIFIER_SYNTAX, new TeletexTerminalIdentifierSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.TELEX_NUMBER_SYNTAX, new TelexNumberSyntaxChecker() );
         cb.schemaObjectProduced( this, SchemaConstants.UTC_TIME_SYNTAX, new UtcTimeSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.54", new LdapSyntaxDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.LDAP_SYNTAX_DESCRIPTION_SYNTAX, new LdapSyntaxDescriptionSyntaxChecker() );
 
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.55", 
-            new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.55" ) );
+        cb.schemaObjectProduced( this, SchemaConstants.MODIFY_RIGHTS_SYNTAX, 
+            new AcceptAllSyntaxChecker( SchemaConstants.MODIFY_RIGHTS_SYNTAX ) );
         
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.56", 
-            new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.56" ) );
+        cb.schemaObjectProduced( this, SchemaConstants.LDAP_SCHEMA_DEFINITION_SYNTAX, 
+            new AcceptAllSyntaxChecker( SchemaConstants.LDAP_SCHEMA_DEFINITION_SYNTAX ) );
         
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.57", 
-            new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.57" ) );
+        cb.schemaObjectProduced( this, SchemaConstants.LDAP_SCHEMA_DESCRIPTION_SYNTAX, 
+            new AcceptAllSyntaxChecker( SchemaConstants.LDAP_SCHEMA_DESCRIPTION_SYNTAX ) );
         
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.58", new SubstringAssertionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.SUBSTRING_ASSERTION_SYNTAX, new SubstringAssertionSyntaxChecker() );
 
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.59", 
-            new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.59" ) );
+        cb.schemaObjectProduced( this, SchemaConstants.ATTRIBUTE_CERTIFICATE_ASSERTION_SYNTAX, 
+            new AcceptAllSyntaxChecker( SchemaConstants.ATTRIBUTE_CERTIFICATE_ASSERTION_SYNTAX ) );
     }
 }

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java Fri Jun  5 00:20:42 2009
@@ -26,8 +26,6 @@
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.schema.syntaxes.DSAQualitySyntaxSyntaxChecker;
-import org.apache.directory.shared.ldap.schema.syntaxes.DeliveryMethodSyntaxChecker;
 
 
 /**
@@ -291,19 +289,19 @@
          * 28 Master And Shadow Access Points Y  1.3.6.1.4.1.1466.115.121.1.29
          * 29 Matching Rule Description       Y  1.3.6.1.4.1.1466.115.121.1.30
          */
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.21", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.ENHANCED_GUIDE_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Enhanced Guide" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.22", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.FACSIMILE_TELEPHONE_NUMBER_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Facsimile Telephone Number" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.23", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.FAX_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Fax" } );
         syntax.setHumanReadable( false );
@@ -315,13 +313,13 @@
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.25", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.GUIDE_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Guide" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.26", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.IA5_STRING_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "IA5 String" } );
         syntax.setHumanReadable( true );
@@ -333,19 +331,19 @@
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.28", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.JPEG_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "JPEG" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.29", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.MASTER_AND_SHADOW_ACCESS_POINTS_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Master And Shadow Access Points" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.30", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.MATCHING_RULE_DESCRIPTION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Matching Rule Description" } );
         syntax.setHumanReadable( true );
@@ -365,55 +363,55 @@
          * 38 Other Mailbox                   Y  1.3.6.1.4.1.1466.115.121.1.39
          * 39 Octet String                    Y  1.3.6.1.4.1.1466.115.121.1.40
          */
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.31", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.MATCHING_RULE_USE_DESCRIPTION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Matching Rule Use Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.32", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.MAIL_PREFERENCE_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Mail Preference" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.33", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.MHS_OR_ADDRESS_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "MHS OR Address" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.34", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.NAME_AND_OPTIONAL_UID_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Name And Optional UID" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.35", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.NAME_FORM_DESCRIPTION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Name Form Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.36", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.NUMERIC_STRING_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Numeric String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.37", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.OBJECT_CLASS_DESCRIPTION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Object Class Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.38", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.OID_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "OID" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.39", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.OTHER_MAILBOX_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Other Mailbox" } );
         syntax.setHumanReadable( true );
@@ -427,7 +425,7 @@
          * If we set this to true then userPasswords which implement this syntax are not treated as
          * binary attributes.  If that happens we can have data corruption due to UTF-8 handling.
          */
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.40", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.OCTET_STRING_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Octet String" } );
         syntax.setHumanReadable( false );
@@ -447,61 +445,61 @@
          * 48 Supported Algorithm             N  1.3.6.1.4.1.1466.115.121.1.49
          * 49 Telephone Number                Y  1.3.6.1.4.1.1466.115.121.1.50
          */
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.41", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.POSTAL_ADDRESS_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Postal Address" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.42", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.PROTOCOL_INFORMATION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Protocol Information" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.43", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.PRESENTATION_ADDRESS_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Presentation Address" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.44", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.PRINTABLE_STRING_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Printable String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.45", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.SUBTREE_SPECIFICATION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Subtree Specification" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.46", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.SUPPLIER_INFORMATION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Supplier Information" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.47", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.SUPPLIER_OR_CONSUMER_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Supplier Or Consumer" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.48", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.SUPPLIER_AND_CONSUMER_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Supplier And Consumer" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.49", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.SUPPORTED_ALGORITHM_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Supported Algorithm" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.50", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.TELEPHONE_NUMBER_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Telephone Number" } );
         syntax.setHumanReadable( true );
@@ -519,13 +517,13 @@
          * 56 LDAP BootstrapSchema Description         Y  1.3.6.1.4.1.1466.115.121.1.57
          * 57 Substring Assertion             Y  1.3.6.1.4.1.1466.115.121.1.58
          */
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.51", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.TELETEX_TERMINAL_IDENTIFIER_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Teletex Terminal Identifier" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.52", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.TELEX_NUMBER_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Telex Number" } );
         syntax.setHumanReadable( true );
@@ -537,37 +535,37 @@
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.54", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.LDAP_SYNTAX_DESCRIPTION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "LDAP Syntax Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.55", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.MODIFY_RIGHTS_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Modify Rights" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.56", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.LDAP_SCHEMA_DEFINITION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "LDAP BootstrapSchema Definition" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.57", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.LDAP_SCHEMA_DESCRIPTION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "LDAP BootstrapSchema Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.58", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Substring Assertion" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
         
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.59", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.ATTRIBUTE_CERTIFICATE_ASSERTION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Trigger Specification" } );
         syntax.setHumanReadable( true );

Modified: directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisMatchingRuleProducer.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisMatchingRuleProducer.java (original)
+++ directory/apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisMatchingRuleProducer.java Fri Jun  5 00:20:42 2009
@@ -26,6 +26,7 @@
 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.constants.SchemaConstants;
 
 
 /**
@@ -63,7 +64,7 @@
         mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.4203.1.2.1", registries );
         mrule.setNames( new String[]
             { "caseExactIA5SubstringsMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
+        mrule.setSyntaxOid( SchemaConstants.IA5_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
     }
 }

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java (original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java Fri Jun  5 00:20:42 2009
@@ -494,127 +494,130 @@
     String DIT_STRUCTURE_RULE_SYNTAX              = "1.3.6.1.4.1.1466.115.121.1.17"; // done
     
     // RFC 2252, removed in RFC 4517
-    String DL_SUBMIT_PERMISSION_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.18";
+    String DL_SUBMIT_PERMISSION_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.18"; // done
 
     // RFC 2252, removed in RFC 4517
-    String DSA_QUALITY_SYNTAX                     = "1.3.6.1.4.1.1466.115.121.1.19";
+    String DSA_QUALITY_SYNTAX                     = "1.3.6.1.4.1.1466.115.121.1.19"; // done
 
     // RFC 2252, removed in RFC 4517
-    String DSE_TYPE_SYNTAX                        = "1.3.6.1.4.1.1466.115.121.1.20";
+    String DSE_TYPE_SYNTAX                        = "1.3.6.1.4.1.1466.115.121.1.20"; // done
     
     // RFC 4517, chap 3.3.10
-    String ENHANCED_GUIDE_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.21";
+    String ENHANCED_GUIDE_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.21"; // done
     
     // RFC 4517, chap 3.3.11
-    String FACSIMILE_TELEPHONE_NUMBER_SYNTAX      = "1.3.6.1.4.1.1466.115.121.1.22";
+    String FACSIMILE_TELEPHONE_NUMBER_SYNTAX      = "1.3.6.1.4.1.1466.115.121.1.22"; // done
     
     // RFC 4517, chap 3.3.12
-    String FAX_SYNTAX                             = "1.3.6.1.4.1.1466.115.121.1.23";
+    String FAX_SYNTAX                             = "1.3.6.1.4.1.1466.115.121.1.23"; // done
     
     // RFC 4517, chap 3.3.13
     String GENERALIZED_TIME_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.24"; // done
     
     // RFC 4517, chap 3.3.14
-    String GUIDE_SYNTAX                           = "1.3.6.1.4.1.1466.115.121.1.25";
+    String GUIDE_SYNTAX                           = "1.3.6.1.4.1.1466.115.121.1.25"; // done
     
     // RFC 4517, chap 3.3.15
-    String IA5_STRING_SYNTAX                      = "1.3.6.1.4.1.1466.115.121.1.26";
+    String IA5_STRING_SYNTAX                      = "1.3.6.1.4.1.1466.115.121.1.26"; // done
     
     // RFC 4517, chap 3.3.16
     String INTEGER_SYNTAX                         = "1.3.6.1.4.1.1466.115.121.1.27"; // done
     
     // RFC 4517, chap 3.3.17
-    String JPEG_SYNTAX                            = "1.3.6.1.4.1.1466.115.121.1.28";
+    String JPEG_SYNTAX                            = "1.3.6.1.4.1.1466.115.121.1.28"; // done
     
     // RFC 2252, removed in RFC 4517
-    String Master_And_Shadow_Access_Points_SYNTAX = "1.3.6.1.4.1.1466.115.121.1.29";
+    String MASTER_AND_SHADOW_ACCESS_POINTS_SYNTAX = "1.3.6.1.4.1.1466.115.121.1.29"; // done
     
     // RFC 4517, chap 3.3.19
-    String MATCHING_RULE_DESCRIPTION_SYNTAX       = "1.3.6.1.4.1.1466.115.121.1.30";
+    String MATCHING_RULE_DESCRIPTION_SYNTAX       = "1.3.6.1.4.1.1466.115.121.1.30"; // done
     
     // RFC 4517, chap 3.3.20
-    String MATCHING_RULE_USE_DESCRIPTION_SYNTAX   = "1.3.6.1.4.1.1466.115.121.1.31";
+    String MATCHING_RULE_USE_DESCRIPTION_SYNTAX   = "1.3.6.1.4.1.1466.115.121.1.31"; // done
     
     // RFC 2252, removed in RFC 4517
-    String MAIL_PREFERENCE_SYNTAX                 = "1.3.6.1.4.1.1466.115.121.1.32";
+    String MAIL_PREFERENCE_SYNTAX                 = "1.3.6.1.4.1.1466.115.121.1.32"; // done
     
     // RFC 2252, removed in RFC 4517
-    String MHS_OR_ADDRESS_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.33";
+    String MHS_OR_ADDRESS_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.33";  // done
     
     // RFC 4517, chap 3.3.21
-    String NAME_AND_OPTIONAL_UID_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.34";
+    String NAME_AND_OPTIONAL_UID_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.34"; // done
     
     // RFC 4517, chap 3.3.22
-    String NAME_FORM_DESCRIPTION_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.35";
+    String NAME_FORM_DESCRIPTION_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.35"; // done
     
     // RFC 4517, chap 3.3.23
-    String NUMERIC_STRING_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.36";
+    String NUMERIC_STRING_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.36"; // done
     
     // RFC 4517, chap 3.3.24
-    String OBJECT_CLASS_DESCRIPTION_SYNTAX        = "1.3.6.1.4.1.1466.115.121.1.37";
+    String OBJECT_CLASS_DESCRIPTION_SYNTAX        = "1.3.6.1.4.1.1466.115.121.1.37"; // done
     
     // RFC 4517, chap 3.3.26
-    String OID_SYNTAX                             = "1.3.6.1.4.1.1466.115.121.1.38";
+    String OID_SYNTAX                             = "1.3.6.1.4.1.1466.115.121.1.38"; // done
     
     // RFC 4517, chap 3.3.27
-    String OTHER_MAILBOX_SYNTAX                   = "1.3.6.1.4.1.1466.115.121.1.39";
+    String OTHER_MAILBOX_SYNTAX                   = "1.3.6.1.4.1.1466.115.121.1.39"; // done
     
     // RFC 4517, chap 3.3.25
-    String OCTET_STRING_SYNTAX                    = "1.3.6.1.4.1.1466.115.121.1.40";
+    String OCTET_STRING_SYNTAX                    = "1.3.6.1.4.1.1466.115.121.1.40"; // done
     
     // RFC 4517, chap 3.3.28
-    String POSTAL_ADDRESS_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.41";
+    String POSTAL_ADDRESS_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.41"; // done
     
     // RFC 2252, removed in RFC 4517
-    String PROTOCOL_INFORMATION_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.42";
+    String PROTOCOL_INFORMATION_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.42"; // done
     
     // RFC 2252, removed in RFC 4517
-    String PRESENTATION_ADDRESS_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.43";
+    String PRESENTATION_ADDRESS_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.43"; // done
     
     // RFC 4517, chap 3.3.29
-    String PRINTABLE_STRING_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.44";
+    String PRINTABLE_STRING_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.44"; // done
     
     // RFC 2252, removed in RFC 4517
-    String SUBTREE_SPECIFICATION_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.45";
+    String SUBTREE_SPECIFICATION_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.45"; // done
     
     // RFC 2252, removed in RFC 4517
-    String SUPPLIER_INFORMATION_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.46";
+    String SUPPLIER_INFORMATION_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.46"; // done
     
     // RFC 2252, removed in RFC 4517
-    String SUPPLIER_OR_CONSUMER_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.47";
+    String SUPPLIER_OR_CONSUMER_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.47"; // done
     
     // RFC 2252, removed in RFC 4517
-    String SUPPLIER_AND_CONSUMER_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.48";
+    String SUPPLIER_AND_CONSUMER_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.48"; // done
 
     // RFC 2252, removed in RFC 4517, reintroduced in RFC 4523, chap. 2.4
-    String SUPPORTED_ALGORITHM_SYNTAX             = "1.3.6.1.4.1.1466.115.121.1.49";
+    String SUPPORTED_ALGORITHM_SYNTAX             = "1.3.6.1.4.1.1466.115.121.1.49"; // done
     
     // RFC 4517, chap 3.3.31
-    String TELEPHONE_NUMBER_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.50";
+    String TELEPHONE_NUMBER_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.50"; // done
 
     // RFC 4517, chap 3.3.32
-    String TELETEX_TERMINAL_IDENTIFIER_SYNTAX     = "1.3.6.1.4.1.1466.115.121.1.51";
+    String TELETEX_TERMINAL_IDENTIFIER_SYNTAX     = "1.3.6.1.4.1.1466.115.121.1.51"; // done
     
     // RFC 4517, chap 3.3.33
-    String TELEX_NUMBER_SYNTAX                    = "1.3.6.1.4.1.1466.115.121.1.52";
+    String TELEX_NUMBER_SYNTAX                    = "1.3.6.1.4.1.1466.115.121.1.52"; // done 
     
     // RFC 4517, chap 3.3.34
     String UTC_TIME_SYNTAX                        = "1.3.6.1.4.1.1466.115.121.1.53"; // done
     
     // RFC 4517, chap 3.3.18
-    String LDAP_SYNTAX_DESCRIPTION_SYNTAX         = "1.3.6.1.4.1.1466.115.121.1.54";
+    String LDAP_SYNTAX_DESCRIPTION_SYNTAX         = "1.3.6.1.4.1.1466.115.121.1.54"; // done
     
     // RFC 2252, removed in RFC 4517
-    String MODIFY_RIGHTS_SYNTAX                   = "1.3.6.1.4.1.1466.115.121.1.55";
+    String MODIFY_RIGHTS_SYNTAX                   = "1.3.6.1.4.1.1466.115.121.1.55"; // done
     
     // RFC 2252, removed in RFC 4517
-    String LDAP_SCHEMA_DEFINITION_SYNTAX          = "1.3.6.1.4.1.1466.115.121.1.56";
+    String LDAP_SCHEMA_DEFINITION_SYNTAX          = "1.3.6.1.4.1.1466.115.121.1.56"; // done
     
     // RFC 2252, removed in RFC 4517
-    String LDAP_SCHEMA_DESCRIPTION_SYNTAX         = "1.3.6.1.4.1.1466.115.121.1.57";
+    String LDAP_SCHEMA_DESCRIPTION_SYNTAX         = "1.3.6.1.4.1.1466.115.121.1.57"; // done
     
     // RFC 4517, chap 3.3.30
-    String SUBSTRING_ASSERTION_SYNTAX             = "1.3.6.1.4.1.1466.115.121.1.58";
+    String SUBSTRING_ASSERTION_SYNTAX             = "1.3.6.1.4.1.1466.115.121.1.58"; // done
+
+    // From draft-ietf-pkix-ldap-v3-01.txt. Obsolete.
+    String ATTRIBUTE_CERTIFICATE_ASSERTION_SYNTAX = "1.3.6.1.4.1.1466.115.121.1.59"; // done
 
     String UUID_SYNTAX                            = "1.3.6.1.1.16.1"; // done
     String CSN_SYNTAX                             = "1.3.6.1.4.1.4203.666.11.2.1";  // done

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/EnhancedGuideSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/EnhancedGuideSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/EnhancedGuideSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/EnhancedGuideSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+
 
 /**
  * A SyntaxChecker which verifies that a value is an EnhancedGuide according to 
@@ -31,16 +33,12 @@
  */
 public class EnhancedGuideSyntaxChecker extends BinarySyntaxChecker
 {
-    /** the Apache assigned internal OID for this syntax checker */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.21";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public EnhancedGuideSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.ENHANCED_GUIDE_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FacsimileTelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FacsimileTelephoneNumberSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FacsimileTelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FacsimileTelephoneNumberSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -23,6 +23,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -50,9 +51,6 @@
  */
 public class FacsimileTelephoneNumberSyntaxChecker extends TelephoneNumberSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517, par. 3.3.11 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.22";
-    
     /** Fax parameters possible values */
     private static final String TWO_DIMENSIONAL  = "twoDimensional";
     private static final String FINE_RESOLUTION  = "fineResolution";
@@ -82,7 +80,7 @@
      */
     public FacsimileTelephoneNumberSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.FACSIMILE_TELEPHONE_NUMBER_SYNTAX );
     }
 
 
@@ -196,10 +194,8 @@
             
             return true;
         }
-        else
-        {
-            // We must have a valid telephone number !
-            return false;
-        }
+        
+        // We must have a valid telephone number !
+        return false;
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FaxSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FaxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/FaxSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+
 
 /**
  * A SyntaxChecker which verifies that a value is a Fax according to RFC 4517.
@@ -31,16 +33,12 @@
  */
 public class FaxSyntaxChecker extends BinarySyntaxChecker
 {
-    /** the Apache assigned internal OID for this syntax checker */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.23";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public FaxSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.FAX_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/GuideSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/GuideSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/GuideSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/GuideSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+
 
 /**
  * A SyntaxChecker which verifies that a value is a Guide according to RFC 4517.
@@ -30,16 +32,12 @@
  */
 public class GuideSyntaxChecker extends BinarySyntaxChecker
 {
-    /** the Apache assigned internal OID for this syntax checker */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.25";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public GuideSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.GUIDE_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/Ia5StringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/Ia5StringSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/Ia5StringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/Ia5StringSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -35,10 +36,6 @@
  */
 public class Ia5StringSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517, par. 3.3.15 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.26";
-    
-
     /**
      * 
      * Creates a new instance of Ia5StringSyntaxChecker.
@@ -46,7 +43,7 @@
      */
     public Ia5StringSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.IA5_STRING_SYNTAX );
     }
     
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/JpegSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/JpegSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/JpegSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/JpegSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 
 
@@ -40,9 +41,6 @@
  */
 public class JpegSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517, par. 3.3.25 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.28";
-    
     /**
      * 
      * Creates a new instance of JpegSyntaxChecker.
@@ -50,7 +48,7 @@
      */
     public JpegSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.JPEG_SYNTAX );
     }
     
     
@@ -106,9 +104,7 @@
             // file checker...
             return true;
         }
-        else
-        {
-            return false;
-        }
+
+        return false;
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/LdapSyntaxDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/LdapSyntaxDescriptionSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/LdapSyntaxDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/LdapSyntaxDescriptionSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -22,6 +22,7 @@
 
 import java.text.ParseException;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -43,10 +44,6 @@
  */
 public class LdapSyntaxDescriptionSyntaxChecker extends AbstractSyntaxChecker
 {
-
-    /** The Syntax OID, according to RFC 4517, par. 3.3.18 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.54";
-
     /** The schema parser used to parse the LdapSyntaxDescription Syntax */
     private LdapSyntaxDescriptionSchemaParser schemaParser = new LdapSyntaxDescriptionSchemaParser();
 
@@ -58,7 +55,7 @@
      */
     public LdapSyntaxDescriptionSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.LDAP_SYNTAX_DESCRIPTION_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MHSORAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MHSORAddressSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MHSORAddressSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MHSORAddressSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 
 
@@ -31,16 +32,12 @@
  */
 public class MHSORAddressSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** the Apache assigned internal OID for this syntax checker */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.33";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public MHSORAddressSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.MHS_OR_ADDRESS_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MailPreferenceSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MailPreferenceSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MailPreferenceSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MailPreferenceSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -37,9 +38,6 @@
  */
 public class MailPreferenceSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 2252, par. 4.3.2 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.32";
-    
     /**
      * 
      * Creates a new instance of MailPreferenceSyntaxChecker.
@@ -47,7 +45,7 @@
      */
     public MailPreferenceSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.MAIL_PREFERENCE_SYNTAX );
     }
     
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MasterAndShadowAccessPointSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MasterAndShadowAccessPointSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MasterAndShadowAccessPointSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MasterAndShadowAccessPointSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 
 
@@ -31,16 +32,12 @@
  */
 public class MasterAndShadowAccessPointSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** the Apache assigned internal OID for this syntax checker */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.29";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public MasterAndShadowAccessPointSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.MASTER_AND_SHADOW_ACCESS_POINTS_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleDescriptionSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleDescriptionSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -22,6 +22,7 @@
 
 import java.text.ParseException;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -50,10 +51,6 @@
  */
 public class MatchingRuleDescriptionSyntaxChecker extends AbstractSyntaxChecker
 {
-
-    /** The Syntax OID, according to RFC 4517, par. 3.3.19 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.30";
-
     /** The schema parser used to parse the MatchingRuleDescription Syntax */
     private MatchingRuleDescriptionSchemaParser schemaParser = new MatchingRuleDescriptionSchemaParser();
 
@@ -65,7 +62,7 @@
      */
     public MatchingRuleDescriptionSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.MATCHING_RULE_DESCRIPTION_SYNTAX );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleUseDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleUseDescriptionSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleUseDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/MatchingRuleUseDescriptionSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -22,6 +22,7 @@
 
 import java.text.ParseException;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -47,10 +48,6 @@
  */
 public class MatchingRuleUseDescriptionSyntaxChecker extends AbstractSyntaxChecker
 {
-
-    /** The Syntax OID, according to RFC 4517, par. 3.3.20 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.31";
-
     /** The schema parser used to parse the MatchingRuleUseDescription Syntax */
     private MatchingRuleUseDescriptionSchemaParser schemaParser = new MatchingRuleUseDescriptionSchemaParser();
 
@@ -62,7 +59,7 @@
      */
     public MatchingRuleUseDescriptionSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.MATCHING_RULE_USE_DESCRIPTION_SYNTAX );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameAndOptionalUIDSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameAndOptionalUIDSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameAndOptionalUIDSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameAndOptionalUIDSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -42,9 +43,6 @@
  */
 public class NameAndOptionalUIDSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according RFC 4517, par. 3.3.21 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.34";
-    
     /**
      * 
      * Creates a new instance of NameAndOptionalUIDSyntaxChecker.
@@ -52,7 +50,7 @@
      */
     public NameAndOptionalUIDSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.NAME_AND_OPTIONAL_UID_SYNTAX );
     }
     
     

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameFormDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameFormDescriptionSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameFormDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameFormDescriptionSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -22,6 +22,7 @@
 
 import java.text.ParseException;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.parsers.NameFormDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -48,10 +49,6 @@
  */
 public class NameFormDescriptionSyntaxChecker extends AbstractSyntaxChecker
 {
-
-    /** The Syntax OID, according to RFC 4517, par. 3.3.22 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.35";
-
     /** The schema parser used to parse the DITContentRuleDescription Syntax */
     private NameFormDescriptionSchemaParser schemaParser = new NameFormDescriptionSchemaParser();
 
@@ -63,7 +60,7 @@
      */
     public NameFormDescriptionSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.NAME_FORM_DESCRIPTION_SYNTAX );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumericStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumericStringSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumericStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumericStringSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -42,9 +43,6 @@
  */
 public class NumericStringSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517, par. 3.3.23 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.36";
-    
     /**
      * 
      * Creates a new instance of NumericStringSyntaxChecker.
@@ -52,7 +50,7 @@
      */
     public NumericStringSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.NUMERIC_STRING_SYNTAX );
     }
     
     

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassDescriptionSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassDescriptionSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -22,6 +22,7 @@
 
 import java.text.ParseException;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -54,10 +55,6 @@
  */
 public class ObjectClassDescriptionSyntaxChecker extends AbstractSyntaxChecker
 {
-
-    /** The Syntax OID, according to RFC 4517, par. 3.3.24 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.37";
-
     /** The schema parser used to parse the ObjectClassDescription Syntax */
     private ObjectClassDescriptionSchemaParser schemaParser = new ObjectClassDescriptionSchemaParser();
 
@@ -69,7 +66,7 @@
      */
     public ObjectClassDescriptionSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.OBJECT_CLASS_DESCRIPTION_SYNTAX );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OctetStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OctetStringSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OctetStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OctetStringSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 
 
@@ -36,10 +37,6 @@
  */
 public class OctetStringSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517, par. 3.3.25 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.40";
-    
-
     /**
      * 
      * Creates a new instance of OctetStringSyntaxChecker.
@@ -47,7 +44,7 @@
      */
     public OctetStringSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.OCTET_STRING_SYNTAX );
     }
 
     

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OidSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OidSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -21,6 +21,7 @@
 
 
 import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -49,9 +50,6 @@
  */
 public class OidSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according RFC 4517, par. 3.3.26 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.38";
-    
     /**
      * 
      * Creates a new instance of OidSyntaxChecker.
@@ -59,7 +57,7 @@
      */
     public OidSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.OID_SYNTAX );
     }
     
     

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OtherMailboxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OtherMailboxSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OtherMailboxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/OtherMailboxSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -37,9 +38,6 @@
  */
 public class OtherMailboxSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.39";
-    
     /**
      * 
      * Creates a new instance of OtherMailboxSyntaxChecker.
@@ -47,7 +45,7 @@
      */
     public OtherMailboxSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.OTHER_MAILBOX_SYNTAX );
     }
     
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PostalAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PostalAddressSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PostalAddressSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PostalAddressSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -36,9 +37,6 @@
  */
 public class PostalAddressSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.41";
-    
     /**
      * 
      * Creates a new instance of PostalAddressSyntaxChecker.
@@ -46,7 +44,7 @@
      */
     public PostalAddressSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.POSTAL_ADDRESS_SYNTAX );
     }
     
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PresentationAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PresentationAddressSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PresentationAddressSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PresentationAddressSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+
 
 /**
  * A SyntaxChecker which verifies that a value is a PresentationAddressSyntax.
@@ -30,16 +32,12 @@
  */
 public class PresentationAddressSyntaxChecker extends BinarySyntaxChecker
 {
-    /** the Apache assigned internal OID for this syntax checker */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.43";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public PresentationAddressSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.PRESENTATION_ADDRESS_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PrintableStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PrintableStringSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PrintableStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/PrintableStringSyntaxChecker.java Fri Jun  5 00:20:42 2009
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.schema.syntaxes;
 
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -57,9 +58,6 @@
  */
 public class PrintableStringSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517, par. 3.3.29 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.44";
-    
     /**
      * 
      * Creates a new instance of PrintableStringSyntaxChecker.
@@ -67,7 +65,7 @@
      */
     public PrintableStringSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.PRINTABLE_STRING_SYNTAX );
     }
     
     



Mime
View raw message