You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/06/04 12:20:43 UTC

svn commit: r781700 - in /directory: apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/

Author: elecharny
Date: Thu Jun  4 10:20:40 2009
New Revision: 781700

URL: http://svn.apache.org/viewvc?rev=781700&view=rev
Log:
Added some more MR constants

Modified:
    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/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java

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=781700&r1=781699&r2=781700&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 10:20:40 2009
@@ -153,63 +153,63 @@
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.10", comparator );
+        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 )
          */
         comparator = new DeepTrimToLowerCachingNormalizingComparator();
-        cb.schemaObjectProduced( this, "2.5.13.11", comparator );
+        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 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.14", comparator );
+        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 )
          */
         comparator = new IntegerOrderingComparator();
-        cb.schemaObjectProduced( this, "2.5.13.15", comparator );
+        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 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.16", comparator );
+        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 )
          */
         comparator = new ByteArrayComparator();
-        cb.schemaObjectProduced( this, "2.5.13.17", comparator );
+        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 )
          */
         comparator = new ByteArrayComparator();
-        cb.schemaObjectProduced( this, "2.5.13.18", comparator );
+        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 )
          */
         comparator = new TelephoneNumberComparator();
-        cb.schemaObjectProduced( this, "2.5.13.20", comparator );
+        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 )
          */
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.21", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR_OID, comparator );
 
         /*
          ( 2.5.13.22 NAME 'presentationAddressMatch'
@@ -294,7 +294,7 @@
          */
 
         comparator = new ComparableComparator();
-        cb.schemaObjectProduced( this, "2.5.13.13", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.BOOLEAN_MATCH_MR_OID, comparator );
         
         /*
          * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.3
@@ -318,7 +318,7 @@
         cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_SUBSTRING_MATCH_MR_OID, comparator );
 
         comparator = new DeepTrimToLowerCachingNormalizingComparator();
-        cb.schemaObjectProduced( this, "2.5.13.12", comparator );
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, comparator );
 
         /*
          * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.4

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=781700&r1=781699&r2=781700&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 10:20:40 2009
@@ -137,21 +137,21 @@
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.36" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.10", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.NUMERIC_STRING_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "numericStringSubstringsMatch" } );
+            { 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 );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.11", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_LIST_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "caseIgnoreListMatch" } );
+            { 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( "2.5.13.14", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.INTEGER_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "integerMatch" } );
+            { SchemaConstants.INTEGER_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
@@ -169,21 +169,21 @@
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.36" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.15", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.INTEGER_ORDERING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "integerOrderingMatch" } );
+            { SchemaConstants.INTEGER_ORDERING_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.16", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.BIT_STRING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "bitStringMatch" } );
+            { SchemaConstants.BIT_STRING_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.6" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.17", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.OCTET_STRING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "octetStringMatch" } );
+            { SchemaConstants.OCTET_STRING_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
@@ -206,15 +206,15 @@
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
          */
 
-        mrule = new BootstrapMatchingRule( "2.5.13.20", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.TELEPHONE_NUMBER_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "telephoneNumberMatch" } );
+            { SchemaConstants.TELEPHONE_NUMBER_MATCH_MR } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.50" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.21", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "telephoneNumberSubstringsMatch" } );
+            { 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 );
 
@@ -321,15 +321,15 @@
 
          */
 
-        mrule = new BootstrapMatchingRule( "2.5.13.13", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.BOOLEAN_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "booleanMatch" } );
+            { 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( "2.5.13.18", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.OCTET_STRING_ORDERING_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "octetStringOrderingMatch" } );
+            { 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 );
 
@@ -359,9 +359,9 @@
         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.12", registries );
+        mrule = new BootstrapMatchingRule( SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, registries );
         mrule.setNames( new String[]
-            { "caseIgnoreListSubstringsMatch" } );
+            { 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 );
 

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=781700&r1=781699&r2=781700&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 10:20:40 2009
@@ -174,7 +174,7 @@
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
          */
         normalizer = new CachingDeepTrimToLowerNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.11", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_MATCH_MR_OID, normalizer );
 
         /*
          ( 2.5.13.2 NAME 'caseIgnoreMatch'
@@ -230,56 +230,56 @@
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.10", normalizer );
+        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 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.14", normalizer );
+        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 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.15", normalizer );
+        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 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.16", normalizer );
+        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 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.17", normalizer );
+        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 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.18", normalizer );
+        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 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.20", normalizer );
+        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 )
          */
         normalizer = new NoOpNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.21", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.TELEPHONE_NUMBER_SUBSTRINGS_MATCH_MR_OID, normalizer );
 
         /*
          ( 2.5.13.22 NAME 'presentationAddressMatch'
@@ -357,7 +357,7 @@
          */
 
         normalizer = new BooleanNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.13", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.BOOLEAN_MATCH_MR_OID, normalizer );
 
         /*
          * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.3
@@ -380,7 +380,7 @@
         cb.schemaObjectProduced( this, SchemaConstants.CASE_EXACT_SUBSTRING_MATCH_MR_OID, normalizer );
 
         normalizer = new CachingDeepTrimToLowerNormalizer();
-        cb.schemaObjectProduced( this, "2.5.13.12", normalizer );
+        cb.schemaObjectProduced( this, SchemaConstants.CASE_IGNORE_LIST_SUBSTRINGS_MATCH_MR_OID, normalizer );
 
         /*
          * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.4

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=781700&r1=781699&r2=781700&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 10:20:40 2009
@@ -462,50 +462,91 @@
 
     // ---- MatchingRules -----------------------------------------------------
     // 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
+    
+    // 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
+    
+    // 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
+    
+    // booleanMatch (RFC 4517, chap. 4.2.2)
+    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
+    
+    // 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
+
+    // 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
+    
+    // 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
+    
+    // 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
+    
+    // "2.5.13.19" is not used...
+    
+    // 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
+    
+    // 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 INTEGER_MR                         = "integerMatch";
-    String INTEGER_ORDERING_MR                = "integerOrderingMatch";
-    String BOOLEAN_MR                         = "booleanMatch";
-    String BIT_STRING_MR                      = "bitStringMatch";
     String GENERALIZED_TIME_MR                = "generalizedTimeMatch";
     String GENERALIZED_TIME_ORDERING_MR       = "generalizedTimeOrderingMatch";
     String UUID_MATCH                         = "uuidMatch";