directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r376623 [19/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/SystemSyntaxProducer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.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/SystemSyntaxProducer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java Fri Feb 10 02:48:07 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 );
     }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Fri Feb 10 02:48:07 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() );
         }
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Fri Feb 10 02:48:07 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();

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Fri Feb 10 02:48:07 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() );

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java Fri Feb 10 02:48:07 2006
@@ -47,7 +47,7 @@
      *
      * @param registry a registry used to lookup objectClass names for OIDs
      */
-    public SubtreeEvaluator( OidRegistry registry )
+    public SubtreeEvaluator(OidRegistry registry)
     {
         RefinementLeafEvaluator leafEvaluator = new RefinementLeafEvaluator( registry );
         evaluator = new RefinementEvaluator( leafEvaluator );
@@ -65,26 +65,26 @@
      * @throws javax.naming.NamingException if errors are encountered while evaluating selection
      */
     public boolean evaluate( SubtreeSpecification subtree, Name apDn, Name entryDn, Attribute objectClasses )
-            throws NamingException
+        throws NamingException
     {
-       /* =====================================================================
-        * NOTE: Regarding the overall approach, we try to narrow down the
-        * possibilities by slowly pruning relative names off of the entryDn.
-        * For example we check first if the entry is a descendant of the AP.
-        * If so we use the relative name thereafter to calculate if it is
-        * a descendant of the base.  This means shorter names to compare and
-        * less work to do while we continue to deduce inclusion by the subtree
-        * specification.
-        * =====================================================================
-        */
-
-       /*
-        * First we simply check if the candidate entry is a descendant of the
-        * administrative point.  In the process we calculate the relative
-        * distinguished name relative to the administrative point.
-        */
+        /* =====================================================================
+         * NOTE: Regarding the overall approach, we try to narrow down the
+         * possibilities by slowly pruning relative names off of the entryDn.
+         * For example we check first if the entry is a descendant of the AP.
+         * If so we use the relative name thereafter to calculate if it is
+         * a descendant of the base.  This means shorter names to compare and
+         * less work to do while we continue to deduce inclusion by the subtree
+         * specification.
+         * =====================================================================
+         */
+
+        /*
+         * First we simply check if the candidate entry is a descendant of the
+         * administrative point.  In the process we calculate the relative
+         * distinguished name relative to the administrative point.
+         */
         Name apRelativeRdn;
-        if ( ! NamespaceTools.isDescendant( apDn, entryDn ) )
+        if ( !NamespaceTools.isDescendant( apDn, entryDn ) )
         {
             return false;
         }
@@ -97,12 +97,12 @@
             apRelativeRdn = NamespaceTools.getRelativeName( apDn, entryDn );
         }
 
-       /*
-        * We do the same thing with the base as we did with the administrative
-        * point: check if the entry is a descendant of the base and find the
-        * relative name of the entry with respect to the base rdn.  With the
-        * baseRelativeRdn we can later make comparisons with specific exclusions.
-        */
+        /*
+         * We do the same thing with the base as we did with the administrative
+         * point: check if the entry is a descendant of the base and find the
+         * relative name of the entry with respect to the base rdn.  With the
+         * baseRelativeRdn we can later make comparisons with specific exclusions.
+         */
         Name baseRelativeRdn;
         if ( subtree.getBase() != null && subtree.getBase().size() == 0 )
         {
@@ -112,7 +112,7 @@
         {
             baseRelativeRdn = new LdapName();
         }
-        else if ( ! NamespaceTools.isDescendant( subtree.getBase(), apRelativeRdn ) )
+        else if ( !NamespaceTools.isDescendant( subtree.getBase(), apRelativeRdn ) )
         {
             return false;
         }
@@ -166,7 +166,7 @@
         while ( list.hasNext() )
         {
             Name chopAfter = ( Name ) list.next();
-            if ( NamespaceTools.isDescendant( chopAfter, baseRelativeRdn ) && ! chopAfter.equals( baseRelativeRdn ) )
+            if ( NamespaceTools.isDescendant( chopAfter, baseRelativeRdn ) && !chopAfter.equals( baseRelativeRdn ) )
             {
                 return false;
             }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java Fri Feb 10 02:48:07 2006
@@ -17,12 +17,14 @@
 
 package org.apache.directory.server.core.authn;
 
+
 import java.security.NoSuchAlgorithmException;
 
 import org.apache.directory.server.core.authn.SimpleAuthenticator;
 
 import junit.framework.TestCase;
 
+
 /**
  * Test case for helper methods within SimpleAuthenticator.
  * 
@@ -32,33 +34,36 @@
 {
     private SimpleAuthenticator auth = null;
 
+
     protected void setUp() throws Exception
     {
         super.setUp();
         this.auth = new SimpleAuthenticator();
     }
 
+
     public void testGetAlgorithmForHashedPassword()
     {
         String digestetValue = "{SHA}LhkDrSoM6qr0fW6hzlfOJQW61tc=";
-        assertEquals("SHA", auth.getAlgorithmForHashedPassword(digestetValue));
-        assertEquals("SHA", auth.getAlgorithmForHashedPassword(digestetValue.getBytes()));
+        assertEquals( "SHA", auth.getAlgorithmForHashedPassword( digestetValue ) );
+        assertEquals( "SHA", auth.getAlgorithmForHashedPassword( digestetValue.getBytes() ) );
 
         String noAlgorithm = "Secret1!";
-        assertEquals(null, auth.getAlgorithmForHashedPassword(noAlgorithm));
-        assertEquals(null, auth.getAlgorithmForHashedPassword(noAlgorithm.getBytes()));
+        assertEquals( null, auth.getAlgorithmForHashedPassword( noAlgorithm ) );
+        assertEquals( null, auth.getAlgorithmForHashedPassword( noAlgorithm.getBytes() ) );
 
         String unknownAlgorithm = "{XYZ}LhkDrSoM6qr0fW6hzlfOJQW61tc=";
-        assertEquals(null, auth.getAlgorithmForHashedPassword(unknownAlgorithm));
-        assertEquals(null, auth.getAlgorithmForHashedPassword(unknownAlgorithm.getBytes()));
+        assertEquals( null, auth.getAlgorithmForHashedPassword( unknownAlgorithm ) );
+        assertEquals( null, auth.getAlgorithmForHashedPassword( unknownAlgorithm.getBytes() ) );
     }
 
+
     public void testCreateDigestedPassword() throws NoSuchAlgorithmException
     {
         String pwd = "Secret1!";
         String expected = "{SHA}znbJr3+tymFoQD4+Njh4ITtI7Cc=";
-        String digested = auth.createDigestedPassword("SHA", pwd);
+        String digested = auth.createDigestedPassword( "SHA", pwd );
 
-        assertEquals(expected, digested);
+        assertEquals( expected, digested );
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Fri Feb 10 02:48:07 2006
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.core.authz.support;
 
+
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -30,6 +31,7 @@
 import org.apache.directory.shared.ldap.schema.Syntax;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 
+
 /**
  * A mock {@link AttributeTypeRegistry} to test {@link ACITupleFilter} implementations.
  *
@@ -41,18 +43,21 @@
 {
     private final boolean returnOperational;
 
-    public DummyAttributeTypeRegistry( boolean returnOperational )
+
+    public DummyAttributeTypeRegistry(boolean returnOperational)
     {
         this.returnOperational = returnOperational;
     }
 
+
     public void register( String schema, AttributeType attributeType ) throws NamingException
     {
     }
 
+
     public AttributeType lookup( final String id ) throws NamingException
     {
-        if( returnOperational )
+        if ( returnOperational )
         {
             return new AttributeType()
             {
@@ -61,71 +66,86 @@
                     return false;
                 }
 
+
                 public boolean isCanUserModify()
                 {
                     return false;
                 }
 
+
                 public boolean isCollective()
                 {
                     return false;
                 }
 
+
                 public UsageEnum getUsage()
                 {
                     return null;
                 }
 
+
                 public AttributeType getSuperior() throws NamingException
                 {
                     return null;
                 }
 
+
                 public Syntax getSyntax() throws NamingException
                 {
                     return null;
                 }
 
+
                 public int getLength()
                 {
                     return 0;
                 }
 
+
                 public MatchingRule getEquality() throws NamingException
                 {
                     return null;
                 }
 
+
                 public MatchingRule getOrdering() throws NamingException
                 {
                     return null;
                 }
 
+
                 public MatchingRule getSubstr() throws NamingException
                 {
                     return null;
                 }
 
+
                 public boolean isObsolete()
                 {
                     return false;
                 }
 
+
                 public String getOid()
                 {
                     return String.valueOf( id.hashCode() );
                 }
 
+
                 public String[] getNames()
                 {
-                    return new String[] { id };
+                    return new String[]
+                        { id };
                 }
 
+
                 public String getName()
                 {
                     return id;
                 }
 
+
                 public String getDescription()
                 {
                     return id;
@@ -141,71 +161,86 @@
                     return false;
                 }
 
+
                 public boolean isCanUserModify()
                 {
                     return true;
                 }
 
+
                 public boolean isCollective()
                 {
                     return false;
                 }
 
+
                 public UsageEnum getUsage()
                 {
                     return null;
                 }
 
+
                 public AttributeType getSuperior() throws NamingException
                 {
                     return null;
                 }
 
+
                 public Syntax getSyntax() throws NamingException
                 {
                     return null;
                 }
 
+
                 public int getLength()
                 {
                     return 0;
                 }
 
+
                 public MatchingRule getEquality() throws NamingException
                 {
                     return null;
                 }
 
+
                 public MatchingRule getOrdering() throws NamingException
                 {
                     return null;
                 }
 
+
                 public MatchingRule getSubstr() throws NamingException
                 {
                     return null;
                 }
 
+
                 public boolean isObsolete()
                 {
                     return false;
                 }
 
+
                 public String getOid()
                 {
                     return String.valueOf( id.hashCode() );
                 }
 
+
                 public String[] getNames()
                 {
-                    return new String[] { id };
+                    return new String[]
+                        { id };
                 }
 
+
                 public String getName()
                 {
                     return id;
                 }
 
+
                 public String getDescription()
                 {
                     return id;
@@ -214,15 +249,18 @@
         }
     }
 
+
     public String getSchemaName( String id ) throws NamingException
     {
         return "dummy";
     }
 
+
     public boolean hasAttributeType( String id )
     {
         return true;
     }
+
 
     public Iterator list()
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java Fri Feb 10 02:48:07 2006
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.core.authz.support;
 
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -28,6 +29,7 @@
 import org.apache.directory.server.core.authz.support.ACITupleFilter;
 import org.apache.directory.server.core.schema.OidRegistry;
 
+
 /**
  * A mock {@link OidRegistry} to test {@link ACITupleFilter} implementations.
  *
@@ -42,16 +44,19 @@
         return String.valueOf( name.hashCode() );
     }
 
+
     public boolean hasOid( String id )
     {
         return true;
     }
 
+
     public String getPrimaryName( String oid ) throws NamingException
     {
         return oid;
     }
 
+
     public List getNameSet( String oid ) throws NamingException
     {
         List list = new ArrayList();
@@ -59,33 +64,37 @@
         return list;
     }
 
+
     public Iterator list()
     {
         // Not used
         return new ArrayList().iterator();
     }
 
+
     public void register( String name, String oid )
     {
         // Not used
     }
 
+
     /**
      * Get the map of all the oids by their name
      * @return The Map that contains all the oids
      */
     public Map getOidByName()
     {
-    	return null;
+        return null;
     }
 
+
     /**
      * Get the map of all the oids by their name
      * @return The Map that contains all the oids
      */
     public Map getNameByOid()
     {
-    	return null;
+        return null;
     }
-    
+
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java Fri Feb 10 02:48:07 2006
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.core.authz.support;
 
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -32,6 +33,7 @@
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 
+
 /**
  * Tests {@link HighestPrecedenceFilter}.
  *
@@ -41,57 +43,46 @@
  */
 public class HighestPrecedenceFilterTest extends TestCase
 {
-    private static final Collection EMPTY_COLLECTION =
-        Collections.unmodifiableCollection( new ArrayList() );
-    private static final Set EMPTY_SET =
-        Collections.unmodifiableSet( new HashSet() );
+    private static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList() );
+    private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
+
 
     public void testZeroTuple() throws Exception
     {
         HighestPrecedenceFilter filter = new HighestPrecedenceFilter();
-        Assert.assertEquals(
-                0, filter.filter(
-                        EMPTY_COLLECTION, null, null, null, null, null, null,
-                        null, null, null, null, null ).size() );
+        Assert.assertEquals( 0, filter.filter( EMPTY_COLLECTION, null, null, null, null, null, null, null, null, null,
+            null, null ).size() );
     }
 
+
     public void testOneTuple() throws Exception
     {
         HighestPrecedenceFilter filter = new HighestPrecedenceFilter();
         Collection tuples = new ArrayList();
-        tuples.add( new ACITuple(
-                EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION,
-                EMPTY_SET, true, 10 ) );
+        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 10 ) );
         tuples = Collections.unmodifiableCollection( tuples );
-        Assert.assertEquals(
-                tuples, filter.filter(
-                        tuples, null, null, null, null, null, null,
-                        null, null, null, null, null ) );
+        Assert.assertEquals( tuples, filter.filter( tuples, null, null, null, null, null, null, null, null, null, null,
+            null ) );
     }
-    
+
+
     public void testMoreThanOneTuples() throws Exception
     {
         final int MAX_PRECEDENCE = 10;
         HighestPrecedenceFilter filter = new HighestPrecedenceFilter();
         Collection tuples = new ArrayList();
-        tuples.add( new ACITuple(
-                EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION,
-                EMPTY_SET, true, MAX_PRECEDENCE ) );
-        tuples.add( new ACITuple(
-                EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION,
-                EMPTY_SET, true, MAX_PRECEDENCE / 2 ) );
-        tuples.add( new ACITuple(
-                EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION,
-                EMPTY_SET, true, MAX_PRECEDENCE ) );
-        tuples.add( new ACITuple(
-                EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION,
-                EMPTY_SET, true, MAX_PRECEDENCE / 3 ) );
-
-        tuples = filter.filter(
-                        tuples, null, null, null, null, null, null,
-                        null, null, null, null, null );
-        
-        for( Iterator i = tuples.iterator(); i.hasNext(); )
+        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true,
+            MAX_PRECEDENCE ) );
+        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true,
+            MAX_PRECEDENCE / 2 ) );
+        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true,
+            MAX_PRECEDENCE ) );
+        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true,
+            MAX_PRECEDENCE / 3 ) );
+
+        tuples = filter.filter( tuples, null, null, null, null, null, null, null, null, null, null, null );
+
+        for ( Iterator i = tuples.iterator(); i.hasNext(); )
         {
             ACITuple tuple = ( ACITuple ) i.next();
             Assert.assertEquals( MAX_PRECEDENCE, tuple.getPrecedence() );

Modified: directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Fri Feb 10 02:48:07 2006
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.core.authz.support;
 
+
 import java.util.*;
 
 import javax.naming.Name;
@@ -53,24 +54,21 @@
  */
 public class MaxImmSubFilterTest extends TestCase
 {
-    private static final Collection EMPTY_COLLECTION =
-        Collections.unmodifiableCollection( new ArrayList() );
-    private static final Set EMPTY_SET =
-        Collections.unmodifiableSet( new HashSet() );
+    private static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList() );
+    private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
 
     private static final Name ROOTDSE_NAME = new LdapName();
     private static final Name ENTRY_NAME;
     private static final Collection PROTECTED_ITEMS = new ArrayList();
     private static final Attributes ENTRY = new BasicAttributes();
 
-
     static
     {
         try
         {
             ENTRY_NAME = new LdapName( "ou=test, ou=system" );
         }
-        catch( NamingException e )
+        catch ( NamingException e )
         {
             throw new Error();
         }
@@ -78,68 +76,56 @@
         PROTECTED_ITEMS.add( new ProtectedItem.MaxImmSub( 2 ) );
     }
 
+
     public void testWrongScope() throws Exception
     {
         MaxImmSubFilter filter = new MaxImmSubFilter();
         Collection tuples = new ArrayList();
-        tuples.add( new ACITuple(
-                EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION,
-                EMPTY_SET, true, 0 ) );
+        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 0 ) );
 
         tuples = Collections.unmodifiableCollection( tuples );
 
-        Assert.assertEquals(
-                tuples, filter.filter(
-                        tuples, OperationScope.ATTRIBUTE_TYPE, null, null, null,
-                        null, null, ENTRY_NAME, null, null, ENTRY, null ) );
-
-        Assert.assertEquals(
-                tuples, filter.filter(
-                        tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null,
-                        null, null, null, null, ENTRY_NAME, null, null, ENTRY, null ) );
+        Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, null, null,
+            null, ENTRY_NAME, null, null, ENTRY, null ) );
+
+        Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null,
+            null, null, ENTRY_NAME, null, null, ENTRY, null ) );
     }
 
+
     public void testRootDSE() throws Exception
     {
         MaxImmSubFilter filter = new MaxImmSubFilter();
 
         Collection tuples = new ArrayList();
-        tuples.add( new ACITuple(
-                EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION,
-                EMPTY_SET, true, 0 ) );
+        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, true, 0 ) );
 
         tuples = Collections.unmodifiableCollection( tuples );
 
-        Assert.assertEquals(
-                tuples, filter.filter(
-                        tuples, OperationScope.ENTRY,
-                        null, null, null, null, null, ROOTDSE_NAME, null, null, ENTRY, null ) );
+        Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null,
+            ROOTDSE_NAME, null, null, ENTRY, null ) );
     }
 
+
     public void testZeroTuple() throws Exception
     {
         MaxImmSubFilter filter = new MaxImmSubFilter();
 
-        Assert.assertEquals(
-                0, filter.filter(
-                        EMPTY_COLLECTION, OperationScope.ENTRY,
-                        null, null, null, null, null, ENTRY_NAME, null, null, ENTRY, null ).size() );
+        Assert.assertEquals( 0, filter.filter( EMPTY_COLLECTION, OperationScope.ENTRY, null, null, null, null, null,
+            ENTRY_NAME, null, null, ENTRY, null ).size() );
     }
 
+
     public void testDenialTuple() throws Exception
     {
         MaxImmSubFilter filter = new MaxImmSubFilter();
         Collection tuples = new ArrayList();
-        tuples.add( new ACITuple(
-                EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS,
-                EMPTY_SET, false, 0 ) );
+        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS, EMPTY_SET, false, 0 ) );
 
         tuples = Collections.unmodifiableCollection( tuples );
 
-        Assert.assertEquals(
-                tuples, filter.filter(
-                        tuples, OperationScope.ENTRY, null, null, null,
-                        null, null, ENTRY_NAME, null, null, ENTRY, null ) );
+        Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null,
+            ENTRY_NAME, null, null, ENTRY, null ) );
     }
 
 
@@ -147,40 +133,36 @@
     {
         MaxImmSubFilter filter = new MaxImmSubFilter();
         Collection tuples = new ArrayList();
-        tuples.add( new ACITuple(
-                EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS,
-                EMPTY_SET, true, 0 ) );
-
-        Assert.assertEquals(
-                1, filter.filter(
-                        tuples, OperationScope.ENTRY, new MockProxy(1), null, null,
-                        null, null, ENTRY_NAME, null, null, ENTRY, null ).size() );
-
-        Assert.assertEquals(
-                0, filter.filter(
-                        tuples, OperationScope.ENTRY, new MockProxy(3), null, null,
-                        null, null, ENTRY_NAME, null, null, ENTRY, null ).size() );
-    }
+        tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS, EMPTY_SET, true, 0 ) );
+
+        Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, new MockProxy( 1 ), null, null, null,
+            null, ENTRY_NAME, null, null, ENTRY, null ).size() );
 
+        Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, new MockProxy( 3 ), null, null, null,
+            null, ENTRY_NAME, null, null, ENTRY, null ).size() );
+    }
 
     class MockProxy extends DirectoryPartitionNexusProxy
     {
         final int count;
 
-        public MockProxy( int count )
+
+        public MockProxy(int count)
         {
             super( new DeadContext(), new MockDirectoryService() );
             this.count = count;
         }
 
 
-        public NamingEnumeration search( Name base, Map env, ExprNode filter, SearchControls searchCtls ) throws NamingException
+        public NamingEnumeration search( Name base, Map env, ExprNode filter, SearchControls searchCtls )
+            throws NamingException
         {
             return new BogusEnumeration( count );
         }
 
 
-        public NamingEnumeration search( Name base, Map env, ExprNode filter, SearchControls searchCtls, Collection bypass ) throws NamingException
+        public NamingEnumeration search( Name base, Map env, ExprNode filter, SearchControls searchCtls,
+            Collection bypass ) throws NamingException
         {
             return new BogusEnumeration( count );
         }
@@ -214,30 +196,30 @@
 
         public DirectoryServiceConfiguration getConfiguration()
         {
-            return null;  //To change body of implemented methods use File | Settings | File Templates.
+            return null; //To change body of implemented methods use File | Settings | File Templates.
         }
 
 
         public Context getJndiContext( String baseName ) throws NamingException
         {
-            return null;  //To change body of implemented methods use File | Settings | File Templates.
+            return null; //To change body of implemented methods use File | Settings | File Templates.
         }
 
 
-        public Context getJndiContext( String principal, byte[] credential, String authentication, String baseName ) throws NamingException
+        public Context getJndiContext( String principal, byte[] credential, String authentication, String baseName )
+            throws NamingException
         {
-            return null;  //To change body of implemented methods use File | Settings | File Templates.
+            return null; //To change body of implemented methods use File | Settings | File Templates.
         }
     }
 
-
     class BogusEnumeration implements NamingEnumeration
     {
         final int count;
         int ii;
 
 
-        public BogusEnumeration( int count )
+        public BogusEnumeration(int count)
         {
             this.count = count;
         }



Mime
View raw message