directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r171150 - /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap
Date Fri, 20 May 2005 20:31:29 GMT
Author: akarasulu
Date: Fri May 20 13:31:28 2005
New Revision: 171150

URL: http://svn.apache.org/viewcvs?rev=171150&view=rev
Log:
Added some matching rules that were in the extra matchingRules RFC here:

   http://www.faqs.org/rfcs/rfc3698.html

This is just too backwards to do we have to fix the schema subsystem to make
it work better for extention.  It was never finished and this is why we have
the runnaround. 

This was a fix for daniel.armbrust.list@gmail.com.  Next time we need a JIRA
for it too.


Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java?rev=171150&r1=171149&r2=171150&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
Fri May 20 13:31:28 2005
@@ -88,6 +88,13 @@
          cb.schemaObjectProduced( this, "2.5.13.4", 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, "2.5.13.6", comparator );
+
+        /*
         ( 2.5.13.8 NAME 'numericStringMatch'
           SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
           */
@@ -110,12 +117,19 @@
                  new ComparableComparator() );
          cb.schemaObjectProduced( this, "2.5.13.11", 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 );
+        /*
+       ( 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 );
+
+        /*
+       ( 2.5.13.14 NAME 'integerOrderingMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.15", comparator );
 
         /*
        ( 2.5.13.16 NAME 'bitStringMatch'

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java?rev=171150&r1=171149&r2=171150&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java
Fri May 20 13:31:28 2005
@@ -85,6 +85,19 @@
         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 )
+         */
+
+        mrule = new BootstrapMatchingRule( "2.5.13.6", registries  );
+        mrule.setNames( new String[] { "caseExactOrderingMatch" } );
+        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
+        cb.schemaObjectProduced( this, mrule.getOid(), mrule );
+
+        /*
          * Straight out of RFC 2252: Section 8
          * =======================================
         ( 2.5.13.8 NAME 'numericStringMatch'
@@ -123,6 +136,19 @@
 
         mrule = new BootstrapMatchingRule( "2.5.13.14", registries  );
         mrule.setNames( new String[] { "integerMatch" } );
+        mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
+        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 )
+         */
+
+        mrule = new BootstrapMatchingRule( "2.5.13.15", registries  );
+        mrule.setNames( new String[] { "integerOrderingMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java?rev=171150&r1=171149&r2=171150&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java
Fri May 20 13:31:28 2005
@@ -91,6 +91,13 @@
         cb.schemaObjectProduced( this, "2.5.13.4", 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, "2.5.13.6", normalizer );
+
+        /*
         ( 2.5.13.0 NAME 'objectIdentifierMatch'
           SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
           */
@@ -117,6 +124,13 @@
           */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, "2.5.13.14", 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 );
 
         /*
         ( 2.5.13.16 NAME 'bitStringMatch'



Mime
View raw message