directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r781789 [1/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
Author: elecharny
Date: Thu Jun  4 16:18:23 2009
New Revision: 781789

URL: http://svn.apache.org/viewvc?rev=781789&view=rev
Log:
More constants used instead of Strings in the code...

Modified:
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheComparatorProducer.java
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheMatchingRuleProducer.java
    directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheNormalizerProducer.java
    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/SystemComparatorProducer.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/SystemNormalizerProducer.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/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/ACIItemSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AccessPointSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AttributeTypeDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/AudioSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateListSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificatePairSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CertificateSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/CountrySyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITContentRuleDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DITStructureRuleDescriptionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DLSubmitPermissionSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DNSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSAQualitySyntaxSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DSETypeSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DataQualitySyntaxSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/DeliveryMethodSyntaxChecker.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Thu Jun  4 16:18:23 2009
@@ -61,9 +61,6 @@
     private static final String DESCRIPTION0 = "A test attributeType";
     private static final String DESCRIPTION1 = "An alternate description";
 
-    private static final String INTEGER_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.27";
-    private static final String DIRSTR_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.15";
-    
     private static final String OID = "1.3.6.1.4.1.18060.0.4.0.2.100000";
     private static final String NEW_OID = "1.3.6.1.4.1.18060.0.4.0.2.100001";
     private static final String DEPENDEE_OID = "1.3.6.1.4.1.18060.0.4.0.2.100002";
@@ -105,7 +102,7 @@
         oc.add( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC );
         attrs.put( oc );
         attrs.put( MetaSchemaConstants.M_OID_AT, OID );
-        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, INTEGER_SYNTAX_OID );
+        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, SchemaConstants.INTEGER_SYNTAX );
         attrs.put( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION0 );
         attrs.put( MetaSchemaConstants.M_EQUALITY_AT, "caseIgnoreMatch" );
         attrs.put( MetaSchemaConstants.M_SINGLE_VALUE_AT, "FALSE" );
@@ -223,7 +220,7 @@
         
         AttributeType at = getAttributeTypeRegistry().lookup( OID );
         assertEquals( at.getDescription(), DESCRIPTION0 );
-        assertEquals( at.getSyntax().getOid(), INTEGER_SYNTAX_OID );
+        assertEquals( at.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
         LdapDN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -231,7 +228,7 @@
         ModificationItem[] mods = new ModificationItem[2];
         Attribute attr = new BasicAttribute( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION1 );
         mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
-        attr = new BasicAttribute( MetaSchemaConstants.M_SYNTAX_AT, DIRSTR_SYNTAX_OID );
+        attr = new BasicAttribute( MetaSchemaConstants.M_SYNTAX_AT, SchemaConstants.DIRECTORY_STRING_SYNTAX );
         mods[1] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
         getSchemaContext( service ).modifyAttributes( dn, mods );
 
@@ -243,7 +240,7 @@
         
         at = getAttributeTypeRegistry().lookup( OID );
         assertEquals( at.getDescription(), DESCRIPTION1 );
-        assertEquals( at.getSyntax().getOid(), DIRSTR_SYNTAX_OID );
+        assertEquals( at.getSyntax().getOid(), SchemaConstants.DIRECTORY_STRING_SYNTAX );
     }
 
     
@@ -254,14 +251,14 @@
         
         AttributeType at = getAttributeTypeRegistry().lookup( OID );
         assertEquals( at.getDescription(), DESCRIPTION0 );
-        assertEquals( at.getSyntax().getOid(), INTEGER_SYNTAX_OID );
+        assertEquals( at.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
         LdapDN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
         
         Attributes mods = new BasicAttributes( true );
         mods.put( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION1 );
-        mods.put( MetaSchemaConstants.M_SYNTAX_AT, DIRSTR_SYNTAX_OID );
+        mods.put( MetaSchemaConstants.M_SYNTAX_AT, SchemaConstants.DIRECTORY_STRING_SYNTAX );
         getSchemaContext( service ).modifyAttributes( dn, DirContext.REPLACE_ATTRIBUTE, mods );
 
         assertTrue( "attributeType OID should still be present", 
@@ -272,7 +269,7 @@
 
         at = getAttributeTypeRegistry().lookup( OID );
         assertEquals( at.getDescription(), DESCRIPTION1 );
-        assertEquals( at.getSyntax().getOid(), DIRSTR_SYNTAX_OID );
+        assertEquals( at.getSyntax().getOid(), SchemaConstants.DIRECTORY_STRING_SYNTAX );
     }
     
 
@@ -289,7 +286,7 @@
         oc.add( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC );
         attrs.put( oc );
         attrs.put( MetaSchemaConstants.M_OID_AT, DEPENDEE_OID );
-        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, INTEGER_SYNTAX_OID );
+        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, SchemaConstants.INTEGER_SYNTAX );
         attrs.put( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION0 );
         attrs.put( MetaSchemaConstants.M_EQUALITY_AT, "caseIgnoreMatch" );
         attrs.put( MetaSchemaConstants.M_SINGLE_VALUE_AT, "FALSE" );
@@ -474,7 +471,7 @@
         oc.add( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC );
         attrs.put( oc );
         attrs.put( MetaSchemaConstants.M_OID_AT, OID );
-        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, INTEGER_SYNTAX_OID );
+        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, SchemaConstants.INTEGER_SYNTAX );
         attrs.put( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION0 );
         attrs.put( MetaSchemaConstants.M_EQUALITY_AT, "caseIgnoreMatch" );
         attrs.put( MetaSchemaConstants.M_SINGLE_VALUE_AT, "FALSE" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Thu Jun  4 16:18:23 2009
@@ -59,9 +59,6 @@
     private static final String DESCRIPTION0 = "A test matchingRule";
     private static final String DESCRIPTION1 = "An alternate description";
 
-    private static final String INTEGER_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.27";
-    private static final String DIRSTR_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.15";
-    
     private static final String OID = "1.3.6.1.4.1.18060.0.4.0.1.100000";
     private static final String NEW_OID = "1.3.6.1.4.1.18060.0.4.0.1.100001";
 
@@ -102,7 +99,7 @@
         oc.add( MetaSchemaConstants.META_MATCHING_RULE_OC );
         attrs.put( oc );
         attrs.put( MetaSchemaConstants.M_OID_AT, OID );
-        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, INTEGER_SYNTAX_OID );
+        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, SchemaConstants.INTEGER_SYNTAX );
         attrs.put( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION0 );
         
         LdapDN dn = getMatchingRuleContainer( "apachemeta" );
@@ -216,7 +213,7 @@
         
         MatchingRule mr = getMatchingRuleRegistry().lookup( OID );
         assertEquals( mr.getDescription(), DESCRIPTION0 );
-        assertEquals( mr.getSyntax().getOid(), INTEGER_SYNTAX_OID );
+        assertEquals( mr.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
         LdapDN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
@@ -224,7 +221,7 @@
         ModificationItem[] mods = new ModificationItem[2];
         Attribute attr = new BasicAttribute( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION1 );
         mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
-        attr = new BasicAttribute( MetaSchemaConstants.M_SYNTAX_AT, DIRSTR_SYNTAX_OID );
+        attr = new BasicAttribute( MetaSchemaConstants.M_SYNTAX_AT, SchemaConstants.DIRECTORY_STRING_SYNTAX );
         mods[1] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
         getSchemaContext( service ).modifyAttributes( dn, mods );
 
@@ -236,7 +233,7 @@
         
         mr = getMatchingRuleRegistry().lookup( OID );
         assertEquals( mr.getDescription(), DESCRIPTION1 );
-        assertEquals( mr.getSyntax().getOid(), DIRSTR_SYNTAX_OID );
+        assertEquals( mr.getSyntax().getOid(), SchemaConstants.DIRECTORY_STRING_SYNTAX );
     }
 
     
@@ -247,14 +244,14 @@
         
         MatchingRule mr = getMatchingRuleRegistry().lookup( OID );
         assertEquals( mr.getDescription(), DESCRIPTION0 );
-        assertEquals( mr.getSyntax().getOid(), INTEGER_SYNTAX_OID );
+        assertEquals( mr.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
         LdapDN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
         
         Attributes mods = new BasicAttributes( true );
         mods.put( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION1 );
-        mods.put( MetaSchemaConstants.M_SYNTAX_AT, DIRSTR_SYNTAX_OID );
+        mods.put( MetaSchemaConstants.M_SYNTAX_AT, SchemaConstants.DIRECTORY_STRING_SYNTAX );
         getSchemaContext( service ).modifyAttributes( dn, DirContext.REPLACE_ATTRIBUTE, mods );
 
         assertTrue( "matchingRule OID should still be present", 
@@ -265,7 +262,7 @@
 
         mr = getMatchingRuleRegistry().lookup( OID );
         assertEquals( mr.getDescription(), DESCRIPTION1 );
-        assertEquals( mr.getSyntax().getOid(), DIRSTR_SYNTAX_OID );
+        assertEquals( mr.getSyntax().getOid(), SchemaConstants.DIRECTORY_STRING_SYNTAX );
     }
     
 
@@ -448,7 +445,7 @@
         oc.add( MetaSchemaConstants.META_MATCHING_RULE_OC );
         attrs.put( oc );
         attrs.put( MetaSchemaConstants.M_OID_AT, OID );
-        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, INTEGER_SYNTAX_OID );
+        attrs.put( MetaSchemaConstants.M_SYNTAX_AT, SchemaConstants.INTEGER_SYNTAX );
         attrs.put( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION0 );
         
         LdapDN dn = getMatchingRuleContainer( "nis" );

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheComparatorProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheComparatorProducer.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheComparatorProducer.java (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheComparatorProducer.java Thu Jun  4 16:18:23 2009
@@ -60,7 +60,7 @@
      */
     public void produce( Registries registries, ProducerCallback cb ) throws NamingException
     {
-        Comparator comparator;
+        Comparator<?> comparator;
 
         // For exactDnAsStringMatch -> 1.3.6.1.4.1.18060.0.4.1.1.1
         comparator = new ComparableComparator();
@@ -76,11 +76,11 @@
 
         // For uuidMatch
         comparator = new UUIDComparator();
-        cb.schemaObjectProduced( this, "1.3.6.1.1.16.2", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.UUID_MATCH_MR_OID, comparator );
 
         // For uuidOrderingMatch
         comparator = new UUIDComparator();
-        cb.schemaObjectProduced( this, "1.3.6.1.1.16.3", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.UUID_ORDERING_MATCH_MR_OID, comparator );
         
         // For CSNMatch
         comparator = new CsnComparator();

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheMatchingRuleProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheMatchingRuleProducer.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheMatchingRuleProducer.java (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheMatchingRuleProducer.java Thu Jun  4 16:18:23 2009
@@ -56,33 +56,33 @@
         mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.18060.0.4.1.1.1", registries );
         mrule.setNames( new String[]
             { "exactDnAsStringMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.12" );
+        mrule.setSyntaxOid( SchemaConstants.DN_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.18060.0.4.1.1.2", registries );
         mrule.setNames( new String[]
             { "bigIntegerMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
+        mrule.setSyntaxOid( SchemaConstants.INTEGER_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.18060.0.4.1.1.3", registries );
         mrule.setNames( new String[]
             { "jdbmStringMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
+        mrule.setSyntaxOid( SchemaConstants.DIRECTORY_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         // For uuidMatch 
-        mrule = new BootstrapMatchingRule( "1.3.6.1.1.16.2", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.UUID_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "uuidMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.1.16.1" );
+            { SchemaConstants.UUID_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.UUID_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         // For uuidOrderingMatch 
-        mrule = new BootstrapMatchingRule( "1.3.6.1.1.16.3", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.UUID_ORDERING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "uuidOrderingMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.1.16.1" );
+            { SchemaConstants.UUID_ORDERING_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.UUID_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
         
         // For CSNMatch 

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheNormalizerProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheNormalizerProducer.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheNormalizerProducer.java (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApacheNormalizerProducer.java Thu Jun  4 16:18:23 2009
@@ -69,11 +69,11 @@
 
         // For uuidMatch -> 1.3.6.1.1.16.2
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "1.3.6.1.1.16.2", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.UUID_MATCH_MR_OID, normalizer );
 
         // For uuidOrderingMatch -> 1.3.6.1.1.16.3
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "1.3.6.1.1.16.3", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.UUID_ORDERING_MATCH_MR_OID, normalizer );
 
         // For CSNMatch -> 1.3.6.1.4.1.4203.666.11.2.2
         normalizer = new NoOpNormalizer();

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=781789&r1=781788&r2=781789&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 Thu Jun  4 16:18:23 2009
@@ -31,6 +31,7 @@
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.schema.registries.SyntaxRegistry;
 import org.apache.directory.shared.ldap.NotImplementedException;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.Syntax;
@@ -162,7 +163,7 @@
         
         public SupDITStructureRuleMatch( SyntaxRegistry registry ) throws NamingException
         {
-            this.syntax = registry.lookup( "1.3.6.1.4.1.1466.115.121.1.17" );
+            this.syntax = registry.lookup( SchemaConstants.DIT_STRUCTURE_RULE_SYNTAX );
         }
         
         

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemComparatorProducer.java Thu Jun  4 16:18:23 2009
@@ -91,244 +91,254 @@
         Comparator comparator;
 
         /*
-         * Straight out of RFC 2252: Section 8
+         * Straight out of RFC 4517
          * =======================================
-         ( 2.5.13.0 NAME 'objectIdentifierMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+         * ( 2.5.13.0 NAME 'objectIdentifierMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
          */
         comparator = new ObjectIdentifierComparator();
         cb.schemaObjectProduced( this, SchemaConstants.OBJECT_IDENTIFIER_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.1 NAME 'distinguishedNameMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+         * ( 2.5.13.1 NAME 'distinguishedNameMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
          */
         comparator = new DnComparator( registries.getAttributeTypeRegistry() );
         cb.schemaObjectProduced( this, SchemaConstants.DISTINGUISHED_NAME_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.2 NAME 'caseIgnoreMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         * ( 2.5.13.2 NAME 'caseIgnoreMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
         comparator = new DeepTrimToLowerCachingNormalizingComparator();
         cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         * ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
         comparator = new DeepTrimToLowerCachingNormalizingComparator();
         cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_ORDERING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
         comparator = new DeepTrimToLowerCachingNormalizingComparator();
         cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_SUBSTRING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.6 NAME 'caseExactOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         * ( 2.5.13.5 NAME 'caseExactMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
+        comparator = new DeepTrimCachingNormalizingComparator();
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_MATCH_MR_OID, comparator );
+        
+        /*
+         * ( 2.5.13.6 NAME 'caseExactOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_ORDERING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.8 NAME 'numericStringMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
+         * ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
+        comparator = new DeepTrimCachingNormalizingComparator();
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_SUBSTRING_MATCH_MR_OID, comparator );
+
+        /*
+         * ( 2.5.13.8 NAME 'numericStringMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, SchemaConstants.NUMERIC_STRING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.9 NAME 'numericStringOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
+         * ( 2.5.13.9 NAME 'numericStringOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, SchemaConstants.NUMERIC_STRING_ORDERING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, SchemaConstants.NUMERIC_STRING_SUBSTRINGS_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.11 NAME 'caseIgnoreListMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
+         * ( 2.5.13.11 NAME 'caseIgnoreListMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
          */
         comparator = new DeepTrimToLowerCachingNormalizingComparator();
         cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.14 NAME 'integerMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         * ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
+        comparator = new DeepTrimToLowerCachingNormalizingComparator();
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, comparator );
+
+        /*
+         * ( 2.5.13.13 NAME 'booleanMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, SchemaConstants.BOOLEAN_MATCH_MR_OID, comparator );
+        
+        /*
+         * ( 2.5.13.14 NAME 'integerMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, SchemaConstants.INTEGER_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.15 NAME 'integerOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         * ( 2.5.13.15 NAME 'integerOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
          */
         comparator = new IntegerOrderingComparator();
         cb.schemaObjectProduced( this, SchemaConstants.INTEGER_ORDERING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.16 NAME 'bitStringMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )
+         * ( 2.5.13.16 NAME 'bitStringMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, SchemaConstants.BIT_STRING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.17 NAME 'octetStringMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         * ( 2.5.13.17 NAME 'octetStringMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
          */
         comparator = new ByteArrayComparator();
         cb.schemaObjectProduced( this, SchemaConstants.OCTET_STRING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.18 NAME 'octetStringOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         * ( 2.5.13.18 NAME 'octetStringOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
          */
         comparator = new ByteArrayComparator();
         cb.schemaObjectProduced( this, SchemaConstants.OCTET_STRING_ORDERING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.20 NAME 'telephoneNumberMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
+         * ( 2.5.13.19 NAME 'octetStringSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         */
+        comparator = new ByteArrayComparator();
+        cb.schemaObjectProduced( this, SchemaConstants.OCTET_STRING_SUBSTRINGS_MATCH_MR_OID, comparator );
+       
+        /*
+         * ( 2.5.13.20 NAME 'telephoneNumberMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
          */
         comparator = new TelephoneNumberComparator();
         cb.schemaObjectProduced( this, SchemaConstants.TELEPHONE_NUMBER_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, SchemaConstants.TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.22 NAME 'presentationAddressMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )
+         * ( 2.5.13.22 NAME 'presentationAddressMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.22", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.PRESENTATION_ADDRESS_MATCH_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.23 NAME 'uniqueMemberMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
+         * ( 2.5.13.23 NAME 'uniqueMemberMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
          */
         comparator = new NameAndOptionalUIDComparator();
-        cb.schemaObjectProduced( this, "2.5.13.23", comparator );
+        cb.schemaObjectProduced( this,SchemaConstants.UNIQUE_MEMBER_MATCH_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.24 NAME 'protocolInformationMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
+         * ( 2.5.13.24 NAME 'protocolInformationMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.24", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.PROTOCOL_INFORMATION_MATCH_MATCH_MR_OID, comparator );
+
+        // 2.5.13.25 is not defined...
+        
+        // 2.5.13.26 is not defined...
 
         /*
-         ( 2.5.13.27 NAME 'generalizedTimeMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+         * ( 2.5.13.27 NAME 'generalizedTimeMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.27", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.GENERALIZED_TIME_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.28 NAME 'generalizedTimeOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+         * ( 2.5.13.28 NAME 'generalizedTimeOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.28", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.GENERALIZED_TIME_ORDERING_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.29 NAME 'integerFirstComponentMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         * ( 2.5.13.29 NAME 'integerFirstComponentMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.29", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.INTEGER_FIRST_COMPONENT_MATCH_MR_OID, comparator );
 
         /*
-         ( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+         * ( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.30", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.OBJECT_IDENTIFIER_FIRST_COMPONENT_MATCH_MR_OID, comparator );
 
         /*
-         * Straight out of RFC 3698: Section 2.6
-         * http://www.faqs.org/rfcs/rfc3698.html
-         * =======================================
          * ( 2.5.13.31 NAME 'directoryStringFirstComponentMatch'
          *   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.31", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.DIRECTORY_STRING_FIRST_COMPONENT_MATCH_MR_OID, comparator );
 
         /*
-         ( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         * ( 2.5.13.32 NAME 'wordMatch' 
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
-        comparator = new DeepTrimCachingNormalizingComparator();
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.1", comparator );
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, SchemaConstants.WORD_MATCH_MR_OID, comparator );
 
         /*
-         ( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         * ( 2.5.13.33 NAME 'keywordMatch' 
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
-        comparator = new DeepTrimToLowerCachingNormalizingComparator();
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.2", comparator );
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, SchemaConstants.KEYWORD_MATCH_MR_OID, comparator );
 
         /*
-         * MatchingRules from section 2 of http://www.faqs.org/rfcs/rfc3698.html
-         * for Additional MatchingRules
-
-         ( 2.5.13.13 NAME 'booleanMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
+         * ( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
          */
+        comparator = new DeepTrimCachingNormalizingComparator();
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_IA5_MATCH_MR_OID, comparator );
 
-        comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, SchemaConstants.BOOLEAN_MATCH_MR_OID, comparator );
-        
         /*
-         * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.3
-         * =========================================================
-
-         ( 2.5.13.5 NAME 'caseExactMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-         ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-
-         ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-
+         * ( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
          */
-
-        comparator = new DeepTrimCachingNormalizingComparator();
-        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_MATCH_MR_OID, comparator );
-
-        comparator = new DeepTrimCachingNormalizingComparator();
-        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_SUBSTRING_MATCH_MR_OID, comparator );
-
         comparator = new DeepTrimToLowerCachingNormalizingComparator();
-        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_IA5_MATCH_MR_OID, comparator );
 
         /*
-         * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.4
-         * =========================================================
-
-         ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
-
         comparator = new DeepTrimToLowerCachingNormalizingComparator();
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.3", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_IA5_SUBSTRINGS_MATCH_MR_OID, comparator );
     }
 }

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=781789&r1=781788&r2=781789&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 Thu Jun  4 16:18:23 2009
@@ -47,48 +47,55 @@
         BootstrapMatchingRule mrule = null;
 
         /*
-         * Straight out of RFC 2252: Section 8
+         * Straight out of RFC 4517
+         * Straight out of RFC 3698: Section 2.3
+         * http://www.faqs.org/rfcs/rfc3698.html
          * =======================================
-         ( 2.5.13.0 NAME 'objectIdentifierMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
-
-         ( 2.5.13.1 NAME 'distinguishedNameMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-         ( 2.5.13.2 NAME 'caseIgnoreMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-         ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-         ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
-
+        /*
+         * ( 2.5.13.0 NAME 'objectIdentifierMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+         */
         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" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.1 NAME 'distinguishedNameMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+         */
         mrule = new BootstrapMatchingRule( SchemaConstants.DISTINGUISHED_NAME_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.DISTINGUISHED_NAME_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.12" );
+        mrule.setSyntaxOid( SchemaConstants.DN_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.2", registries );
+        /*
+         * ( 2.5.13.2 NAME 'caseIgnoreMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_IGNORE_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
+        mrule.setSyntaxOid( SchemaConstants.DIRECTORY_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_ORDERING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_IGNORE_ORDERING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
+        mrule.setSyntaxOid( SchemaConstants.DIRECTORY_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_SUBSTRING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_IGNORE_SUBSTRING_MATCH_MR } );
@@ -96,91 +103,129 @@
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
-         * Straight out of RFC 3698: Section 2.3
-         * http://www.faqs.org/rfcs/rfc3698.html
-         * =======================================
-         ( 2.5.13.6 NAME 'caseExactOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         * ( 2.5.13.5 NAME 'caseExactMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
+        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_EXACT_MATCH_MR_OID, registries );
+        mrule.setNames( new String[]
+            { SchemaConstants.CASE_EXACT_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.DIRECTORY_STRING_SYNTAX );
+        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.6 NAME 'caseExactOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
         mrule = new BootstrapMatchingRule( SchemaConstants.CASE_EXACT_ORDERING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.CASE_EXACT_ORDERING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
+        mrule.setSyntaxOid( SchemaConstants.DIRECTORY_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
-
+        
         /*
-         * Straight out of RFC 2252: Section 8
-         * =======================================
-         ( 2.5.13.8 NAME 'numericStringMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
-
-         ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-
-         ( 2.5.13.11 NAME 'caseIgnoreListMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-
-         ( 2.5.13.14 NAME 'integerMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-         ( 2.5.13.16 NAME 'bitStringMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )
-
-         ( 2.5.13.17 NAME 'octetStringMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         * ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
+        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" );
+        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
+        
+        /*
+         * ( 2.5.13.8 NAME 'numericStringMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
          */
-
         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" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.9 NAME 'numericStringOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
+         */
+        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" );
+        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
+        
+        /*
+         * ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
         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" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.11 NAME 'caseIgnoreListMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
+         */
         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" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( SchemaConstants.INTEGER_MATCH_MR_OID, registries );
+        /*
+         * ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { SchemaConstants.INTEGER_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
+            { SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR } );
+        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
-         * Straight out of RFC 3698: Section 2.7
-         * http://www.faqs.org/rfcs/rfc3698.html
-         * =======================================
-         ( 2.5.13.15 NAME 'integerOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         * ( 2.5.13.13 NAME 'booleanMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
          */
+        mrule = new BootstrapMatchingRule( SchemaConstants.BOOLEAN_MATCH_MR_OID, registries );
+        mrule.setNames( new String[]
+            { SchemaConstants.BOOLEAN_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.BOOLEAN_SYNTAX );
+        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( SchemaConstants.NUMERIC_STRING_ORDERING_MATCH_MR_OID, registries );
+        /*
+         * ( 2.5.13.14 NAME 'integerMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.INTEGER_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" );
+            { SchemaConstants.INTEGER_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.INTEGER_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.15 NAME 'integerOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         */
         mrule = new BootstrapMatchingRule( SchemaConstants.INTEGER_ORDERING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.INTEGER_ORDERING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
+        mrule.setSyntaxOid( SchemaConstants.INTEGER_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.16 NAME 'bitStringMatch' 
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )
+         */
         mrule = new BootstrapMatchingRule( SchemaConstants.BIT_STRING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.BIT_STRING_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.6" );
+        mrule.setSyntaxOid( SchemaConstants.BIT_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.17 NAME 'octetStringMatch' 
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         */
         mrule = new BootstrapMatchingRule( SchemaConstants.OCTET_STRING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
             { SchemaConstants.OCTET_STRING_MATCH_MR } );
@@ -188,194 +233,180 @@
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
-         * Straight out of RFC 2252: Section 8
-         * =======================================
-         ( 2.5.13.20 NAME 'telephoneNumberMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
-
-         ( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-
-         ( 2.5.13.22 NAME 'presentationAddressMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )
-
-         ( 2.5.13.23 NAME 'uniqueMemberMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
-
-         ( 2.5.13.24 NAME 'protocolInformationMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
+         * ( 2.5.13.18 NAME 'octetStringOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
          */
+        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" );
+        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.19 NAME 'octetStringSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         */
+        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" );
+        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
+        
+        /*
+         * ( 2.5.13.20 NAME 'telephoneNumberMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
+         */
         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" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
+        /*
+         * ( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
         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" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.22", registries );
+        /*
+         * This MatchingRule is deprecated
+         * 
+         * ( 2.5.13.22 NAME 'presentationAddressMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.PRESENTATION_ADDRESS_MATCH_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "presentationAddressMatch" } );
+            { SchemaConstants.PRESENTATION_ADDRESS_MATCH_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.43" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.23", registries );
+        /*
+         * ( 2.5.13.23 NAME 'uniqueMemberMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.UNIQUE_MEMBER_MATCH_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "uniqueMemberMatch" } );
+            { SchemaConstants.UNIQUE_MEMBER_MATCH_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.34" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.24", registries );
+        /*
+         * This MatchingRule is deprecated
+         * 
+         * ( 2.5.13.24 NAME 'protocolInformationMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.PROTOCOL_INFORMATION_MATCH_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "protocolInformationMatch" } );
+            { SchemaConstants.PROTOCOL_INFORMATION_MATCH_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.42" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        /*
-         * Straight out of RFC 2252: Section 8
-         * =======================================
-         ( 2.5.13.27 NAME 'generalizedTimeMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
-
-         ( 2.5.13.28 NAME 'generalizedTimeOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
-
-         ( 2.5.13.29 NAME 'integerFirstComponentMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-         ( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
-
-         ( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-         ( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+        // "2.5.13.25" is not used ...
+        
+        // "2.5.13.26" is not used ...
 
+        /*
+         * ( 2.5.13.27 NAME 'generalizedTimeMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
          */
-
-        mrule = new BootstrapMatchingRule( "2.5.13.27", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.GENERALIZED_TIME_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "generalizedTimeMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.24" );
+            { SchemaConstants.GENERALIZED_TIME_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.GENERALIZED_TIME_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.28", registries );
+        /*
+         * ( 2.5.13.28 NAME 'generalizedTimeOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.GENERALIZED_TIME_ORDERING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "generalizedTimeOrderingMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.24" );
+            { SchemaConstants.GENERALIZED_TIME_ORDERING_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.GENERALIZED_TIME_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.29", registries );
+        /*
+         * ( 2.5.13.29 NAME 'integerFirstComponentMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.INTEGER_FIRST_COMPONENT_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "integerFirstComponentMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
+            { SchemaConstants.INTEGER_FIRST_COMPONENT_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.INTEGER_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.30", registries );
+        /*
+         * ( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.OBJECT_IDENTIFIER_FIRST_COMPONENT_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "objectIdentifierFirstComponentMatch" } );
+            { SchemaConstants.OBJECT_IDENTIFIER_FIRST_COMPONENT_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.38" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
-         * Straight out of RFC 3698: Section 2.6
-         * http://www.faqs.org/rfcs/rfc3698.html
-         * =======================================
          * ( 2.5.13.31 NAME 'directoryStringFirstComponentMatch'
          *   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
-
-        mrule = new BootstrapMatchingRule( "2.5.13.31", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.DIRECTORY_STRING_FIRST_COMPONENT_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "directoryStringFirstComponentMatch" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
-        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
-
-        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.1466.109.114.1", registries );
-        mrule.setNames( new String[]
-            { "caseExactIA5Match" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
-        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
-
-        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.1466.109.114.2", registries );
-        mrule.setNames( new String[]
-            { "caseIgnoreIA5Match" } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
+            { SchemaConstants.DIRECTORY_STRING_FIRST_COMPONENT_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.DIRECTORY_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
-         * MatchingRules from section 2 of http://www.faqs.org/rfcs/rfc3698.html
-         * for Additional MatchingRules
-
-         ( 2.5.13.13 NAME 'booleanMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-         ( 2.5.13.18 NAME 'octetStringOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
-
+         * ( 2.5.13.32 NAME 'wordMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
          */
-
-        mrule = new BootstrapMatchingRule( SchemaConstants.BOOLEAN_MATCH_MR_OID, registries );
-        mrule.setNames( new String[]
-            { SchemaConstants.BOOLEAN_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.7" );
-        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
-
-        mrule = new BootstrapMatchingRule( SchemaConstants.OCTET_STRING_ORDERING_MATCH_MR_OID, registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.WORD_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" );
+            { SchemaConstants.WORD_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.DIRECTORY_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
-         * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.3
-         * =========================================================
-
-         ( 2.5.13.5 NAME 'caseExactMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-         ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-
-         ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 2.5.13.33 NAME 'keywordMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
          */
-
-        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_EXACT_MATCH_MR_OID, registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.KEYWORD_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { SchemaConstants.CASE_EXACT_MATCH_MR } );
-        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
+            { SchemaConstants.KEYWORD_MATCH_MR } );
+        mrule.setSyntaxOid( SchemaConstants.DIRECTORY_STRING_SYNTAX );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_EXACT_SUBSTRING_MATCH_MR_OID, registries );
+        /*
+         * ( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_EXACT_IA5_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" );
+            { SchemaConstants.CASE_EXACT_IA5_MATCH_MR } );
+        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, registries );
+        /*
+         * ( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         */
+        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_IA5_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" );
+            { SchemaConstants.CASE_IGNORE_IA5_MATCH_MR } );
+        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         /*
-         * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.4
-         * =========================================================
-
-         ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
-
-        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.1466.109.114.3", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_IA5_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "caseIgnoreIA5SubstringsMatch" } );
+            { SchemaConstants.CASE_IGNORE_IA5_SUBSTRINGS_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
     }

Modified: directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemNormalizerProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemNormalizerProducer.java?rev=781789&r1=781788&r2=781789&view=diff
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemNormalizerProducer.java (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemNormalizerProducer.java Thu Jun  4 16:18:23 2009
@@ -80,7 +80,7 @@
         private static final long serialVersionUID = 1L;
 
         /** Used for looking up the setRegistries(Registries) method */
-        private final static Class[] parameterTypes = new Class[] { Registries.class };
+        private final static Class<?>[] parameterTypes = new Class<?>[] { Registries.class };
 
         
         public CachingDnNormalizer()
@@ -152,245 +152,261 @@
         Normalizer normalizer;
 
         /*
-         * Straight out of RFC 2252: Section 8
+         * Straight out of RFC 4517
          * =======================================
-
-         ( 2.5.13.1 NAME 'distinguishedNameMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
          */
-        normalizer = new CachingDnNormalizer();
-        ( ( CachingDnNormalizer ) normalizer ).setRegistries( registries );
-        cb.schemaObjectProduced( this, SchemaConstants.DISTINGUISHED_NAME_MATCH_MR_OID, normalizer );
-
+        
         /*
-         ( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         * ( 2.5.13.0 NAME 'objectIdentifierMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
          */
-        normalizer = new CachingDeepTrimToLowerNormalizer();
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.2", normalizer );
+        normalizer = new ObjectIdentifierNormalizer();
+        cb.schemaObjectProduced( this, SchemaConstants.OBJECT_IDENTIFIER_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.11 NAME 'caseIgnoreListMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
+         * ( 2.5.13.1 NAME 'distinguishedNameMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
          */
-        normalizer = new CachingDeepTrimToLowerNormalizer();
-        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_MATCH_MR_OID, normalizer );
+        normalizer = new CachingDnNormalizer();
+        ( ( CachingDnNormalizer ) normalizer ).setRegistries( registries );
+        cb.schemaObjectProduced( this, SchemaConstants.DISTINGUISHED_NAME_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.2 NAME 'caseIgnoreMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         * ( 2.5.13.2 NAME 'caseIgnoreMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
         normalizer = new CachingDeepTrimToLowerNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         * ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
         normalizer = new CachingDeepTrimToLowerNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_ORDERING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
         normalizer = new CachingDeepTrimToLowerNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_SUBSTRING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.6 NAME 'caseExactOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         * ( 2.5.13.5 NAME 'caseExactMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
+        normalizer = new CachingDeepTrimNormalizer();
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_MATCH_MR_OID, normalizer );
+        
+        /*
+         * ( 2.5.13.6 NAME 'caseExactOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_ORDERING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.0 NAME 'objectIdentifierMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+         * ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
-        normalizer = new ObjectIdentifierNormalizer();
-        cb.schemaObjectProduced( this, SchemaConstants.OBJECT_IDENTIFIER_MATCH_MR_OID, normalizer );
+        normalizer = new CachingDeepTrimNormalizer();
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_SUBSTRING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.8 NAME 'numericStringMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
+         * ( 2.5.13.8 NAME 'numericStringMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.NUMERIC_STRING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.9 NAME 'numericStringOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
+         * ( 2.5.13.9 NAME 'numericStringOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.NUMERIC_STRING_ORDERING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.NUMERIC_STRING_SUBSTRINGS_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.14 NAME 'integerMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         * ( 2.5.13.11 NAME 'caseIgnoreListMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
+         */
+        normalizer = new CachingDeepTrimToLowerNormalizer();
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_MATCH_MR_OID, normalizer );
+
+        /*
+         * ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
+        normalizer = new CachingDeepTrimToLowerNormalizer();
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, normalizer );
+
+        /*
+         * ( 2.5.13.13 NAME 'booleanMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+         */
+        normalizer = new BooleanNormalizer();
+        cb.schemaObjectProduced( this, SchemaConstants.BOOLEAN_MATCH_MR_OID, normalizer );
+
+        /*
+         * ( 2.5.13.14 NAME 'integerMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.INTEGER_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.14 NAME 'integerOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         * ( 2.5.13.15 NAME 'integerOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.INTEGER_ORDERING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.16 NAME 'bitStringMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )
+         * ( 2.5.13.16 NAME 'bitStringMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.BIT_STRING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.17 NAME 'octetStringMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         * ( 2.5.13.17 NAME 'octetStringMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.OCTET_STRING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.18 NAME 'octetStringOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         * ( 2.5.13.18 NAME 'octetStringOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.OCTET_STRING_ORDERING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.20 NAME 'telephoneNumberMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
+         * ( 2.5.13.19 NAME 'octetStringSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         */
+        normalizer = new NoOpNormalizer();
+        cb.schemaObjectProduced( this, SchemaConstants.OCTET_STRING_SUBSTRINGS_MATCH_MR_OID, normalizer );
+        
+        /*
+         * ( 2.5.13.20 NAME 'telephoneNumberMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.TELEPHONE_NUMBER_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, SchemaConstants.TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.22 NAME 'presentationAddressMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )
+         * ( 2.5.13.22 NAME 'presentationAddressMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.22", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.PRESENTATION_ADDRESS_MATCH_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.23 NAME 'uniqueMemberMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
+         * ( 2.5.13.23 NAME 'uniqueMemberMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
          */
         normalizer = new NameAndOptionalUIDNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.23", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.UNIQUE_MEMBER_MATCH_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.24 NAME 'protocolInformationMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
+         * ( 2.5.13.24 NAME 'protocolInformationMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
+         * 
+         * This MatchingRule has been removed from RFC 4517
          */
         normalizer = new CachingDeepTrimNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.24", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.PROTOCOL_INFORMATION_MATCH_MATCH_MR_OID, normalizer );
 
+        // 2.5.13.25 is not defined ...
+        
+        // 2.5.13.26 is not defined ...
+        
         /*
-         ( 2.5.13.27 NAME 'generalizedTimeMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+         * ( 2.5.13.27 NAME 'generalizedTimeMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
          */
         normalizer = new CachingDeepTrimNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.27", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.GENERALIZED_TIME_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.28 NAME 'generalizedTimeOrderingMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+         * ( 2.5.13.28 NAME 'generalizedTimeOrderingMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
          */
         normalizer = new CachingDeepTrimNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.28", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.GENERALIZED_TIME_ORDERING_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.29 NAME 'integerFirstComponentMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         * ( 2.5.13.29 NAME 'integerFirstComponentMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.29", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.INTEGER_FIRST_COMPONENT_MATCH_MR_OID, normalizer );
 
         /*
-         ( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+         * ( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.30", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.OBJECT_IDENTIFIER_FIRST_COMPONENT_MATCH_MR_OID, normalizer );
 
         /*
-         * Straight out of RFC 3698: Section 2.6
-         * http://www.faqs.org/rfcs/rfc3698.html
-         * =======================================
          * ( 2.5.13.31 NAME 'directoryStringFirstComponentMatch'
          *   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.31", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.DIRECTORY_STRING_FIRST_COMPONENT_MATCH_MR_OID, normalizer );
 
         /*
-         ( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         * ( 2.5.13.32 NAME 'wordMatch'
+         *   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
-        normalizer = new CachingDeepTrimNormalizer();
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.1", normalizer );
+        normalizer = new NoOpNormalizer();
+        cb.schemaObjectProduced( this, SchemaConstants.WORD_MATCH_MR_OID, normalizer );
 
         /*
-         * MatchingRules from section 2 of http://www.faqs.org/rfcs/rfc3698.html
-         * for Additional MatchingRules
-
-         ( 2.5.13.13 NAME 'booleanMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
+         * ( 2.5.13.33 NAME 'keywordMatch'
+         *   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
-
-        normalizer = new BooleanNormalizer();
-        cb.schemaObjectProduced( this, SchemaConstants.BOOLEAN_MATCH_MR_OID, normalizer );
+        normalizer = new NoOpNormalizer();
+        cb.schemaObjectProduced( this, SchemaConstants.KEYWORD_MATCH_MR_OID, normalizer );
 
         /*
-         * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.3
-         * =========================================================
-
-         ( 2.5.13.5 NAME 'caseExactMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-         ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-
-         ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
          */
-
         normalizer = new CachingDeepTrimNormalizer();
-        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_MATCH_MR_OID, normalizer );
-
-        normalizer = new CachingDeepTrimNormalizer();
-        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_SUBSTRING_MATCH_MR_OID, normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_IA5_MATCH_MR_OID, normalizer );
 
+        /*
+         * ( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         */
         normalizer = new CachingDeepTrimToLowerNormalizer();
-        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_IA5_MATCH_MR_OID, normalizer );
 
         /*
-         * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.4
-         * =========================================================
-
-         ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
-         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         * ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
+         * SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
 
         normalizer = new CachingDeepTrimToLowerNormalizer();
-        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.3", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_IA5_SUBSTRINGS_MATCH_MR_OID, normalizer );
     }
 }



Mime
View raw message