directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r781789 [2/2] - in /directory: apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ shared/trunk/ldap-constants/src/main...
Date Thu, 04 Jun 2009 16:18:24 GMT
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=781789&r1=781788&r2=781789&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 Thu Jun  4 16:18:23 2009
@@ -24,6 +24,7 @@
 
 import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum;
 import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.syntaxes.ACIItemSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxes.AcceptAllSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxes.AccessPointSyntaxChecker;
@@ -129,16 +130,16 @@
          * 8 Certificate List                 N  1.3.6.1.4.1.1466.115.121.1.9
          * 9 Certificate Pair                 N  1.3.6.1.4.1.1466.115.121.1.10
          */
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.1", new ACIItemSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.2", new AccessPointSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.3", new AttributeTypeDescriptionSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.4", new AudioSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.5", new BinarySyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.6", new BitStringSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.7", new BooleanSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.8", new CertificateSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.9", new CertificateListSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.10", new CertificatePairSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.ACI_ITEM_SYNTAX, new ACIItemSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.ACCESS_POINT_SYNTAX, new AccessPointSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.ATTRIBUT_TYPE_DESCRIPTION_SYNTAX, new AttributeTypeDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.AUDIO_SYNTAX, new AudioSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.BINARY_SYNTAX, new BinarySyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.BIT_STRING_SYNTAX, new BitStringSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.BOOLEAN_SYNTAX, new BooleanSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.CERTIFICATE_SYNTAX, new CertificateSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.CERTIFICATE_LIST_SYNTAX, new CertificateListSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.CERTIFICATE_PAIR_SYNTAX, new CertificatePairSyntaxChecker() );
 
         /*
          * 10 Country String                  Y  1.3.6.1.4.1.1466.115.121.1.11
@@ -152,16 +153,16 @@
          * 18 DSA Quality Syntax              Y  1.3.6.1.4.1.1466.115.121.1.19
          * 19 DSE Type                        Y  1.3.6.1.4.1.1466.115.121.1.20
          */
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.11", new CountrySyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.12", new DNSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.13", new DataQualitySyntaxSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.14", new DeliveryMethodSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.15", new DirectoryStringSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.16", new DITContentRuleDescriptionSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.17", new DITStructureRuleDescriptionSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.18", new DLSubmitPermissionSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.19", new DSAQualitySyntaxSyntaxChecker() );
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.20", new DSETypeSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.COUNTRY_STRING_SYNTAX, new CountrySyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.DN_SYNTAX, new DNSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.DATA_QUALITY_SYNTAX, new DataQualitySyntaxSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.DELIVERY_METHOD_SYNTAX, new DeliveryMethodSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.DIRECTORY_STRING_SYNTAX, new DirectoryStringSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.DIT_CONTENT_RULE_SYNTAX, new DITContentRuleDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.DIT_STRUCTURE_RULE_SYNTAX, new DITStructureRuleDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.DL_SUBMIT_PERMISSION_SYNTAX, new DLSubmitPermissionSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.DSA_QUALITY_SYNTAX, new DSAQualitySyntaxSyntaxChecker() );
+        cb.schemaObjectProduced( this, SchemaConstants.DSE_TYPE_SYNTAX, new DSETypeSyntaxChecker() );
 
         /* 20 Enhanced Guide                  Y  1.3.6.1.4.1.1466.115.121.1.21
          * 21 Facsimile Telephone Number      Y  1.3.6.1.4.1.1466.115.121.1.22
@@ -177,10 +178,10 @@
         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, "1.3.6.1.4.1.1466.115.121.1.24", new GeneralizedTimeSyntaxChecker() );
+        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, "1.3.6.1.4.1.1466.115.121.1.27", new IntegerSyntaxChecker() );
+        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() );
@@ -242,7 +243,7 @@
          */
         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, "1.3.6.1.4.1.1466.115.121.1.53", new UtcTimeSyntaxChecker() );
+        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, "1.3.6.1.4.1.1466.115.121.1.55", 

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=781789&r1=781788&r2=781789&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 Thu Jun  4 16:18:23 2009
@@ -25,6 +25,9 @@
 import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum;
 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;
 
 
 /**
@@ -139,62 +142,62 @@
          * 8 Certificate List                N  1.3.6.1.4.1.1466.115.121.1.9
          * 9 Certificate Pair                N  1.3.6.1.4.1.1466.115.121.1.10
          */
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.1", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.ACI_ITEM_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "ACI Item" } );
         // This is in direct conflict with RFC 2252 but for us ACI Item is human readable
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.2", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.ACCESS_POINT_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Access Point" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.3", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.ATTRIBUT_TYPE_DESCRIPTION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Attribute Type Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.4", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.AUDIO_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Audio" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.5", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.BINARY_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Binary" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.6", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.BIT_STRING_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Bit String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.7", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.BOOLEAN_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Boolean" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.8", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.CERTIFICATE_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Certificate" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.9", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.CERTIFICATE_LIST_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Certificate List" } );
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.10", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.CERTIFICATE_PAIR_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Certificate Pair" } );
         syntax.setHumanReadable( false );
@@ -214,61 +217,61 @@
          * 18 DSA Quality Syntax              Y  1.3.6.1.4.1.1466.115.121.1.19
          * 19 DSE Type                        Y  1.3.6.1.4.1.1466.115.121.1.20
          */
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.11", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.COUNTRY_STRING_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Country String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.12", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.DN_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DN" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.13", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.DATA_QUALITY_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Data Quality Syntax" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.14", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.DELIVERY_METHOD_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Delivery Method" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.15", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.DIRECTORY_STRING_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Directory String" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.16", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.DIT_CONTENT_RULE_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DIT Content Rule Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.17", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.DIT_STRUCTURE_RULE_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DIT Structure Rule Description" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.18", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.DL_SUBMIT_PERMISSION_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DL Submit Permission" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.19", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.DSA_QUALITY_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DSA Quality Syntax" } );
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.20", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.DSE_TYPE_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DSE Type" } );
         syntax.setHumanReadable( true );
@@ -306,7 +309,7 @@
         syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.24", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.GENERALIZED_TIME_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Generalized Time" } );
         syntax.setHumanReadable( true );
@@ -324,7 +327,7 @@
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.27", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.INTEGER_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "INTEGER" } );
         syntax.setHumanReadable( true );
@@ -528,7 +531,7 @@
         syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
-        syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.53", syntaxCheckerRegistry );
+        syntax = new BootstrapSyntax( SchemaConstants.UTC_TIME_SYNTAX, syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "UTC Time" } );
         syntax.setHumanReadable( true );

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=781789&r1=781788&r2=781789&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 Thu Jun  4 16:18:23 2009
@@ -442,128 +442,354 @@
     // no official OID in RFCs
     
     // ---- Syntaxes -----------------------------------------------------
+    // RFC 2252, removed in RFC 4517
+    String ACI_ITEM_SYNTAX                        = "1.3.6.1.4.1.1466.115.121.1.1"; // done
 
-    String BINARY_SYNTAX                    = "1.3.6.1.4.1.1466.115.121.1.5";
-    String BIT_STRING_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.6";
-    String BOOLEAN_SYNTAX                   = "1.3.6.1.4.1.1466.115.121.1.7";
-    String GENERALIZED_TIME_SYNTAX          = "1.3.6.1.4.1.1466.115.121.1.24";
-    String INTEGER_SYNTAX                   = "1.3.6.1.4.1.1466.115.121.1.27";
-    String UTC_TIME_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.53";
-    String DIRECTORY_STRING_SYNTAX          = "1.3.6.1.4.1.1466.115.121.1.15";
-    String UUID_SYNTAX                      = "1.3.6.1.1.16.1";
-    String CSN_SYNTAX                       = "1.3.6.1.4.1.4203.666.11.2.1";  // done
-    String CSN_SID_SYNTAX                   = "1.3.6.1.4.1.4203.666.11.2.4";
-
-    String JAVA_BYTE_SYNTAX                 = "1.3.6.1.4.1.18060.0.4.1.0.0";
-    String JAVA_CHAR_SYNTAX                 = "1.3.6.1.4.1.18060.0.4.1.0.1";
-    String JAVA_SHORT_SYNTAX                = "1.3.6.1.4.1.18060.0.4.1.0.2";
-    String JAVA_LONG_SYNTAX                 = "1.3.6.1.4.1.18060.0.4.1.0.3";
-    String JAVA_INT_SYNTAX                  = "1.3.6.1.4.1.18060.0.4.1.0.4";
+    // RFC 2252, removed in RFC 4517
+    String ACCESS_POINT_SYNTAX                    = "1.3.6.1.4.1.1466.115.121.1.2"; // done
+    
+    // RFC 4517, chap 3.3.1
+    String ATTRIBUT_TYPE_DESCRIPTION_SYNTAX       = "1.3.6.1.4.1.1466.115.121.1.3"; // done
+
+    // RFC 2252, removed in RFC 4517
+    String AUDIO_SYNTAX                           = "1.3.6.1.4.1.1466.115.121.1.4"; // done
+
+    // RFC 2252, removed in RFC 4517
+    String BINARY_SYNTAX                          = "1.3.6.1.4.1.1466.115.121.1.5"; // done
+    
+    // RFC 4517, chap 3.3.2
+    String BIT_STRING_SYNTAX                      = "1.3.6.1.4.1.1466.115.121.1.6"; // done
+    
+    // RFC 4517, chap 3.3.3
+    String BOOLEAN_SYNTAX                         = "1.3.6.1.4.1.1466.115.121.1.7"; // done
+    
+    // RFC 2252, removed in RFC 4517, reintroduced in RFC 4523, chap. 2.1 
+    String CERTIFICATE_SYNTAX                     = "1.3.6.1.4.1.1466.115.121.1.8"; // done
+    
+    // RFC 2252, removed in RFC 4517, reintroduced in RFC 4523, chap. 2.2 
+    String CERTIFICATE_LIST_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.9"; // done
+
+    // RFC 2252, removed in RFC 4517, reintroduced in RFC 4523, chap. 2.3 
+    String CERTIFICATE_PAIR_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.10"; // done
+    
+    // RFC 4517, chap 3.3.4
+    String COUNTRY_STRING_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.11"; // done
+    
+    // RFC 4517, chap 3.3.9
+    String DN_SYNTAX                              = "1.3.6.1.4.1.1466.115.121.1.12"; // done
+
+    // RFC 2252, removed in RFC 4517
+    String DATA_QUALITY_SYNTAX                    = "1.3.6.1.4.1.1466.115.121.1.13"; // done
+    
+    // RFC 4517, chap 3.3.5
+    String DELIVERY_METHOD_SYNTAX                 = "1.3.6.1.4.1.1466.115.121.1.14"; // done
+    
+    // RFC 4517, chap 3.3.6
+    String DIRECTORY_STRING_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.15"; // done
+    
+    // RFC 4517, chap 3.3.7
+    String DIT_CONTENT_RULE_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.16"; // done
+    
+    // RFC 4517, chap 3.3.8
+    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";
+
+    // RFC 2252, removed in RFC 4517
+    String DSA_QUALITY_SYNTAX                     = "1.3.6.1.4.1.1466.115.121.1.19";
+
+    // RFC 2252, removed in RFC 4517
+    String DSE_TYPE_SYNTAX                        = "1.3.6.1.4.1.1466.115.121.1.20";
+    
+    // RFC 4517, chap 3.3.10
+    String ENHANCED_GUIDE_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.21";
+    
+    // RFC 4517, chap 3.3.11
+    String FACSIMILE_TELEPHONE_NUMBER_SYNTAX      = "1.3.6.1.4.1.1466.115.121.1.22";
+    
+    // RFC 4517, chap 3.3.12
+    String FAX_SYNTAX                             = "1.3.6.1.4.1.1466.115.121.1.23";
+    
+    // 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";
+    
+    // RFC 4517, chap 3.3.15
+    String IA5_STRING_SYNTAX                      = "1.3.6.1.4.1.1466.115.121.1.26";
+    
+    // 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";
+    
+    // RFC 2252, removed in RFC 4517
+    String Master_And_Shadow_Access_Points_SYNTAX = "1.3.6.1.4.1.1466.115.121.1.29";
+    
+    // RFC 4517, chap 3.3.19
+    String MATCHING_RULE_DESCRIPTION_SYNTAX       = "1.3.6.1.4.1.1466.115.121.1.30";
+    
+    // RFC 4517, chap 3.3.20
+    String MATCHING_RULE_USE_DESCRIPTION_SYNTAX   = "1.3.6.1.4.1.1466.115.121.1.31";
+    
+    // RFC 2252, removed in RFC 4517
+    String MAIL_PREFERENCE_SYNTAX                 = "1.3.6.1.4.1.1466.115.121.1.32";
+    
+    // RFC 2252, removed in RFC 4517
+    String MHS_OR_ADDRESS_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.33";
+    
+    // RFC 4517, chap 3.3.21
+    String NAME_AND_OPTIONAL_UID_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.34";
+    
+    // RFC 4517, chap 3.3.22
+    String NAME_FORM_DESCRIPTION_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.35";
+    
+    // RFC 4517, chap 3.3.23
+    String NUMERIC_STRING_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.36";
+    
+    // RFC 4517, chap 3.3.24
+    String OBJECT_CLASS_DESCRIPTION_SYNTAX        = "1.3.6.1.4.1.1466.115.121.1.37";
+    
+    // RFC 4517, chap 3.3.26
+    String OID_SYNTAX                             = "1.3.6.1.4.1.1466.115.121.1.38";
+    
+    // RFC 4517, chap 3.3.27
+    String OTHER_MAILBOX_SYNTAX                   = "1.3.6.1.4.1.1466.115.121.1.39";
+    
+    // RFC 4517, chap 3.3.25
+    String OCTET_STRING_SYNTAX                    = "1.3.6.1.4.1.1466.115.121.1.40";
+    
+    // RFC 4517, chap 3.3.28
+    String POSTAL_ADDRESS_SYNTAX                  = "1.3.6.1.4.1.1466.115.121.1.41";
+    
+    // RFC 2252, removed in RFC 4517
+    String PROTOCOL_INFORMATION_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.42";
+    
+    // RFC 2252, removed in RFC 4517
+    String PRESENTATION_ADDRESS_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.43";
+    
+    // RFC 4517, chap 3.3.29
+    String PRINTABLE_STRING_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.44";
+    
+    // RFC 2252, removed in RFC 4517
+    String SUBTREE_SPECIFICATION_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.45";
+    
+    // RFC 2252, removed in RFC 4517
+    String SUPPLIER_INFORMATION_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.46";
+    
+    // RFC 2252, removed in RFC 4517
+    String SUPPLIER_OR_CONSUMER_SYNTAX            = "1.3.6.1.4.1.1466.115.121.1.47";
+    
+    // RFC 2252, removed in RFC 4517
+    String SUPPLIER_AND_CONSUMER_SYNTAX           = "1.3.6.1.4.1.1466.115.121.1.48";
+
+    // 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";
+    
+    // RFC 4517, chap 3.3.31
+    String TELEPHONE_NUMBER_SYNTAX                = "1.3.6.1.4.1.1466.115.121.1.50";
+
+    // RFC 4517, chap 3.3.32
+    String TELETEX_TERMINAL_IDENTIFIER_SYNTAX     = "1.3.6.1.4.1.1466.115.121.1.51";
+    
+    // RFC 4517, chap 3.3.33
+    String TELEX_NUMBER_SYNTAX                    = "1.3.6.1.4.1.1466.115.121.1.52";
+    
+    // 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";
+    
+    // RFC 2252, removed in RFC 4517
+    String MODIFY_RIGHTS_SYNTAX                   = "1.3.6.1.4.1.1466.115.121.1.55";
+    
+    // RFC 2252, removed in RFC 4517
+    String LDAP_SCHEMA_DEFINITION_SYNTAX          = "1.3.6.1.4.1.1466.115.121.1.56";
+    
+    // RFC 2252, removed in RFC 4517
+    String LDAP_SCHEMA_DESCRIPTION_SYNTAX         = "1.3.6.1.4.1.1466.115.121.1.57";
+    
+    // RFC 4517, chap 3.3.30
+    String SUBSTRING_ASSERTION_SYNTAX             = "1.3.6.1.4.1.1466.115.121.1.58";
+
+    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
+    String CSN_SID_SYNTAX                         = "1.3.6.1.4.1.4203.666.11.2.4"; // done
+
+    String JAVA_BYTE_SYNTAX                       = "1.3.6.1.4.1.18060.0.4.1.0.0";
+    String JAVA_CHAR_SYNTAX                       = "1.3.6.1.4.1.18060.0.4.1.0.1";
+    String JAVA_SHORT_SYNTAX                      = "1.3.6.1.4.1.18060.0.4.1.0.2";
+    String JAVA_LONG_SYNTAX                       = "1.3.6.1.4.1.18060.0.4.1.0.3";
+    String JAVA_INT_SYNTAX                        = "1.3.6.1.4.1.18060.0.4.1.0.4";
 
     // ---- MatchingRules -----------------------------------------------------
+    // caseExactIA5Match (RFC 4517, chap. 4.2.3)
+    String CASE_EXACT_IA5_MATCH_MR                        = "caseExactIA5Match"; // done
+    String CASE_EXACT_IA5_MATCH_MR_OID                    = "1.3.6.1.4.1.1466.109.114.1"; // done
+    
+    // caseIgnoreIA5Match (RFC 4517, chap. 4.2.7)
+    String CASE_IGNORE_IA5_MATCH_MR                       = "caseIgnoreIA5Match"; // done
+    String CASE_IGNORE_IA5_MATCH_MR_OID                   = "1.3.6.1.4.1.1466.109.114.2"; // done
+    
+    // caseIgnoreIA5SubstringsMatch (RFC 4517, chap. 4.2.8)
+    String CASE_IGNORE_IA5_SUBSTRINGS_MATCH_MR            = "caseIgnoreIA5SubstringsMatch"; // done
+    String CASE_IGNORE_IA5_SUBSTRINGS_MATCH_MR_OID        = "1.3.6.1.4.1.1466.109.114.3"; // done
+    
     // objectIdentifierMatch (RFC 4517, chap. 4.2.26)
-    String OBJECT_IDENTIFIER_MATCH_MR               = "objectIdentifierMatch"; // done
-    String OBJECT_IDENTIFIER_MATCH_MR_OID           = "2.5.13.0"; // done
+    String OBJECT_IDENTIFIER_MATCH_MR                     = "objectIdentifierMatch"; // done
+    String OBJECT_IDENTIFIER_MATCH_MR_OID                 = "2.5.13.0"; // done
     
     // distinguishedNameMatch (RFC 4517, chap. 4.2.15)
-    String DISTINGUISHED_NAME_MATCH_MR              = "distinguishedNameMatch"; // done
-    String DISTINGUISHED_NAME_MATCH_MR_OID          = "2.5.13.1"; // done
+    String DISTINGUISHED_NAME_MATCH_MR                    = "distinguishedNameMatch"; // done
+    String DISTINGUISHED_NAME_MATCH_MR_OID                = "2.5.13.1"; // done
     
     // caseIgnoreMatch (RFC 4517, chap. 3.3.19)
-    String CASE_IGNORE_MATCH_MR                     = "caseIgnoreMatch"; // done
-    String CASE_IGNORE_MATCH_MR_OID                 = "2.5.13.2"; // done
+    String CASE_IGNORE_MATCH_MR                           = "caseIgnoreMatch"; // done
+    String CASE_IGNORE_MATCH_MR_OID                       = "2.5.13.2"; // done
     
     // caseIgnoreOrderingMatch (RFC 4517, chap. 4.2.12)
-    String CASE_IGNORE_ORDERING_MATCH_MR            = "caseIgnoreOrderingMatch"; // done
-    String CASE_IGNORE_ORDERING_MATCH_MR_OID        = "2.5.13.3"; // done
+    String CASE_IGNORE_ORDERING_MATCH_MR                  = "caseIgnoreOrderingMatch"; // done
+    String CASE_IGNORE_ORDERING_MATCH_MR_OID              = "2.5.13.3"; // done
     
     // caseIgnoreSubstringsMatch (RFC 4517, chap. 4.2.13)
-    String CASE_IGNORE_SUBSTRING_MATCH_MR           = "caseIgnoreSubstringsMatch"; // done
-    String CASE_IGNORE_SUBSTRING_MATCH_MR_OID       = "2.5.13.4"; // done
+    String CASE_IGNORE_SUBSTRING_MATCH_MR                 = "caseIgnoreSubstringsMatch"; // done
+    String CASE_IGNORE_SUBSTRING_MATCH_MR_OID             = "2.5.13.4"; // done
     
     // caseExactMatch (RFC 4517, chap. 4.2.4)
-    String CASE_EXACT_MATCH_MR                      = "caseExactMatch"; // done
-    String CASE_EXACT_MATCH_MR_OID                  = "2.5.13.5"; // done
+    String CASE_EXACT_MATCH_MR                            = "caseExactMatch"; // done
+    String CASE_EXACT_MATCH_MR_OID                        = "2.5.13.5"; // done
     
     // caseExactOrderingMatch (RFC 4517, chap. 4.2.5)
-    String CASE_EXACT_ORDERING_MATCH_MR             = "caseExactOrderingMatch"; // done
-    String CASE_EXACT_ORDERING_MATCH_MR_OID         = "2.5.13.6"; // done
+    String CASE_EXACT_ORDERING_MATCH_MR                   = "caseExactOrderingMatch"; // done
+    String CASE_EXACT_ORDERING_MATCH_MR_OID               = "2.5.13.6"; // done
     
     // caseExactSubstringsMatch (RFC 4517, chap. 4.2.6)
-    String CASE_EXACT_SUBSTRING_MATCH_MR            = "caseExactSubstringsMatch"; // done
-    String CASE_EXACT_SUBSTRING_MATCH_MR_OID        = "2.5.13.7"; // done
+    String CASE_EXACT_SUBSTRING_MATCH_MR                  = "caseExactSubstringsMatch"; // done
+    String CASE_EXACT_SUBSTRING_MATCH_MR_OID              = "2.5.13.7"; // done
     
     // numericStringMatch (RFC 4517, chap. 4.2.22)
-    String NUMERIC_STRING_MATCH_MR                  = "numericStringMatch"; // done
-    String NUMERIC_STRING_MATCH_MR_OID              = "2.5.13.8"; // done
+    String NUMERIC_STRING_MATCH_MR                        = "numericStringMatch"; // done
+    String NUMERIC_STRING_MATCH_MR_OID                    = "2.5.13.8"; // done
     
     // numericStringOrderingMatch (RFC 4517, chap. 4.2.23)
-    String NUMERIC_STRING_ORDERING_MATCH_MR         = "numericStringOrderingMatch"; // done
-    String NUMERIC_STRING_ORDERING_MATCH_MR_OID     = "2.5.13.9"; // done
+    String NUMERIC_STRING_ORDERING_MATCH_MR               = "numericStringOrderingMatch"; // done
+    String NUMERIC_STRING_ORDERING_MATCH_MR_OID           = "2.5.13.9"; // done
     
     // numericStringSubstringsMatch (RFC 4517, chap. 4.2.24)
-    String NUMERIC_STRING_SUBSTRINGS_MATCH_MR       = "numericStringSubstringsMatch"; // done
-    String NUMERIC_STRING_SUBSTRINGS_MATCH_MR_OID   = "2.5.13.10"; // done
+    String NUMERIC_STRING_SUBSTRINGS_MATCH_MR             = "numericStringSubstringsMatch"; // done
+    String NUMERIC_STRING_SUBSTRINGS_MATCH_MR_OID         = "2.5.13.10"; // done
     
     // caseIgnoreListMatch (RFC 4517, chap. 4.2.9)
-    String CASE_IGNORE_LIST_MATCH_MR                = "caseIgnoreListMatch"; // done
-    String CASE_IGNORE_LIST_MATCH_MR_OID            = "2.5.13.11"; // done
+    String CASE_IGNORE_LIST_MATCH_MR                      = "caseIgnoreListMatch"; // done
+    String CASE_IGNORE_LIST_MATCH_MR_OID                  = "2.5.13.11"; // done
     
     // caseIgnoreListSubstringsMatch (RFC 4517, chap. 4.2.10)
-    String CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR     = "caseIgnoreListSubstringsMatch"; // done
-    String CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID = "2.5.13.12"; // done
+    String CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR           = "caseIgnoreListSubstringsMatch"; // done
+    String CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID       = "2.5.13.12"; // done
     
     // booleanMatch (RFC 4517, chap. 4.2.2)
-    String BOOLEAN_MATCH_MR                         = "booleanMatch"; // done
-    String BOOLEAN_MATCH_MR_OID                     = "2.5.13.13"; // done
+    String BOOLEAN_MATCH_MR                               = "booleanMatch"; // done
+    String BOOLEAN_MATCH_MR_OID                           = "2.5.13.13"; // done
     
     // integerMatch (RFC 4517, chap. 4.2.19)
-    String INTEGER_MATCH_MR                         = "integerMatch"; // done
-    String INTEGER_MATCH_MR_OID                     = "2.5.13.14"; // done
+    String INTEGER_MATCH_MR                               = "integerMatch"; // done
+    String INTEGER_MATCH_MR_OID                           = "2.5.13.14"; // done
     
     // integerOrderingMatch (RFC 4517, chap. 4.2.20)
-    String INTEGER_ORDERING_MATCH_MR                = "integerOrderingMatch"; // done
-    String INTEGER_ORDERING_MATCH_MR_OID            = "2.5.13.15"; // done
+    String INTEGER_ORDERING_MATCH_MR                      = "integerOrderingMatch"; // done
+    String INTEGER_ORDERING_MATCH_MR_OID                  = "2.5.13.15"; // done
 
     // bitStringMatch (RFC 4517, chap. 4.2.1)
-    String BIT_STRING_MATCH_MR                      = "bitStringMatch"; // done
-    String BIT_STRING_MATCH_MR_OID                  = "2.5.13.16"; // done
+    String BIT_STRING_MATCH_MR                            = "bitStringMatch"; // done
+    String BIT_STRING_MATCH_MR_OID                        = "2.5.13.16"; // done
     
     // octetStringMatch (RFC 4517, chap. 4.2.27)
-    String OCTET_STRING_MATCH_MR                    = "octetStringMatch"; // done
-    String OCTET_STRING_MATCH_MR_OID                = "2.5.13.17"; // done
+    String OCTET_STRING_MATCH_MR                          = "octetStringMatch"; // done
+    String OCTET_STRING_MATCH_MR_OID                     = "2.5.13.17"; // done
     
     // octetStringMatch (RFC 4517, chap. 4.2.28)
-    String OCTET_STRING_ORDERING_MATCH_MR           = "octetStringOrderingMatch"; // done
-    String OCTET_STRING_ORDERING_MATCH_MR_OID       = "2.5.13.18"; // done
+    String OCTET_STRING_ORDERING_MATCH_MR                 = "octetStringOrderingMatch"; // done
+    String OCTET_STRING_ORDERING_MATCH_MR_OID             = "2.5.13.18"; // done
     
-    // "2.5.13.19" is not used...
+    // octetStringSubstringsMatch
+    String OCTET_STRING_SUBSTRINGS_MATCH_MR               = "octetStringSubstringsMatch"; // done
+    String OCTET_STRING_SUBSTRINGS_MATCH_MR_OID           = "2.5.13.19"; // done
     
     // telephoneNumberMatch (RFC 4517, chap. 4.2.29)
-    String TELEPHONE_NUMBER_MATCH_MR                = "telephoneNumberMatch"; // done
-    String TELEPHONE_NUMBER_MATCH_MR_OID            = "2.5.13.20"; // done
+    String TELEPHONE_NUMBER_MATCH_MR                      = "telephoneNumberMatch"; // done
+    String TELEPHONE_NUMBER_MATCH_MR_OID                  = "2.5.13.20"; // done
     
     // telephoneNumberMatch (RFC 4517, chap. 4.2.30)
-    String TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR     = "telephoneNumberSubstringsMatch"; // done
-    String TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR_OID = "2.5.13.21"; // done
+    String TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR           = "telephoneNumberSubstringsMatch"; // done
+    String TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR_OID       = "2.5.13.21"; // done
     
-    String GENERALIZED_TIME_MR                = "generalizedTimeMatch";
-    String GENERALIZED_TIME_ORDERING_MR       = "generalizedTimeOrderingMatch";
-    String UUID_MATCH                         = "uuidMatch";
-    String UUID_ORDERING_MATCH                = "uuidOrderingMatch";
+    // presentationAddressMatch Removed in RFC 4517
+    String PRESENTATION_ADDRESS_MATCH_MATCH_MR            = "presentationAddressMatch"; // done
+    String PRESENTATION_ADDRESS_MATCH_MATCH_MR_OID        = "2.5.13.22"; // done
+    
+    // uniqueMemberMatch (RFC 4517, chap. 4.2.31)
+    String UNIQUE_MEMBER_MATCH_MATCH_MR                   = "uniqueMemberMatch"; // done
+    String UNIQUE_MEMBER_MATCH_MATCH_MR_OID               = "2.5.13.23"; // done
+    
+    // protocolInformationMatch Removed in RFC 4517
+    String PROTOCOL_INFORMATION_MATCH_MATCH_MR            = "protocolInformationMatch"; // done
+    String PROTOCOL_INFORMATION_MATCH_MATCH_MR_OID        = "2.5.13.24"; // done
+    
+    // "2.5.13.25" is not used ...
+    // "2.5.13.26" is not used ...
+    
+    // generalizedTimeMatch (RFC 4517, chap. 4.2.16)
+    String GENERALIZED_TIME_MATCH_MR                      = "generalizedTimeMatch"; // done
+    String GENERALIZED_TIME_MATCH_MR_OID                  = "2.5.13.27"; // done
+    
+    // generalizedTimeOrderingMatch (RFC 4517, chap. 4.2.17)
+    String GENERALIZED_TIME_ORDERING_MATCH_MR             = "generalizedTimeOrderingMatch";
+    String GENERALIZED_TIME_ORDERING_MATCH_MR_OID         = "2.5.13.28";
+
+    // integerFirstComponentMatch (RFC 4517, chap. 4.2.18)
+    String INTEGER_FIRST_COMPONENT_MATCH_MR               = "integerFirstComponentMatch"; // done
+    String INTEGER_FIRST_COMPONENT_MATCH_MR_OID           = "2.5.13.29"; // done
+    
+    // objectIdentifierFirstComponentMatch (RFC 4517, chap. 4.2.25)
+    String OBJECT_IDENTIFIER_FIRST_COMPONENT_MATCH_MR     = "objectIdentifierFirstComponentMatch"; // done
+    String OBJECT_IDENTIFIER_FIRST_COMPONENT_MATCH_MR_OID = "2.5.13.30"; // done
+
+    // directoryStringFirstComponentMatch (RFC 4517, chap. 4.2.14)
+    String DIRECTORY_STRING_FIRST_COMPONENT_MATCH_MR      = "directoryStringFirstComponentMatch"; // done
+    String DIRECTORY_STRING_FIRST_COMPONENT_MATCH_MR_OID  = "2.5.13.31"; // done
+
+    // wordMatch (RFC 4517, chap. 4.2.32)
+    String WORD_MATCH_MR                                  = "wordMatch"; // done
+    String WORD_MATCH_MR_OID                              = "2.5.13.32"; // done
+
+    // keywordMatch (RFC 4517, chap. 4.2.21)
+    String KEYWORD_MATCH_MR                               = "keywordMatch"; // done
+    String KEYWORD_MATCH_MR_OID                           = "2.5.13.33"; // done
+
+    // uuidMatch
+    String UUID_MATCH_MR                                  = "uuidMatch"; // done
+    String UUID_MATCH_MR_OID                              = "1.3.6.1.1.16.2"; // done
+    
+    // uuidOrderingMatch
+    String UUID_ORDERING_MATCH_MR                         = "uuidOrderingMatch"; // done
+    String UUID_ORDERING_MATCH_MR_OID                     = "1.3.6.1.1.16.3"; // done
     
     // csnMatch 
-    String CSN_MATCH_MR                       = "csnMatch";  // done
-    String CSN_MATCH_MR_OID                   = "1.3.6.1.4.1.4203.666.11.2.2";  // done
+    String CSN_MATCH_MR                                   = "csnMatch";  // done
+    String CSN_MATCH_MR_OID                               = "1.3.6.1.4.1.4203.666.11.2.2";  // done
     
     // csnOrderingMatch
-    String CSN_ORDERING_MATCH_MR              = "csnOrderingMatch";  // done
-    String CSN_ORDERING_MATCH_MR_OID          = "1.3.6.1.4.1.4203.666.11.2.3";  // done
+    String CSN_ORDERING_MATCH_MR                          = "csnOrderingMatch";  // done
+    String CSN_ORDERING_MATCH_MR_OID                      = "1.3.6.1.4.1.4203.666.11.2.3";  // done
     
     // csnSidMatch
-    String CSN_SID_MATCH_MR                   = "csnSidMatch";  // done
-    String CSN_SID_MATCH_MR_OID               = "1.3.6.1.4.1.4203.666.11.2.5";  // done
+    String CSN_SID_MATCH_MR                               = "csnSidMatch";  // done
+    String CSN_SID_MATCH_MR_OID                           = "1.3.6.1.4.1.4203.666.11.2.5";  // done
     
     // ---- Features ----------------------------------------------------------
-    String FEATURE_ALL_OPERATIONAL_ATTRIBUTES = "1.3.6.1.4.1.4203.1.5.1";
+    String FEATURE_ALL_OPERATIONAL_ATTRIBUTES             = "1.3.6.1.4.1.4203.1.5.1";
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ACIItemSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ACIItemSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ACIItemSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ACIItemSyntaxChecker.java Thu Jun  4 16:18:23 2009
@@ -22,6 +22,7 @@
 import java.text.ParseException;
 
 import org.apache.directory.shared.ldap.aci.ACIItemChecker;
+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,9 +36,6 @@
  */
 public class ACIItemSyntaxChecker 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.1";
-
     private ACIItemChecker checker = new ACIItemChecker();
 
     /**
@@ -45,7 +43,7 @@
      */
     public ACIItemSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.ACI_ITEM_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AccessPointSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AccessPointSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AccessPointSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AccessPointSyntaxChecker.java Thu Jun  4 16:18:23 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;
 
 
@@ -30,16 +31,12 @@
  */
 public class AccessPointSyntaxChecker 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.2";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public AccessPointSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.ACCESS_POINT_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AttributeTypeDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AttributeTypeDescriptionSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AttributeTypeDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AttributeTypeDescriptionSyntaxChecker.java Thu Jun  4 16:18:23 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.AttributeTypeDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -71,10 +72,6 @@
  */
 public class AttributeTypeDescriptionSyntaxChecker extends AbstractSyntaxChecker
 {
-
-    /** The Syntax OID, according to RFC 4517, par. 3.3.1 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.3";
-
     /** The schema parser used to parse the AttributeTypeDescription Syntax */
     private AttributeTypeDescriptionSchemaParser schemaParser = new AttributeTypeDescriptionSchemaParser();
 
@@ -85,7 +82,7 @@
      */
     public AttributeTypeDescriptionSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.ATTRIBUT_TYPE_DESCRIPTION_SYNTAX );
     }
     
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AudioSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AudioSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AudioSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AudioSyntaxChecker.java Thu Jun  4 16:18:23 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 Audio according to RFC 2252.
@@ -34,16 +36,12 @@
  */
 public class AudioSyntaxChecker 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.4";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public AudioSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.AUDIO_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateListSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateListSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateListSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateListSyntaxChecker.java Thu Jun  4 16:18:23 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 certificateList according to RFC 4523 :
@@ -36,16 +38,12 @@
  */
 public class CertificateListSyntaxChecker 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.9";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public CertificateListSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.CERTIFICATE_LIST_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificatePairSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificatePairSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificatePairSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificatePairSyntaxChecker.java Thu Jun  4 16:18:23 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 certificate pair according to RFC 4523 :
@@ -36,16 +38,12 @@
  */
 public class CertificatePairSyntaxChecker 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.10";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public CertificatePairSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.CERTIFICATE_PAIR_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateSyntaxChecker.java Thu Jun  4 16:18:23 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 certificate according to RFC 4523 :
@@ -36,16 +38,12 @@
  */
 public class CertificateSyntaxChecker 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.8";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public CertificateSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.CERTIFICATE_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CountrySyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CountrySyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CountrySyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CountrySyntaxChecker.java Thu Jun  4 16:18:23 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.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -41,9 +42,6 @@
  */
 public class CountrySyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517, par. 3.3.4 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.11";
-    
     /** The ISO 3166 list of countries, as of 2006 */
     private static final String[] COUNTRY_ISO_3166 =
         {
@@ -94,7 +92,7 @@
      */
     public CountrySyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.COUNTRY_STRING_SYNTAX );
     }
     
     

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITContentRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITContentRuleDescriptionSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITContentRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITContentRuleDescriptionSyntaxChecker.java Thu Jun  4 16:18:23 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.DITContentRuleDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -49,10 +50,6 @@
  */
 public class DITContentRuleDescriptionSyntaxChecker extends AbstractSyntaxChecker
 {
-
-    /** The Syntax OID, according to RFC 4517, par. 3.3.7 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.16";
-
     /** The schema parser used to parse the DITContentRuleDescription Syntax */
     private DITContentRuleDescriptionSchemaParser schemaParser = new DITContentRuleDescriptionSchemaParser();
 
@@ -64,7 +61,7 @@
      */
     public DITContentRuleDescriptionSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.DIT_CONTENT_RULE_SYNTAX );
     }
 
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITStructureRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITStructureRuleDescriptionSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITStructureRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITStructureRuleDescriptionSyntaxChecker.java Thu Jun  4 16:18:23 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.DITStructureRuleDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -51,10 +52,6 @@
  */
 public class DITStructureRuleDescriptionSyntaxChecker extends AbstractSyntaxChecker
 {
-
-    /** The Syntax OID, according to RFC 4517, par. 3.3.8 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.17";
-
     /** The schema parser used to parse the DITContentRuleDescription Syntax */
     private DITStructureRuleDescriptionSchemaParser schemaParser = new DITStructureRuleDescriptionSchemaParser();
 
@@ -66,7 +63,7 @@
      */
     public DITStructureRuleDescriptionSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.DIT_STRUCTURE_RULE_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DLSubmitPermissionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DLSubmitPermissionSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DLSubmitPermissionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DLSubmitPermissionSyntaxChecker.java Thu Jun  4 16:18:23 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;
 
 
@@ -30,16 +31,12 @@
  */
 public class DLSubmitPermissionSyntaxChecker 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.18";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public DLSubmitPermissionSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.DL_SUBMIT_PERMISSION_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DNSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DNSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DNSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DNSyntaxChecker.java Thu Jun  4 16:18:23 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;
@@ -34,9 +35,6 @@
  */
 public class DNSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according RFC 4517, par. 3.3.9 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.12";
-    
     /**
      * 
      * Creates a new instance of DNSyntaxChecker.
@@ -44,7 +42,7 @@
      */
     public DNSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.DN_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSAQualitySyntaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSAQualitySyntaxSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSAQualitySyntaxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSAQualitySyntaxSyntaxChecker.java Thu Jun  4 16:18:23 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;
 
@@ -41,9 +42,6 @@
  */
 public class DSAQualitySyntaxSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 2252 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.19";
-    
     /**
      * 
      * Creates a new instance of DSAQualitySyntaxSyntaxChecker.
@@ -51,7 +49,7 @@
      */
     public DSAQualitySyntaxSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.DSA_QUALITY_SYNTAX );
     }
     
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSETypeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSETypeSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSETypeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSETypeSyntaxChecker.java Thu Jun  4 16:18:23 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.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -43,9 +44,6 @@
  */
 public class DSETypeSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 2252 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.20";
-    
     /** The DSE BITS keywords */
     private static final String[] DSE_BITS_STRINGS = 
         {
@@ -75,7 +73,7 @@
      */
     public DSETypeSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.DSE_TYPE_SYNTAX );
     }
     
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DataQualitySyntaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DataQualitySyntaxSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DataQualitySyntaxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DataQualitySyntaxSyntaxChecker.java Thu Jun  4 16:18:23 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;
 
 
@@ -30,16 +31,12 @@
  */
 public class DataQualitySyntaxSyntaxChecker 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.13";
-
-
     /**
      * Private default constructor to prevent unnecessary instantiation.
      */
     public DataQualitySyntaxSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.DATA_QUALITY_SYNTAX );
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DeliveryMethodSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DeliveryMethodSyntaxChecker.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DeliveryMethodSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DeliveryMethodSyntaxChecker.java Thu Jun  4 16:18:23 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.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -48,9 +49,6 @@
  */
 public class DeliveryMethodSyntaxChecker extends AbstractSyntaxChecker
 {
-    /** The Syntax OID, according to RFC 4517, par. 3.3.5 */
-    private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.14";
-    
     private static final String[] PDMS = 
         {
             "any", "mhs", "physical", "telex", "teletex",
@@ -77,7 +75,7 @@
      */
     public DeliveryMethodSyntaxChecker()
     {
-        super( SC_OID );
+        super( SchemaConstants.DELIVERY_METHOD_SYNTAX );
     }
     
     /**

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java Thu Jun  4 16:18:23 2009
@@ -24,6 +24,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.shared.ldap.NotImplementedException;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
@@ -40,7 +41,7 @@
     {
         SyntaxImpl[] syntaxes = new SyntaxImpl[3];
         syntaxes[0] = new SyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.12", "DN syntax", true );
-        syntaxes[1] = new SyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.15", "Directory String syntax", true );
+        syntaxes[1] = new SyntaxImpl( SchemaConstants.DIRECTORY_STRING_SYNTAX, "Directory String syntax", true );
         syntaxes[2] = new SyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.58", "Substring assertion syntax", true );
         return syntaxes;
     }



Mime
View raw message