directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r376623 [18/38] - in /directory/sandbox/akarasulu/rc1/apacheds: core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ core-shared/src/main/java/org/...
Date Fri, 10 Feb 2006 10:49:57 GMT
Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java Fri Feb 10 02:48:07 2006
@@ -29,7 +29,6 @@
 import org.apache.directory.shared.ldap.schema.NormalizingComparator;
 
 
-
 /**
  * A producer of Comparator objects for the inetorgperson schema.  This code has been
  * automatically generated using schema files in the OpenLDAP format along with
@@ -51,12 +50,10 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
 
         Comparator comparator;
@@ -65,43 +62,39 @@
          * 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.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.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.12 NAME 'caseIgnoreListSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
 
-        */
+         */
 
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimNormalizer() ),
-                new ComparableComparator() );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "2.5.13.5", comparator );
 
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimNormalizer() ),
-                new ComparableComparator() );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "2.5.13.7", comparator );
 
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                new ComparableComparator() );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "2.5.13.12", 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 )
-        */
-
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                new ComparableComparator() );
+         ( 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 NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.3", comparator );
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonMatchingRuleProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonMatchingRuleProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonMatchingRuleProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonMatchingRuleProducer.java Fri Feb 10 02:48:07 2006
@@ -22,7 +22,6 @@
 import org.apache.directory.server.core.schema.bootstrap.ProducerTypeEnum;
 
 
-
 /**
  * A producer of MatchingRule objects for the inetorgperson schema.  This code has been
  * automatically generated using schema files in the OpenLDAP format along with
@@ -44,12 +43,10 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapMatchingRule mrule = null;
 
@@ -57,28 +54,31 @@
          * 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.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.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.12 NAME 'caseIgnoreListSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
 
         mrule = new BootstrapMatchingRule( "2.5.13.5", registries );
-        mrule.setNames( new String[] { "caseExactMatch" } );
+        mrule.setNames( new String[]
+            { "caseExactMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         mrule = new BootstrapMatchingRule( "2.5.13.7", registries );
-        mrule.setNames( new String[] { "caseExactSubstringsMatch" } );
+        mrule.setNames( new String[]
+            { "caseExactSubstringsMatch" } );
         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.setNames( new String[] { "caseIgnoreListSubstringsMatch" } );
+        mrule.setNames( new String[]
+            { "caseIgnoreListSubstringsMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
@@ -86,12 +86,13 @@
          * 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.setNames( new String[] { "caseIgnoreIA5SubstringsMatch" } );
+        mrule.setNames( new String[]
+            { "caseIgnoreIA5SubstringsMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java Fri Feb 10 02:48:07 2006
@@ -26,7 +26,6 @@
 import org.apache.directory.shared.ldap.schema.Normalizer;
 
 
-
 /**
  * A producer of Normalizer objects for the inetorgperson schema.  This code has been
  * automatically generated using schema files in the OpenLDAP format along with
@@ -48,26 +47,24 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         /*
          * 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.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.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.12 NAME 'caseIgnoreListSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
 
         Normalizer normalizer;
 
@@ -84,9 +81,9 @@
          * 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 CachingNormalizer( new DeepTrimToLowerNormalizer() );
         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.3", normalizer );

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java Fri Feb 10 02:48:07 2006
@@ -49,23 +49,20 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Comparator comparator;
 
         /* Really an openLDAP matching rule but its used in he nis so its here
          *
-            ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
-             SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
          */
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimNormalizer() ),
-                new ComparableComparator() );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "1.3.6.1.4.1.4203.1.2.1", comparator );
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java Fri Feb 10 02:48:07 2006
@@ -43,23 +43,22 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapMatchingRule mrule;
 
         /* Really an openLDAP matching rule but its used in he nis so its here
          *
-            ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
-             SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
          */
 
-        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.4203.1.2.1", registries  );
-        mrule.setNames( new String[] { "caseExactIA5SubstringsMatch" } );
+        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.4203.1.2.1", registries );
+        mrule.setNames( new String[]
+            { "caseExactIA5SubstringsMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
     }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.java Fri Feb 10 02:48:07 2006
@@ -25,7 +25,6 @@
 import org.apache.directory.shared.ldap.schema.Normalizer;
 
 
-
 /**
  * A producer of Normalizer objects for the nis schema.  This code has been
  * automatically generated using schema files in the OpenLDAP format along with
@@ -47,19 +46,17 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Normalizer normalizer;
 
         /* Really an openLDAP matching rule but its used in he nis so its here
          *
-            ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
-             SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
          */
         normalizer = new CachingNormalizer( new DeepTrimNormalizer() );
         cb.schemaObjectProduced( this, "1.3.6.1.4.1.4203.1.2.1", normalizer );

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java Fri Feb 10 02:48:07 2006
@@ -24,7 +24,6 @@
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 
 
-
 /**
  * A producer of SyntaxChecker objects for the nis schema.  This code has been
  * automatically generated using schema files in the OpenLDAP format along with
@@ -46,12 +45,10 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         SyntaxChecker syntaxChecker;
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java Fri Feb 10 02:48:07 2006
@@ -44,12 +44,10 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapSyntax syntax;
         SyntaxCheckerRegistry syntaxCheckerRegistry = registries.getSyntaxCheckerRegistry();
@@ -57,13 +55,15 @@
         // 1.3.6.1.1.1.0.0 - RFC2307 NIS Netgroup Triple
         syntax = new BootstrapSyntax( "1.3.6.1.1.1.0.0", syntaxCheckerRegistry );
         syntax.setDescription( "RFC2307 NIS Netgroup Triple" );
-        syntax.setNames( new String[] { "NIS Netgroup Triple" } );
+        syntax.setNames( new String[]
+            { "NIS Netgroup Triple" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         // 1.3.6.1.1.1.0.1 - RFC2307 Boot Parameter Syntax
         syntax = new BootstrapSyntax( "1.3.6.1.1.1.0.1", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "NIS Boot Parameter" } );
+        syntax.setNames( new String[]
+            { "NIS Boot Parameter" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java Fri Feb 10 02:48:07 2006
@@ -37,7 +37,6 @@
      * @throws NamingException if there are problems registering these objects
      * with bootstrap registries
      */
-    void schemaObjectProduced( BootstrapProducer producer,
-                               String registryKey, Object schemaObject )
+    void schemaObjectProduced( BootstrapProducer producer, String registryKey, Object schemaObject )
         throws NamingException;
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java Fri Feb 10 02:48:07 2006
@@ -46,184 +46,177 @@
     }
 
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-            throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Comparator comparator;
 
         /*
          * Straight out of RFC 2252: Section 8
          * =======================================
-        ( 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, "2.5.13.0", comparator );
+        comparator = new ObjectIdentifierComparator();
+        cb.schemaObjectProduced( this, "2.5.13.0", comparator );
 
         /*
-        ( 2.5.13.1 NAME 'distinguishedNameMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-          */
-         comparator = new DnComparator( new ConcreteNameComponentNormalizer(
-                 registries.getAttributeTypeRegistry() ) );
-         cb.schemaObjectProduced( this, "2.5.13.1", comparator );
-
-         /*
-        ( 2.5.13.2 NAME 'caseIgnoreMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.2", comparator );
-
-         /*
-        ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.3", comparator );
+         ( 2.5.13.1 NAME 'distinguishedNameMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+         */
+        comparator = new DnComparator( new ConcreteNameComponentNormalizer( registries.getAttributeTypeRegistry() ) );
+        cb.schemaObjectProduced( this, "2.5.13.1", comparator );
+
+        /*
+         ( 2.5.13.2 NAME 'caseIgnoreMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "2.5.13.2", comparator );
 
-         /*
-        ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
+        /*
+         ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "2.5.13.3", comparator );
+
+        /*
+         ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
-         comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.4", comparator );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        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 )
+         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 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.8", comparator );
+
+        /*
+         ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.6", comparator );
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.10", 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, "2.5.13.8", comparator );
-
-         /*
-        ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.10", comparator );
-
-         /*
-        ( 2.5.13.11 NAME 'caseIgnoreListMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.11", comparator );
+         ( 2.5.13.11 NAME 'caseIgnoreListMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "2.5.13.11", comparator );
 
         /*
-       ( 2.5.13.14 NAME 'integerMatch'
+         ( 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'
+         ( 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'
+         ( 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 );
 
         /*
-       ( 2.5.13.17 NAME 'octetStringMatch'
+         ( 2.5.13.17 NAME 'octetStringMatch'
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, "2.5.13.17", comparator );
 
         /*
-        ( 2.5.13.18 NAME 'octetStringOrderingMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.18", comparator );
-
-         /*
-        ( 2.5.13.20 NAME 'telephoneNumberMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.20", 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 );
-
-         /*
-        ( 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 );
-
-         /*
-        ( 2.5.13.23 NAME 'uniqueMemberMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.23", comparator );
-
-         /*
-        ( 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 );
-
-         /*
-        ( 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 );
-
-         /*
-        ( 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 );
-
-         /*
-        ( 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 );
-
-         /*
-        ( 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 );
+         ( 2.5.13.18 NAME 'octetStringOrderingMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.18", comparator );
+
+        /*
+         ( 2.5.13.20 NAME 'telephoneNumberMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.20", 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 );
+
+        /*
+         ( 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 );
+
+        /*
+         ( 2.5.13.23 NAME 'uniqueMemberMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "2.5.13.23", comparator );
+
+        /*
+         ( 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 );
+
+        /*
+         ( 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 );
+
+        /*
+         ( 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 );
+
+        /*
+         ( 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 );
+
+        /*
+         ( 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 );
 
         /*
          * Straight out of RFC 3698: Section 2.6
@@ -235,30 +228,28 @@
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, "2.5.13.31", 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 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.1", 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 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.2", 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 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.1", 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 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.2", 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 )
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
          */
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java Fri Feb 10 02:48:07 2006
@@ -37,52 +37,56 @@
     }
 
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapMatchingRule mrule = null;
 
         /*
          * Straight out of RFC 2252: Section 8
          * =======================================
-        ( 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 )
 
-        ( 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 )
 
-        ( 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 )
 
-        ( 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 )
 
-        ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
+         ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-        */
+         */
 
         mrule = new BootstrapMatchingRule( "2.5.13.0", registries );
-        mrule.setNames( new String[] { "objectIdentifierMatch" } );
+        mrule.setNames( new String[]
+            { "objectIdentifierMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.38" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.1", registries  );
-        mrule.setNames( new String[] { "distinguishedNameMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.1", registries );
+        mrule.setNames( new String[]
+            { "distinguishedNameMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.12" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.2", registries  );
-        mrule.setNames( new String[] { "caseIgnoreMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.2", registries );
+        mrule.setNames( new String[]
+            { "caseIgnoreMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.3", registries  );
-        mrule.setNames( new String[] { "caseIgnoreOrderingMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.3", registries );
+        mrule.setNames( new String[]
+            { "caseIgnoreOrderingMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.4", registries  );
-        mrule.setNames( new String[] { "caseIgnoreSubstringsMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.4", registries );
+        mrule.setNames( new String[]
+            { "caseIgnoreSubstringsMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.58" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
@@ -91,53 +95,58 @@
          * 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 )
+         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 = 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'
-          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 )
 
-        ( 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 )
 
-        ( 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 )
 
-        ( 2.5.13.14 NAME 'integerMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         ( 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.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.17 NAME 'octetStringMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         */
 
-        mrule = new BootstrapMatchingRule( "2.5.13.8", registries  );
-        mrule.setNames( new String[] { "numericStringMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.8", registries );
+        mrule.setNames( new String[]
+            { "numericStringMatch" } );
         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.setNames( new String[] { "numericStringSubstringsMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.10", registries );
+        mrule.setNames( new String[]
+            { "numericStringSubstringsMatch" } );
         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.setNames( new String[] { "caseIgnoreListMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.11", registries );
+        mrule.setNames( new String[]
+            { "caseIgnoreListMatch" } );
         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.setNames( new String[] { "integerMatch" } );
+        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 );
 
@@ -146,108 +155,120 @@
          * 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 )
+         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 = 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 );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.16", registries  );
-        mrule.setNames( new String[] { "bitStringMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.16", registries );
+        mrule.setNames( new String[]
+            { "bitStringMatch" } );
         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.setNames( new String[] { "octetStringMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.17", registries );
+        mrule.setNames( new String[]
+            { "octetStringMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
         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.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.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.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.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.24 NAME 'protocolInformationMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
+         */
 
-        mrule = new BootstrapMatchingRule( "2.5.13.20", registries  );
-        mrule.setNames( new String[] { "telephoneNumberMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.20", registries );
+        mrule.setNames( new String[]
+            { "telephoneNumberMatch" } );
         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.setNames( new String[] { "telephoneNumberSubstringsMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.21", registries );
+        mrule.setNames( new String[]
+            { "telephoneNumberSubstringsMatch" } );
         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  );
-        mrule.setNames( new String[] { "presentationAddressMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.22", registries );
+        mrule.setNames( new String[]
+            { "presentationAddressMatch" } );
         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  );
-        mrule.setNames( new String[] { "uniqueMemberMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.23", registries );
+        mrule.setNames( new String[]
+            { "uniqueMemberMatch" } );
         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  );
-        mrule.setNames( new String[] { "protocolInformationMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.24", registries );
+        mrule.setNames( new String[]
+            { "protocolInformationMatch" } );
         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.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.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.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 )
+         ( 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.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 )
+         ( 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( "2.5.13.27", registries  );
-        mrule.setNames( new String[] { "generalizedTimeMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.27", registries );
+        mrule.setNames( new String[]
+            { "generalizedTimeMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.24" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.28", registries  );
-        mrule.setNames( new String[] { "generalizedTimeOrderingMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.28", registries );
+        mrule.setNames( new String[]
+            { "generalizedTimeOrderingMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.24" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
-        mrule = new BootstrapMatchingRule( "2.5.13.29", registries  );
-        mrule.setNames( new String[] { "integerFirstComponentMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.29", registries );
+        mrule.setNames( new String[]
+            { "integerFirstComponentMatch" } );
         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.30", registries  );
-        mrule.setNames( new String[] { "objectIdentifierFirstComponentMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.30", registries );
+        mrule.setNames( new String[]
+            { "objectIdentifierFirstComponentMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.38" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
@@ -259,18 +280,21 @@
          *   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
          */
 
-        mrule = new BootstrapMatchingRule( "2.5.13.31", registries  );
-        mrule.setNames( new String[] { "directoryStringFirstComponentMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.31", 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 = 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 = 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" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
@@ -279,20 +303,22 @@
          * for Additional MatchingRules
 
          ( 2.5.13.13 NAME 'booleanMatch'
-           SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+         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 )
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
 
          */
 
-        mrule = new BootstrapMatchingRule( "2.5.13.13", registries  );
-        mrule.setNames( new String[] { "booleanMatch" } );
+        mrule = new BootstrapMatchingRule( "2.5.13.13", registries );
+        mrule.setNames( new String[]
+            { "booleanMatch" } );
         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.setNames( new String[] { "octetStringOrderingMatch" } );
+
+        mrule = new BootstrapMatchingRule( "2.5.13.18", registries );
+        mrule.setNames( new String[]
+            { "octetStringOrderingMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
     }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java Fri Feb 10 02:48:07 2006
@@ -45,8 +45,7 @@
     }
 
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-            throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Normalizer normalizer;
 
@@ -54,172 +53,171 @@
          * Straight out of RFC 2252: Section 8
          * =======================================
 
-        ( 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 )
          */
-        normalizer = new CachingNormalizer( new DnNormalizer(
-                new ConcreteNameComponentNormalizer(
-                        registries.getAttributeTypeRegistry() ) ) ) ;
+        normalizer = new CachingNormalizer( new DnNormalizer( new ConcreteNameComponentNormalizer( registries
+            .getAttributeTypeRegistry() ) ) );
         cb.schemaObjectProduced( this, "2.5.13.1", 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 )
-          */
+         ( 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 CachingNormalizer( new DeepTrimToLowerNormalizer() );
         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.2", normalizer );
 
         /*
-        ( 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 )
+         */
         normalizer = new CachingNormalizer( new DeepTrimToLowerNormalizer() );
         cb.schemaObjectProduced( this, "2.5.13.11", 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 CachingNormalizer( new DeepTrimToLowerNormalizer() );
         cb.schemaObjectProduced( this, "2.5.13.2", 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 CachingNormalizer( new DeepTrimToLowerNormalizer() );
         cb.schemaObjectProduced( this, "2.5.13.3", 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 CachingNormalizer( new DeepTrimToLowerNormalizer() );
         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 )
+         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 )
-          */
+         ( 2.5.13.0 NAME 'objectIdentifierMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+         */
         normalizer = new ObjectIdentifierNormalizer();
         cb.schemaObjectProduced( this, "2.5.13.0", 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, "2.5.13.8", 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, "2.5.13.10", normalizer );
 
         /*
-        ( 2.5.13.14 NAME 'integerMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-          */
+         ( 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 );
 
         /*
-        ( 2.5.13.14 NAME 'integerOrderingMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-          */
+         ( 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'
-          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, "2.5.13.16", normalizer );
 
         /*
-       ( 2.5.13.17 NAME 'octetStringMatch'
+         ( 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 );
 
         /*
-        ( 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 );
+         ( 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 );
 
         /*
-        ( 2.5.13.20 NAME 'telephoneNumberMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
-          */
+         ( 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 );
 
         /*
-        ( 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, "2.5.13.21", 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 );
 
         /*
-        ( 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 CachingNormalizer( new DeepTrimNormalizer() );
         cb.schemaObjectProduced( this, "2.5.13.23", 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 )
+         */
         normalizer = new CachingNormalizer( new DeepTrimNormalizer() );
         cb.schemaObjectProduced( this, "2.5.13.24", normalizer );
 
         /*
-        ( 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 CachingNormalizer( new DeepTrimNormalizer() );
         cb.schemaObjectProduced( this, "2.5.13.27", 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 CachingNormalizer( new DeepTrimNormalizer() );
         cb.schemaObjectProduced( this, "2.5.13.28", 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 );
 
         /*
-        ( 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 );
 
@@ -232,11 +230,11 @@
          */
         normalizer = new NoOpNormalizer();
         cb.schemaObjectProduced( this, "2.5.13.31", 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 )
-          */
+         ( 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 CachingNormalizer( new DeepTrimNormalizer() );
         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.1", normalizer );
 
@@ -245,7 +243,7 @@
          * for Additional MatchingRules
 
          ( 2.5.13.13 NAME 'booleanMatch'
-           SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
          */
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java Fri Feb 10 02:48:07 2006
@@ -44,8 +44,7 @@
     }
 
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-            throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         SyntaxChecker syntaxChecker;
 
@@ -147,7 +146,6 @@
         syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.20" );
         cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
 
-
         /* 20 Enhanced Guide                  Y  1.3.6.1.4.1.1466.115.121.1.21
          * 21 Facsimile Telephone Number      Y  1.3.6.1.4.1.1466.115.121.1.22
          * 22 Fax                             N  1.3.6.1.4.1.1466.115.121.1.23
@@ -189,7 +187,6 @@
         syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.30" );
         cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
 
-
         /* 30 Matching Rule Use Description   Y  1.3.6.1.4.1.1466.115.121.1.31
          * 31 Mail Preference                 Y  1.3.6.1.4.1.1466.115.121.1.32
          * 32 MHS OR Address                  Y  1.3.6.1.4.1.1466.115.121.1.33
@@ -231,7 +228,6 @@
         syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.40" );
         cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
 
-
         /*
          * 40 Postal Address                  Y  1.3.6.1.4.1.1466.115.121.1.41
          * 41 Protocol Information            Y  1.3.6.1.4.1.1466.115.121.1.42
@@ -273,7 +269,6 @@
 
         syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.50" );
         cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
 
         /*
          * 50 Teletex Terminal Identifier     Y  1.3.6.1.4.1.1466.115.121.1.51



Mime
View raw message