directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [24/45] - in /directory/trunks/apacheds: ./ core-plugin/ 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/ core-shared/src/...
Date Mon, 20 Feb 2006 03:58:21 GMT
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java Sun Feb 19 19:57:02 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 );
     }

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java Sun Feb 19 19:57:02 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 )
 
          */
 

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java Sun Feb 19 19:57:02 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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java Sun Feb 19 19:57:02 2006
@@ -112,9 +112,7 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapSyntax syntax;
         SyntaxCheckerRegistry syntaxCheckerRegistry = registries.getSyntaxCheckerRegistry();
@@ -138,53 +136,63 @@
          * 9 Certificate Pair                N  1.3.6.1.4.1.1466.115.121.1.10
          */
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.1", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "ACI Item" } );
+        syntax.setNames( new String[]
+            { "ACI Item" } );
         // This is in direct conflict with RFC 2252 but for us ACI Item is human readable
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.2", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Access Point" } );
+        syntax.setNames( new String[]
+            { "Access Point" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.3", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Attribute Type Description" } );
+        syntax.setNames( new String[]
+            { "Attribute Type Description" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.4", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Audio" } );
+        syntax.setNames( new String[]
+            { "Audio" } );
         syntax.setHumanReadible( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.5", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Binary" } );
+        syntax.setNames( new String[]
+            { "Binary" } );
         syntax.setHumanReadible( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.6", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Bit String" } );
+        syntax.setNames( new String[]
+            { "Bit String" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.7", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Boolean" } );
+        syntax.setNames( new String[]
+            { "Boolean" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.8", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Certificate" } );
+        syntax.setNames( new String[]
+            { "Certificate" } );
         syntax.setHumanReadible( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.9", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Certificate List" } );
+        syntax.setNames( new String[]
+            { "Certificate List" } );
         syntax.setHumanReadible( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.10", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Certificate Pair" } );
+        syntax.setNames( new String[]
+            { "Certificate Pair" } );
         syntax.setHumanReadible( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
@@ -203,52 +211,62 @@
          * 19 DSE Type                        Y  1.3.6.1.4.1.1466.115.121.1.20
          */
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.11", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Country String" } );
+        syntax.setNames( new String[]
+            { "Country String" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.12", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "DN" } );
+        syntax.setNames( new String[]
+            { "DN" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.13", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Data Quality Syntax" } );
+        syntax.setNames( new String[]
+            { "Data Quality Syntax" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.14", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Delivery Method" } );
+        syntax.setNames( new String[]
+            { "Delivery Method" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.15", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Directory String" } );
+        syntax.setNames( new String[]
+            { "Directory String" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.16", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "DIT Content Rule Description" } );
+        syntax.setNames( new String[]
+            { "DIT Content Rule Description" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.17", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "DIT Structure Rule Description" } );
+        syntax.setNames( new String[]
+            { "DIT Structure Rule Description" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.18", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "DL Submit Permission" } );
+        syntax.setNames( new String[]
+            { "DL Submit Permission" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.19", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "DSA Quality Syntax" } );
+        syntax.setNames( new String[]
+            { "DSA Quality Syntax" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.20", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "DSE Type" } );
+        syntax.setNames( new String[]
+            { "DSE Type" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
@@ -267,52 +285,62 @@
          * 29 Matching Rule Description       Y  1.3.6.1.4.1.1466.115.121.1.30
          */
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.21", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Enhanced Guide" } );
+        syntax.setNames( new String[]
+            { "Enhanced Guide" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.22", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Facsimile Telephone Number" } );
+        syntax.setNames( new String[]
+            { "Facsimile Telephone Number" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.23", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Fax" } );
+        syntax.setNames( new String[]
+            { "Fax" } );
         syntax.setHumanReadible( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.24", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Generalized Time" } );
+        syntax.setNames( new String[]
+            { "Generalized Time" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.25", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Guide" } );
+        syntax.setNames( new String[]
+            { "Guide" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.26", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "IA5 String" } );
+        syntax.setNames( new String[]
+            { "IA5 String" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.27", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "INTEGER" } );
+        syntax.setNames( new String[]
+            { "INTEGER" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.28", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "JPEG" } );
+        syntax.setNames( new String[]
+            { "JPEG" } );
         syntax.setHumanReadible( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.29", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Master And Shadow Access Points" } );
+        syntax.setNames( new String[]
+            { "Master And Shadow Access Points" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.30", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Matching Rule Description" } );
+        syntax.setNames( new String[]
+            { "Matching Rule Description" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
@@ -331,47 +359,56 @@
          * 39 Octet String                    Y  1.3.6.1.4.1.1466.115.121.1.40
          */
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.31", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Matching Rule Use Description" } );
+        syntax.setNames( new String[]
+            { "Matching Rule Use Description" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.32", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Mail Preference" } );
+        syntax.setNames( new String[]
+            { "Mail Preference" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.33", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "MHS OR Address" } );
+        syntax.setNames( new String[]
+            { "MHS OR Address" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.34", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Name And Optional UID" } );
+        syntax.setNames( new String[]
+            { "Name And Optional UID" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.35", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Name Form Description" } );
+        syntax.setNames( new String[]
+            { "Name Form Description" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.36", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Numeric String" } );
+        syntax.setNames( new String[]
+            { "Numeric String" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.37", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Object Class Description" } );
+        syntax.setNames( new String[]
+            { "Object Class Description" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.38", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "OID" } );
+        syntax.setNames( new String[]
+            { "OID" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.39", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Other Mailbox" } );
+        syntax.setNames( new String[]
+            { "Other Mailbox" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
@@ -384,7 +421,8 @@
          * binary attributes.  If that happens we can have data corruption due to UTF-8 handling.
          */
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.40", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Octet String" } );
+        syntax.setNames( new String[]
+            { "Octet String" } );
         syntax.setHumanReadible( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
@@ -403,52 +441,62 @@
          * 49 Telephone Number                Y  1.3.6.1.4.1.1466.115.121.1.50
          */
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.41", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Postal Address" } );
+        syntax.setNames( new String[]
+            { "Postal Address" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.42", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Protocol Information" } );
+        syntax.setNames( new String[]
+            { "Protocol Information" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.43", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Presentation Address" } );
+        syntax.setNames( new String[]
+            { "Presentation Address" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.44", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Printable String" } );
+        syntax.setNames( new String[]
+            { "Printable String" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.45", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Subtree Specification" } );
+        syntax.setNames( new String[]
+            { "Subtree Specification" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.46", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Supplier Information" } );
+        syntax.setNames( new String[]
+            { "Supplier Information" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.47", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Supplier Or Consumer" } );
+        syntax.setNames( new String[]
+            { "Supplier Or Consumer" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.48", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Supplier And Consumer" } );
+        syntax.setNames( new String[]
+            { "Supplier And Consumer" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.49", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Supported Algorithm" } );
+        syntax.setNames( new String[]
+            { "Supported Algorithm" } );
         syntax.setHumanReadible( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.50", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Telephone Number" } );
+        syntax.setNames( new String[]
+            { "Telephone Number" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
@@ -465,42 +513,50 @@
          * 57 Substring Assertion             Y  1.3.6.1.4.1.1466.115.121.1.58
          */
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.51", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Teletex Terminal Identifier" } );
+        syntax.setNames( new String[]
+            { "Teletex Terminal Identifier" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.52", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Telex Number" } );
+        syntax.setNames( new String[]
+            { "Telex Number" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.53", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "UTC Time" } );
+        syntax.setNames( new String[]
+            { "UTC Time" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.54", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "LDAP Syntax Description" } );
+        syntax.setNames( new String[]
+            { "LDAP Syntax Description" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.55", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Modify Rights" } );
+        syntax.setNames( new String[]
+            { "Modify Rights" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.56", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "LDAP BootstrapSchema Definition" } );
+        syntax.setNames( new String[]
+            { "LDAP BootstrapSchema Definition" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.57", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "LDAP BootstrapSchema Description" } );
+        syntax.setNames( new String[]
+            { "LDAP BootstrapSchema Description" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.58", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "Substring Assertion" } );
+        syntax.setNames( new String[]
+            { "Substring Assertion" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
     }

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Sun Feb 19 19:57:02 2006
@@ -42,8 +42,7 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
-    public RefinementEvaluator( RefinementLeafEvaluator leafEvaluator )
+    public RefinementEvaluator(RefinementLeafEvaluator leafEvaluator)
     {
         this.leafEvaluator = leafEvaluator;
     }
@@ -59,7 +58,7 @@
         {
             throw new IllegalArgumentException( "objectClasses cannot be null" );
         }
-        if ( ! objectClasses.getID().equalsIgnoreCase( "objectClass" ) )
+        if ( !objectClasses.getID().equalsIgnoreCase( "objectClass" ) )
         {
             throw new IllegalArgumentException( "Attribute objectClasses should be of id 'objectClass'" );
         }
@@ -70,45 +69,44 @@
 
         BranchNode bnode = ( BranchNode ) node;
 
-        switch( bnode.getOperator() )
+        switch ( bnode.getOperator() )
         {
-        case( BranchNode.OR ):
-            Iterator children = bnode.getChildren().iterator();
-
-            while ( children.hasNext() )
-            {
-                ExprNode child = ( ExprNode ) children.next();
+            case ( BranchNode.OR  ):
+                Iterator children = bnode.getChildren().iterator();
 
-                if ( evaluate( child, objectClasses ) )
+                while ( children.hasNext() )
                 {
-                    return true;
+                    ExprNode child = ( ExprNode ) children.next();
+
+                    if ( evaluate( child, objectClasses ) )
+                    {
+                        return true;
+                    }
                 }
-            }
 
-            return false;
-        case( BranchNode.AND ):
-            children = bnode.getChildren().iterator();
-            while ( children.hasNext() )
-            {
-                ExprNode child = ( ExprNode ) children.next();
+                return false;
+            case ( BranchNode.AND  ):
+                children = bnode.getChildren().iterator();
+                while ( children.hasNext() )
+                {
+                    ExprNode child = ( ExprNode ) children.next();
+
+                    if ( !evaluate( child, objectClasses ) )
+                    {
+                        return false;
+                    }
+                }
 
-                if ( ! evaluate( child, objectClasses ) )
+                return true;
+            case ( BranchNode.NOT  ):
+                if ( null != bnode.getChild() )
                 {
-                    return false;
+                    return !evaluate( bnode.getChild(), objectClasses );
                 }
-            }
 
-            return true;
-        case( BranchNode.NOT ):
-            if ( null != bnode.getChild() )
-            {
-                return ! evaluate( bnode.getChild(), objectClasses );
-            }
-
-            throw new IllegalArgumentException( "Negation has no child: " + node );
-        default:
-            throw new IllegalArgumentException( "Unrecognized branch node operator: "
-                + bnode.getOperator() );
+                throw new IllegalArgumentException( "Negation has no child: " + node );
+            default:
+                throw new IllegalArgumentException( "Unrecognized branch node operator: " + bnode.getOperator() );
         }
     }
 }

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Sun Feb 19 19:57:02 2006
@@ -45,7 +45,7 @@
      *
      * @param registry the OID registry used to lookup names for objectClass OIDs
      */
-    public RefinementLeafEvaluator( OidRegistry registry )
+    public RefinementLeafEvaluator(OidRegistry registry)
     {
         this.registry = registry;
     }
@@ -69,10 +69,9 @@
         }
         if ( node.getAssertionType() != LeafNode.EQUALITY )
         {
-            throw new NamingException( "Unrecognized assertion type for refinement node: "
-                    + node.getAssertionType() );
+            throw new NamingException( "Unrecognized assertion type for refinement node: " + node.getAssertionType() );
         }
-        if ( ! node.getAttribute().equalsIgnoreCase( "objectclass" ) )
+        if ( !node.getAttribute().equalsIgnoreCase( "objectclass" ) )
         {
             throw new NamingException( "Refinement leaf node attribute was " + node.getAttribute() );
         }
@@ -81,7 +80,7 @@
         {
             throw new IllegalArgumentException( "objectClasses argument cannot be null" );
         }
-        if ( ! objectClasses.getID().equalsIgnoreCase( "objectclass" ) )
+        if ( !objectClasses.getID().equalsIgnoreCase( "objectclass" ) )
         {
             throw new IllegalArgumentException( "objectClasses attribute must be for ID 'objectClass'" );
         }
@@ -94,7 +93,7 @@
 
         // If the filter value for the objectClass is an OID we need to resolve a name
         String value = node.getValue();
-        
+
         if ( Character.isDigit( value.charAt( 0 ) ) )
         {
             Iterator list = registry.getNameSet( value ).iterator();

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Sun Feb 19 19:57:02 2006
@@ -86,12 +86,8 @@
 
     public static final String COLLECTIVE_INNERAREA = "collectiveAttributeInnerArea";
 
-    public static final String[] SUBENTRY_OPATTRS = {
-        AUTONOUMOUS_AREA_SUBENTRY,
-        AC_SUBENTRY,
-        SCHEMA_AREA_SUBENTRY,
-        COLLECTIVE_ATTRIBUTE_SUBENTRIES
-    };
+    public static final String[] SUBENTRY_OPATTRS =
+        { AUTONOUMOUS_AREA_SUBENTRY, AC_SUBENTRY, SCHEMA_AREA_SUBENTRY, COLLECTIVE_ATTRIBUTE_SUBENTRIES };
 
     private static final Logger log = LoggerFactory.getLogger( SubentryService.class );
 
@@ -109,8 +105,8 @@
         super.init( factoryCfg, cfg );
         this.nexus = factoryCfg.getPartitionNexus();
         this.factoryCfg = factoryCfg;
-        ConcreteNameComponentNormalizer ncn = new ConcreteNameComponentNormalizer(
-                factoryCfg.getGlobalRegistries().getAttributeTypeRegistry() );
+        ConcreteNameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( factoryCfg.getGlobalRegistries()
+            .getAttributeTypeRegistry() );
         ssParser = new SubtreeSpecificationParser( ncn );
         dnParser = new DnParser( ncn );
         evaluator = new SubtreeEvaluator( factoryCfg.getGlobalRegistries().getOidRegistry() );
@@ -120,7 +116,8 @@
         ExprNode filter = new SimpleNode( "objectclass", "subentry", LeafNode.EQUALITY );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-        controls.setReturningAttributes( new String[] { "subtreeSpecification" } );
+        controls.setReturningAttributes( new String[]
+            { "subtreeSpecification" } );
 
         // search each namingContext for subentries
         while ( suffixes.hasNext() )
@@ -155,16 +152,15 @@
     // Methods/Code dealing with Subentry Visibility
     // -----------------------------------------------------------------------
 
-
     public NamingEnumeration list( NextInterceptor nextInterceptor, Name base ) throws NamingException
     {
         NamingEnumeration e = nextInterceptor.list( base );
         Invocation invocation = InvocationStack.getInstance().peek();
 
-        if ( ! isSubentryVisible( invocation ) )
+        if ( !isSubentryVisible( invocation ) )
         {
-            return new SearchResultFilteringEnumeration( e, new SearchControls(), 
-                invocation, new HideSubentriesFilter() );
+            return new SearchResultFilteringEnumeration( e, new SearchControls(), invocation,
+                new HideSubentriesFilter() );
         }
 
         return e;
@@ -172,7 +168,7 @@
 
 
     public NamingEnumeration search( NextInterceptor nextInterceptor, Name base, Map env, ExprNode filter,
-            SearchControls searchCtls ) throws NamingException
+        SearchControls searchCtls ) throws NamingException
     {
         NamingEnumeration e = nextInterceptor.search( base, env, filter, searchCtls );
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -184,12 +180,12 @@
         }
 
         // for subtree and one level scope we filter
-        if ( ! isSubentryVisible( invocation ) )
+        if ( !isSubentryVisible( invocation ) )
         {
             return new SearchResultFilteringEnumeration( e, searchCtls, invocation, new HideSubentriesFilter() );
         }
         else
-        {            
+        {
             return new SearchResultFilteringEnumeration( e, searchCtls, invocation, new HideEntriesFilter() );
         }
     }
@@ -231,7 +227,6 @@
     // Methods dealing with entry and subentry addition
     // -----------------------------------------------------------------------
 
-
     /**
      * Evaluates the set of subentry subtrees upon an entry and returns the
      * operational subentry attributes that will be added to the entry if
@@ -291,8 +286,7 @@
                             subentryAttrs.put( operational );
                         }
                     }
-                    else if ( role.equalsIgnoreCase( COLLECTIVE_AREA ) ||
-                              role.equalsIgnoreCase( COLLECTIVE_INNERAREA ) )
+                    else if ( role.equalsIgnoreCase( COLLECTIVE_AREA ) || role.equalsIgnoreCase( COLLECTIVE_INNERAREA ) )
                     {
                         operational = subentryAttrs.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
                         if ( operational == null )
@@ -303,11 +297,12 @@
                     }
                     else
                     {
-                        throw new LdapInvalidAttributeValueException( "Encountered invalid administrativeRole '"
-                                + role + "' in administrative point of subentry " + subentryDnStr + ". The values of this attribute"
-                                + " are constrained to autonomousArea, accessControlSpecificArea, accessControlInnerArea,"
-                                + " subschemaAdminSpecificArea, collectiveAttributeSpecificArea, and"
-                                + " collectiveAttributeInnerArea.", ResultCodeEnum.CONSTRAINTVIOLATION );
+                        throw new LdapInvalidAttributeValueException( "Encountered invalid administrativeRole '" + role
+                            + "' in administrative point of subentry " + subentryDnStr
+                            + ". The values of this attribute"
+                            + " are constrained to autonomousArea, accessControlSpecificArea, accessControlInnerArea,"
+                            + " subschemaAdminSpecificArea, collectiveAttributeSpecificArea, and"
+                            + " collectiveAttributeInnerArea.", ResultCodeEnum.CONSTRAINTVIOLATION );
                     }
 
                     operational.add( subentryDn.toString() );
@@ -335,9 +330,9 @@
             if ( administrativeRole == null || administrativeRole.size() <= 0 )
             {
                 throw new LdapNoSuchAttributeException( "Administration point " + apName
-                        + " does not contain an administrativeRole attribute! An"
-                        + " administrativeRole attribute in the administrative point is"
-                        + " required to add a subordinate subentry." );
+                    + " does not contain an administrativeRole attribute! An"
+                    + " administrativeRole attribute in the administrative point is"
+                    + " required to add a subordinate subentry." );
             }
 
             /* ----------------------------------------------------------------
@@ -386,7 +381,8 @@
             ExprNode filter = new PresenceNode( "objectclass" );
             SearchControls controls = new SearchControls();
             controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-            controls.setReturningAttributes( new String[] { "+", "*" } );
+            controls.setReturningAttributes( new String[]
+                { "+", "*" } );
 
             NamingEnumeration subentries = nexus.search( baseDn, factoryCfg.getEnvironment(), filter, controls );
             while ( subentries.hasMore() )
@@ -448,8 +444,8 @@
                                 entry.put( operational );
                             }
                         }
-                        else if ( role.equalsIgnoreCase( COLLECTIVE_AREA ) ||
-                                  role.equalsIgnoreCase( COLLECTIVE_INNERAREA ) )
+                        else if ( role.equalsIgnoreCase( COLLECTIVE_AREA )
+                            || role.equalsIgnoreCase( COLLECTIVE_INNERAREA ) )
                         {
                             operational = entry.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
                             if ( operational == null )
@@ -460,8 +456,12 @@
                         }
                         else
                         {
-                            throw new LdapInvalidAttributeValueException( "Encountered invalid administrativeRole '"
-                                    + role + "' in administrative point of subentry " + subentryDnStr + ". The values of this attribute"
+                            throw new LdapInvalidAttributeValueException(
+                                "Encountered invalid administrativeRole '"
+                                    + role
+                                    + "' in administrative point of subentry "
+                                    + subentryDnStr
+                                    + ". The values of this attribute"
                                     + " are constrained to autonomousArea, accessControlSpecificArea, accessControlInnerArea,"
                                     + " subschemaAdminSpecificArea, collectiveAttributeSpecificArea, and"
                                     + " collectiveAttributeInnerArea.", ResultCodeEnum.CONSTRAINTVIOLATION );
@@ -481,7 +481,6 @@
     // Methods dealing subentry deletion
     // -----------------------------------------------------------------------
 
-
     public void delete( NextInterceptor next, Name name ) throws NamingException
     {
         Attributes entry = nexus.lookup( name );
@@ -509,7 +508,8 @@
             ExprNode filter = new PresenceNode( "objectclass" );
             SearchControls controls = new SearchControls();
             controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-            controls.setReturningAttributes( new String[] { "+", "*" } );
+            controls.setReturningAttributes( new String[]
+                { "+", "*" } );
 
             NamingEnumeration subentries = nexus.search( baseDn, factoryCfg.getEnvironment(), filter, controls );
             while ( subentries.hasMore() )
@@ -535,7 +535,6 @@
     // Methods dealing subentry name changes
     // -----------------------------------------------------------------------
 
-
     /**
      * Checks to see if an entry being renamed has a descendant that is an
      * administrative point.
@@ -596,7 +595,7 @@
             }
 
             // need to remove references to the subentry
-            if ( isOldNameSelected && ! isNewNameSelected )
+            if ( isOldNameSelected && !isNewNameSelected )
             {
                 for ( int ii = 0; ii < SUBENTRY_OPATTRS.length; ii++ )
                 {
@@ -617,7 +616,7 @@
                 }
             }
             // need to add references to the subentry
-            else if ( isNewNameSelected && ! isOldNameSelected )
+            else if ( isNewNameSelected && !isOldNameSelected )
             {
                 for ( int ii = 0; ii < SUBENTRY_OPATTRS.length; ii++ )
                 {
@@ -670,7 +669,8 @@
             ExprNode filter = new PresenceNode( "objectclass" );
             SearchControls controls = new SearchControls();
             controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-            controls.setReturningAttributes( new String[] { "+", "*" } );
+            controls.setReturningAttributes( new String[]
+                { "+", "*" } );
             NamingEnumeration subentries = nexus.search( baseDn, factoryCfg.getEnvironment(), filter, controls );
             while ( subentries.hasMore() )
             {
@@ -710,7 +710,7 @@
 
 
     public void move( NextInterceptor next, Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn )
-            throws NamingException
+        throws NamingException
     {
         Attributes entry = nexus.lookup( oriChildName );
         Attribute objectClasses = entry.get( "objectClass" );
@@ -736,7 +736,8 @@
             ExprNode filter = new PresenceNode( "objectclass" );
             SearchControls controls = new SearchControls();
             controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-            controls.setReturningAttributes( new String[] { "+", "*" } );
+            controls.setReturningAttributes( new String[]
+                { "+", "*" } );
             NamingEnumeration subentries = nexus.search( baseDn, factoryCfg.getEnvironment(), filter, controls );
             while ( subentries.hasMore() )
             {
@@ -746,7 +747,8 @@
 
                 if ( evaluator.evaluate( ss, apName, dn, candidate.get( "objectClass" ) ) )
                 {
-                    nexus.modify( dn, getOperationalModsForReplace( oriChildName, newName, administrativeRole, candidate ) );
+                    nexus.modify( dn, getOperationalModsForReplace( oriChildName, newName, administrativeRole,
+                        candidate ) );
                 }
             }
         }
@@ -799,7 +801,8 @@
             ExprNode filter = new PresenceNode( "objectclass" );
             SearchControls controls = new SearchControls();
             controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-            controls.setReturningAttributes( new String[] { "+", "*" } );
+            controls.setReturningAttributes( new String[]
+                { "+", "*" } );
             NamingEnumeration subentries = nexus.search( baseDn, factoryCfg.getEnvironment(), filter, controls );
             while ( subentries.hasMore() )
             {
@@ -809,7 +812,8 @@
 
                 if ( evaluator.evaluate( ss, apName, dn, candidate.get( "objectClass" ) ) )
                 {
-                    nexus.modify( dn, getOperationalModsForReplace( oriChildName, newName, administrativeRole, candidate ) );
+                    nexus.modify( dn, getOperationalModsForReplace( oriChildName, newName, administrativeRole,
+                        candidate ) );
                 }
             }
         }
@@ -841,7 +845,6 @@
     // Methods dealing subentry modification
     // -----------------------------------------------------------------------
 
-
     public void modify( NextInterceptor next, Name name, int modOp, Attributes mods ) throws NamingException
     {
         Attributes entry = nexus.lookup( name );
@@ -874,7 +877,8 @@
             ExprNode filter = new PresenceNode( "objectClass" );
             SearchControls controls = new SearchControls();
             controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-            controls.setReturningAttributes( new String[] { "+", "*" } );
+            controls.setReturningAttributes( new String[]
+                { "+", "*" } );
             NamingEnumeration subentries = nexus.search( oldBaseDn, factoryCfg.getEnvironment(), filter, controls );
             while ( subentries.hasMore() )
             {
@@ -957,7 +961,8 @@
             ExprNode filter = new PresenceNode( "objectClass" );
             SearchControls controls = new SearchControls();
             controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-            controls.setReturningAttributes( new String[] { "+", "*" } );
+            controls.setReturningAttributes( new String[]
+                { "+", "*" } );
             NamingEnumeration subentries = nexus.search( oldBaseDn, factoryCfg.getEnvironment(), filter, controls );
             while ( subentries.hasMore() )
             {
@@ -1001,9 +1006,8 @@
     // Utility Methods
     // -----------------------------------------------------------------------
 
-
     private ModificationItem[] getOperationalModsForReplace( Name oldName, Name newName, Attribute administrativeRole,
-                                                             Attributes entry ) throws NamingException
+        Attributes entry ) throws NamingException
     {
         List modList = new ArrayList();
         NamingEnumeration roles = administrativeRole.getAll();
@@ -1054,8 +1058,7 @@
                     operational.add( newName.toString() );
                 }
             }
-            else if ( role.equalsIgnoreCase( COLLECTIVE_AREA ) ||
-                      role.equalsIgnoreCase( COLLECTIVE_INNERAREA ) )
+            else if ( role.equalsIgnoreCase( COLLECTIVE_AREA ) || role.equalsIgnoreCase( COLLECTIVE_INNERAREA ) )
             {
                 operational = ( Attribute ) entry.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES ).clone();
                 if ( operational == null )
@@ -1071,11 +1074,11 @@
             }
             else
             {
-                throw new LdapInvalidAttributeValueException( "Encountered invalid administrativeRole '"
-                        + role + "' in administrative point of subentry " + oldName + ". The values of this attribute"
-                        + " are constrained to autonomousArea, accessControlSpecificArea, accessControlInnerArea,"
-                        + " subschemaAdminSpecificArea, collectiveAttributeSpecificArea, and"
-                        + " collectiveAttributeInnerArea.", ResultCodeEnum.CONSTRAINTVIOLATION );
+                throw new LdapInvalidAttributeValueException( "Encountered invalid administrativeRole '" + role
+                    + "' in administrative point of subentry " + oldName + ". The values of this attribute"
+                    + " are constrained to autonomousArea, accessControlSpecificArea, accessControlInnerArea,"
+                    + " subschemaAdminSpecificArea, collectiveAttributeSpecificArea, and"
+                    + " collectiveAttributeInnerArea.", ResultCodeEnum.CONSTRAINTVIOLATION );
             }
 
             modList.add( new ModificationItem( DirContext.REPLACE_ATTRIBUTE, operational ) );
@@ -1096,7 +1099,7 @@
      * @throws NamingException if there are problems accessing attributes
      */
     private Attributes getSubentryOperatationalAttributes( Name name, Attribute administrativeRole )
-            throws NamingException
+        throws NamingException
     {
         Attributes operational = new LockableAttributesImpl();
         NamingEnumeration roles = administrativeRole.getAll();
@@ -1137,8 +1140,7 @@
                     operational.get( SCHEMA_AREA_SUBENTRY ).add( name.toString() );
                 }
             }
-            else if ( role.equalsIgnoreCase( COLLECTIVE_AREA ) ||
-                      role.equalsIgnoreCase( COLLECTIVE_INNERAREA ) )
+            else if ( role.equalsIgnoreCase( COLLECTIVE_AREA ) || role.equalsIgnoreCase( COLLECTIVE_INNERAREA ) )
             {
                 if ( operational.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES ) == null )
                 {
@@ -1151,11 +1153,11 @@
             }
             else
             {
-                throw new LdapInvalidAttributeValueException( "Encountered invalid administrativeRole '"
-                        + role + "' in administrative point of subentry " + name + ". The values of this attribute are"
-                        + " constrained to autonomousArea, accessControlSpecificArea, accessControlInnerArea,"
-                        + " subschemaAdminSpecificArea, collectiveAttributeSpecificArea, and"
-                        + " collectiveAttributeInnerArea.", ResultCodeEnum.CONSTRAINTVIOLATION );
+                throw new LdapInvalidAttributeValueException( "Encountered invalid administrativeRole '" + role
+                    + "' in administrative point of subentry " + name + ". The values of this attribute are"
+                    + " constrained to autonomousArea, accessControlSpecificArea, accessControlInnerArea,"
+                    + " subschemaAdminSpecificArea, collectiveAttributeSpecificArea, and"
+                    + " collectiveAttributeInnerArea.", ResultCodeEnum.CONSTRAINTVIOLATION );
             }
         }
 
@@ -1213,7 +1215,8 @@
      * of the subentry
      * @return the set of modifications needed to update the entry
      */
-    public ModificationItem[] getOperationalModsForAdd( Attributes entry, Attributes operational ) throws NamingException
+    public ModificationItem[] getOperationalModsForAdd( Attributes entry, Attributes operational )
+        throws NamingException
     {
         List modList = new ArrayList();
 
@@ -1251,22 +1254,22 @@
         return mods;
     }
 
-
     /**
      * SearchResultFilter used to filter out subentries based on objectClass values.
      */
     public class HideSubentriesFilter implements SearchResultFilter
     {
-        public boolean accept(Invocation invocation, SearchResult result, SearchControls controls) throws NamingException
+        public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
+            throws NamingException
         {
             String dn = result.getName();
-            
+
             // see if we can get a match without normalization
             if ( subtrees.containsKey( dn ) )
             {
                 return false;
             }
-            
+
             // see if we can use objectclass if present
             Attribute objectClasses = result.getAttributes().get( "objectClass" );
             if ( objectClasses != null )
@@ -1275,12 +1278,12 @@
                 {
                     return false;
                 }
-                
+
                 if ( objectClasses.contains( SUBENTRY_OBJECTCLASS_OID ) )
                 {
                     return false;
                 }
-                
+
                 for ( int ii = 0; ii < objectClasses.size(); ii++ )
                 {
                     String oc = ( String ) objectClasses.get( ii );
@@ -1289,39 +1292,39 @@
                         return false;
                     }
                 }
-                
+
                 return true;
             }
 
-            if ( ! result.isRelative() )
+            if ( !result.isRelative() )
             {
                 String normalizedDn = dnParser.parse( dn ).toString();
                 return !subtrees.containsKey( normalizedDn );
             }
-            
+
             Name name = dnParser.parse( invocation.getCaller().getNameInNamespace() );
             name.addAll( dnParser.parse( result.getName() ) );
             return !subtrees.containsKey( name.toString() );
         }
     }
 
-
     /**
      * SearchResultFilter used to filter out normal entries but shows subentries based on 
      * objectClass values.
      */
     public class HideEntriesFilter implements SearchResultFilter
     {
-        public boolean accept(Invocation invocation, SearchResult result, SearchControls controls) throws NamingException
+        public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
+            throws NamingException
         {
             String dn = result.getName();
-            
+
             // see if we can get a match without normalization
             if ( subtrees.containsKey( dn ) )
             {
                 return true;
             }
-            
+
             // see if we can use objectclass if present
             Attribute objectClasses = result.getAttributes().get( "objectClass" );
             if ( objectClasses != null )
@@ -1330,12 +1333,12 @@
                 {
                     return true;
                 }
-                
+
                 if ( objectClasses.contains( SUBENTRY_OBJECTCLASS_OID ) )
                 {
                     return true;
                 }
-                
+
                 for ( int ii = 0; ii < objectClasses.size(); ii++ )
                 {
                     String oc = ( String ) objectClasses.get( ii );
@@ -1344,16 +1347,16 @@
                         return true;
                     }
                 }
-                
+
                 return false;
             }
 
-            if ( ! result.isRelative() )
+            if ( !result.isRelative() )
             {
                 String normalizedDn = dnParser.parse( dn ).toString();
                 return subtrees.containsKey( normalizedDn );
             }
-            
+
             Name name = dnParser.parse( invocation.getCaller().getNameInNamespace() );
             name.addAll( dnParser.parse( result.getName() ) );
             return subtrees.containsKey( name.toString() );

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id



Mime
View raw message