directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [20/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/GlobalDitStructureRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitStructureRuleRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitStructureRuleRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitStructureRuleRegistry.java Sun Feb 19 19:57:02 2006
@@ -52,11 +52,10 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates an empty BootstrapDitStructureRuleRegistry.
      */
-    public GlobalDitStructureRuleRegistry( BootstrapDitStructureRuleRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalDitStructureRuleRegistry(BootstrapDitStructureRuleRegistry bootstrap, OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -66,7 +65,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -86,19 +85,18 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, DITStructureRule dITStructureRule ) throws NamingException
     {
-        if ( byOid.containsKey( dITStructureRule.getOid() ) ||
-             bootstrap.hasDITStructureRule( dITStructureRule.getOid() ) )
+        if ( byOid.containsKey( dITStructureRule.getOid() )
+            || bootstrap.hasDITStructureRule( dITStructureRule.getOid() ) )
         {
-            NamingException e = new NamingException( "dITStructureRule w/ OID " +
-                dITStructureRule.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "dITStructureRule w/ OID " + dITStructureRule.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( dITStructureRule, e );
             throw e;
         }
 
-        oidRegistry.register( dITStructureRule.getName(), dITStructureRule.getOid() ) ;
+        oidRegistry.register( dITStructureRule.getName(), dITStructureRule.getOid() );
         byOid.put( dITStructureRule.getOid(), dITStructureRule );
         oidToSchema.put( dITStructureRule.getOid(), schema );
         monitor.registered( dITStructureRule );
@@ -123,8 +121,7 @@
             return dITStructureRule;
         }
 
-        NamingException e = new NamingException( "dITStructureRule w/ OID "
-            + id + " not registered!" );
+        NamingException e = new NamingException( "dITStructureRule w/ OID " + id + " not registered!" );
         monitor.lookupFailed( id, e );
         throw e;
     }
@@ -136,8 +133,7 @@
         {
             try
             {
-                return byOid.containsKey( oidRegistry.getOid( id ) ) ||
-                       bootstrap.hasDITStructureRule( id );
+                return byOid.containsKey( oidRegistry.getOid( id ) ) || bootstrap.hasDITStructureRule( id );
             }
             catch ( NamingException e )
             {
@@ -163,14 +159,13 @@
             return bootstrap.getSchemaName( id );
         }
 
-        throw new NamingException( "OID " + id + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + id + " not found in oid to " + "schema name map!" );
     }
 
 
     public Iterator list()
     {
         return new JoinIterator( new Iterator[]
-            { byOid.values().iterator(),bootstrap.list() } );
+            { byOid.values().iterator(), bootstrap.list() } );
     }
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalDitStructureRuleRegistry.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/GlobalMatchingRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalMatchingRuleRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalMatchingRuleRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalMatchingRuleRegistry.java Sun Feb 19 19:57:02 2006
@@ -52,11 +52,10 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates an empty BootstrapMatchingRuleRegistry.
      */
-    public GlobalMatchingRuleRegistry( BootstrapMatchingRuleRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalMatchingRuleRegistry(BootstrapMatchingRuleRegistry bootstrap, OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -66,7 +65,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -86,19 +85,17 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, MatchingRule dITContentRule ) throws NamingException
     {
-        if ( byOid.containsKey( dITContentRule.getOid() ) ||
-             bootstrap.hasMatchingRule( dITContentRule.getOid() ) )
+        if ( byOid.containsKey( dITContentRule.getOid() ) || bootstrap.hasMatchingRule( dITContentRule.getOid() ) )
         {
-            NamingException e = new NamingException( "dITContentRule w/ OID " +
-                dITContentRule.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "dITContentRule w/ OID " + dITContentRule.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( dITContentRule, e );
             throw e;
         }
 
-        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
+        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() );
         byOid.put( dITContentRule.getOid(), dITContentRule );
         oidToSchema.put( dITContentRule.getOid(), schema );
         monitor.registered( dITContentRule );
@@ -123,8 +120,7 @@
             return dITContentRule;
         }
 
-        NamingException e = new NamingException( "dITContentRule w/ OID "
-            + id + " not registered!" );
+        NamingException e = new NamingException( "dITContentRule w/ OID " + id + " not registered!" );
         monitor.lookupFailed( id, e );
         throw e;
     }
@@ -136,8 +132,7 @@
         {
             try
             {
-                return byOid.containsKey( oidRegistry.getOid( id ) ) ||
-                       bootstrap.hasMatchingRule( id );
+                return byOid.containsKey( oidRegistry.getOid( id ) ) || bootstrap.hasMatchingRule( id );
             }
             catch ( NamingException e )
             {
@@ -163,14 +158,13 @@
             return bootstrap.getSchemaName( id );
         }
 
-        throw new NamingException( "OID " + id + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + id + " not found in oid to " + "schema name map!" );
     }
 
 
     public Iterator list()
     {
         return new JoinIterator( new Iterator[]
-            { byOid.values().iterator(),bootstrap.list() } );
+            { byOid.values().iterator(), bootstrap.list() } );
     }
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalMatchingRuleRegistry.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/GlobalMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalMatchingRuleUseRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalMatchingRuleUseRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalMatchingRuleUseRegistry.java Sun Feb 19 19:57:02 2006
@@ -52,11 +52,10 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates an empty BootstrapMatchingRuleUseRegistry.
      */
-    public GlobalMatchingRuleUseRegistry( BootstrapMatchingRuleUseRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalMatchingRuleUseRegistry(BootstrapMatchingRuleUseRegistry bootstrap, OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -66,7 +65,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -86,19 +85,17 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, MatchingRuleUse dITContentRule ) throws NamingException
     {
-        if ( byOid.containsKey( dITContentRule.getOid() ) ||
-             bootstrap.hasMatchingRuleUse( dITContentRule.getOid() ) )
+        if ( byOid.containsKey( dITContentRule.getOid() ) || bootstrap.hasMatchingRuleUse( dITContentRule.getOid() ) )
         {
-            NamingException e = new NamingException( "dITContentRule w/ OID " +
-                dITContentRule.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "dITContentRule w/ OID " + dITContentRule.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( dITContentRule, e );
             throw e;
         }
 
-        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
+        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() );
         byOid.put( dITContentRule.getOid(), dITContentRule );
         oidToSchema.put( dITContentRule.getOid(), schema );
         monitor.registered( dITContentRule );
@@ -123,8 +120,7 @@
             return dITContentRule;
         }
 
-        NamingException e = new NamingException( "dITContentRule w/ OID "
-            + id + " not registered!" );
+        NamingException e = new NamingException( "dITContentRule w/ OID " + id + " not registered!" );
         monitor.lookupFailed( id, e );
         throw e;
     }
@@ -136,8 +132,7 @@
         {
             try
             {
-                return byOid.containsKey( oidRegistry.getOid( id ) ) ||
-                       bootstrap.hasMatchingRuleUse( id );
+                return byOid.containsKey( oidRegistry.getOid( id ) ) || bootstrap.hasMatchingRuleUse( id );
             }
             catch ( NamingException e )
             {
@@ -163,14 +158,13 @@
             return bootstrap.getSchemaName( id );
         }
 
-        throw new NamingException( "OID " + id + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + id + " not found in oid to " + "schema name map!" );
     }
 
 
     public Iterator list()
     {
         return new JoinIterator( new Iterator[]
-            { byOid.values().iterator(),bootstrap.list() } );
+            { byOid.values().iterator(), bootstrap.list() } );
     }
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalMatchingRuleUseRegistry.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/GlobalNameFormRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalNameFormRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalNameFormRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalNameFormRegistry.java Sun Feb 19 19:57:02 2006
@@ -52,11 +52,10 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates an empty BootstrapNameFormRegistry.
      */
-    public GlobalNameFormRegistry( BootstrapNameFormRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalNameFormRegistry(BootstrapNameFormRegistry bootstrap, OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -66,7 +65,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -86,19 +85,17 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, NameForm dITContentRule ) throws NamingException
     {
-        if ( byOid.containsKey( dITContentRule.getOid() ) ||
-             bootstrap.hasNameForm( dITContentRule.getOid() ) )
+        if ( byOid.containsKey( dITContentRule.getOid() ) || bootstrap.hasNameForm( dITContentRule.getOid() ) )
         {
-            NamingException e = new NamingException( "dITContentRule w/ OID " +
-                dITContentRule.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "dITContentRule w/ OID " + dITContentRule.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( dITContentRule, e );
             throw e;
         }
 
-        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
+        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() );
         byOid.put( dITContentRule.getOid(), dITContentRule );
         oidToSchema.put( dITContentRule.getOid(), schema );
         monitor.registered( dITContentRule );
@@ -123,8 +120,7 @@
             return dITContentRule;
         }
 
-        NamingException e = new NamingException( "dITContentRule w/ OID "
-            + id + " not registered!" );
+        NamingException e = new NamingException( "dITContentRule w/ OID " + id + " not registered!" );
         monitor.lookupFailed( id, e );
         throw e;
     }
@@ -136,8 +132,7 @@
         {
             try
             {
-                return byOid.containsKey( oidRegistry.getOid( id ) ) ||
-                       bootstrap.hasNameForm( id );
+                return byOid.containsKey( oidRegistry.getOid( id ) ) || bootstrap.hasNameForm( id );
             }
             catch ( NamingException e )
             {
@@ -163,14 +158,13 @@
             return bootstrap.getSchemaName( id );
         }
 
-        throw new NamingException( "OID " + id + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + id + " not found in oid to " + "schema name map!" );
     }
 
 
     public Iterator list()
     {
         return new JoinIterator( new Iterator[]
-            { byOid.values().iterator(),bootstrap.list() } );
+            { byOid.values().iterator(), bootstrap.list() } );
     }
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalNameFormRegistry.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/GlobalNormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalNormalizerRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalNormalizerRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalNormalizerRegistry.java Sun Feb 19 19:57:02 2006
@@ -48,12 +48,11 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates a default NormalizerRegistry by initializing the map and the
      * montior.
      */
-    public GlobalNormalizerRegistry( BootstrapNormalizerRegistry bootstrap )
+    public GlobalNormalizerRegistry(BootstrapNormalizerRegistry bootstrap)
     {
         this.oidToSchema = new HashMap();
         this.normalizers = new HashMap();
@@ -62,7 +61,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -82,14 +81,11 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
-    public void register( String schema, String oid, Normalizer normalizer )
-            throws NamingException
+    public void register( String schema, String oid, Normalizer normalizer ) throws NamingException
     {
         if ( normalizers.containsKey( oid ) || bootstrap.hasNormalizer( oid ) )
         {
-            NamingException e = new NamingException( "Normalizer with OID "
-                + oid + " already registered!" );
+            NamingException e = new NamingException( "Normalizer with OID " + oid + " already registered!" );
             monitor.registerFailed( oid, normalizer, e );
             throw e;
         }
@@ -133,11 +129,11 @@
 
     public String getSchemaName( String oid ) throws NamingException
     {
-        if ( ! Character.isDigit( oid.charAt( 0 ) ) )
+        if ( !Character.isDigit( oid.charAt( 0 ) ) )
         {
             throw new NamingException( "OID " + oid + " is not a numeric OID" );
         }
-        
+
         if ( oidToSchema.containsKey( oid ) )
         {
             return ( String ) oidToSchema.get( oid );
@@ -148,7 +144,6 @@
             return bootstrap.getSchemaName( oid );
         }
 
-        throw new NamingException( "OID " + oid + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + oid + " not found in oid to " + "schema name map!" );
     }
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalNormalizerRegistry.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/GlobalObjectClassRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalObjectClassRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalObjectClassRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalObjectClassRegistry.java Sun Feb 19 19:57:02 2006
@@ -52,11 +52,10 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates an empty BootstrapObjectClassRegistry.
      */
-    public GlobalObjectClassRegistry( BootstrapObjectClassRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalObjectClassRegistry(BootstrapObjectClassRegistry bootstrap, OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -66,7 +65,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -86,19 +85,17 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, ObjectClass dITContentRule ) throws NamingException
     {
-        if ( byOid.containsKey( dITContentRule.getOid() ) ||
-             bootstrap.hasObjectClass( dITContentRule.getOid() ) )
+        if ( byOid.containsKey( dITContentRule.getOid() ) || bootstrap.hasObjectClass( dITContentRule.getOid() ) )
         {
-            NamingException e = new NamingException( "dITContentRule w/ OID " +
-                dITContentRule.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "dITContentRule w/ OID " + dITContentRule.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( dITContentRule, e );
             throw e;
         }
 
-        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
+        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() );
         byOid.put( dITContentRule.getOid(), dITContentRule );
         oidToSchema.put( dITContentRule.getOid(), schema );
         monitor.registered( dITContentRule );
@@ -123,8 +120,7 @@
             return dITContentRule;
         }
 
-        NamingException e = new NamingException( "dITContentRule w/ OID "
-            + id + " not registered!" );
+        NamingException e = new NamingException( "dITContentRule w/ OID " + id + " not registered!" );
         monitor.lookupFailed( id, e );
         throw e;
     }
@@ -136,8 +132,7 @@
         {
             try
             {
-                return byOid.containsKey( oidRegistry.getOid( id ) ) ||
-                       bootstrap.hasObjectClass( id );
+                return byOid.containsKey( oidRegistry.getOid( id ) ) || bootstrap.hasObjectClass( id );
             }
             catch ( NamingException e )
             {
@@ -163,8 +158,7 @@
             return bootstrap.getSchemaName( id );
         }
 
-        throw new NamingException( "OID " + id + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + id + " not found in oid to " + "schema name map!" );
     }
 
 

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalObjectClassRegistry.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/GlobalOidRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalOidRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalOidRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalOidRegistry.java Sun Feb 19 19:57:02 2006
@@ -37,7 +37,7 @@
  * @version $Rev$
  */
 public class GlobalOidRegistry implements OidRegistry
-{ 
+{
     /** Maps OID to a name or a list of names if more than one name exists */
     private Hashtable byOid = new Hashtable();
 
@@ -55,23 +55,20 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates a default OidRegistry by initializing the map and the montior.
      */
-    public GlobalOidRegistry( BootstrapOidRegistry bootstrap )
+    public GlobalOidRegistry(BootstrapOidRegistry bootstrap)
     {
         this.bootstrap = bootstrap;
 
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
 
-
-
     /**
      * Gets the monitor.
      *
@@ -98,7 +95,6 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see OidRegistry#getOid(String)
      */
@@ -143,37 +139,37 @@
          * returned on a getNameSet.
          */
         String lowerCase = name.trim().toLowerCase();
-        if ( ! name.equals( lowerCase ) )
-		{
-			if ( byName.containsKey( lowerCase ) )
-	        {
-	            String oid = ( String ) byName.get( lowerCase );
-	            monitor.oidResolved( name, lowerCase, oid );
+        if ( !name.equals( lowerCase ) )
+        {
+            if ( byName.containsKey( lowerCase ) )
+            {
+                String oid = ( String ) byName.get( lowerCase );
+                monitor.oidResolved( name, lowerCase, oid );
 
-	            // We expect to see this version of the key again so we add it
-	            byName.put( name, oid );
+                // We expect to see this version of the key again so we add it
+                byName.put( name, oid );
                 return oid;
-	        }
-			
-			/*
-			 * Some LDAP servers (MS Active Directory) tend to use some of the
-			 * bootstrap oid names as all caps, like OU. This should resolve that.
-			 * Lets stash this in the byName if we find it.
-			 */
-			
-			if ( bootstrap.hasOid( lowerCase) )
-			{
-	            String oid = bootstrap.getOid( name );
+            }
+
+            /*
+             * Some LDAP servers (MS Active Directory) tend to use some of the
+             * bootstrap oid names as all caps, like OU. This should resolve that.
+             * Lets stash this in the byName if we find it.
+             */
+
+            if ( bootstrap.hasOid( lowerCase ) )
+            {
+                String oid = bootstrap.getOid( name );
                 monitor.oidResolved( name, oid );
 
-	            // We expect to see this version of the key again so we add it
+                // We expect to see this version of the key again so we add it
                 byName.put( name, oid );
                 return oid;
-			}
-		}
+            }
+        }
 
         String msg = "OID for name '" + name + "' was not " + "found within the OID registry";
-        NamingException fault = new NamingException ( msg );
+        NamingException fault = new NamingException( msg );
         monitor.oidResolutionFailed( name, fault );
         throw fault;
     }
@@ -197,35 +193,35 @@
         }
 
         /*
-        * As a last resort we check if name is not normalized and if the
-        * normalized version used as a key returns an OID.  If the normalized
-        * name works add the normalized name as a key with its OID to the
-        * byName lookup.  BTW these normalized versions of the key are not
-        * returned on a getNameSet.
-        */
+         * As a last resort we check if name is not normalized and if the
+         * normalized version used as a key returns an OID.  If the normalized
+         * name works add the normalized name as a key with its OID to the
+         * byName lookup.  BTW these normalized versions of the key are not
+         * returned on a getNameSet.
+         */
         String lowerCase = name.trim().toLowerCase();
-        if ( ! name.equals( lowerCase ) )
-		{
-			if ( byName.containsKey( lowerCase ) )
-	        {
-	            String oid = ( String ) byName.get( lowerCase );
-	            monitor.oidResolved( name, lowerCase, oid );
+        if ( !name.equals( lowerCase ) )
+        {
+            if ( byName.containsKey( lowerCase ) )
+            {
+                String oid = ( String ) byName.get( lowerCase );
+                monitor.oidResolved( name, lowerCase, oid );
 
-	            // We expect to see this version of the key again so we add it
-	            byName.put( name, oid );
+                // We expect to see this version of the key again so we add it
+                byName.put( name, oid );
                 return true;
-	        }
+            }
 
-			/*
-			 * Some LDAP servers (MS Active Directory) tend to use some of the
-			 * bootstrap oid names as all caps, like OU. This should resolve that.
-			 * Lets stash this in the byName if we find it.
-			 */
-			if ( bootstrap.hasOid( lowerCase) )
-			{
+            /*
+             * Some LDAP servers (MS Active Directory) tend to use some of the
+             * bootstrap oid names as all caps, like OU. This should resolve that.
+             * Lets stash this in the byName if we find it.
+             */
+            if ( bootstrap.hasOid( lowerCase ) )
+            {
                 return true;
-			}
-		}
+            }
+        }
 
         return false;
     }
@@ -237,25 +233,25 @@
     public String getPrimaryName( String oid ) throws NamingException
     {
         Object value = byOid.get( oid );
-        
+
         if ( null == value )
         {
             String msg = "OID '" + oid + "' was not found within the OID registry";
 
-            NamingException fault = new NamingException ( msg );
+            NamingException fault = new NamingException( msg );
 
             monitor.oidDoesNotExist( oid, fault );
 
             throw fault;
         }
-        
+
         if ( value instanceof String )
         {
             monitor.nameResolved( oid, ( String ) value );
 
             return ( String ) value;
         }
-        
+
         String name = ( String ) ( ( List ) value ).get( 0 );
 
         monitor.nameResolved( oid, name );
@@ -270,7 +266,7 @@
     public List getNameSet( String oid ) throws NamingException
     {
         Object value = this.byOid.get( oid );
-        
+
         if ( null == value )
         {
             value = this.bootstrap.getNameSet( oid );
@@ -280,13 +276,13 @@
         {
             String msg = "OID '" + oid + "' was not found within the OID registry";
 
-            NamingException fault = new NamingException ( msg );
+            NamingException fault = new NamingException( msg );
 
             monitor.oidDoesNotExist( oid, fault );
 
             throw fault;
         }
-        
+
         if ( value instanceof String )
         {
             List list = Collections.singletonList( value );
@@ -295,7 +291,7 @@
 
             return list;
         }
-        
+
         monitor.namesResolved( oid, ( List ) value );
 
         return ( List ) value;
@@ -316,10 +312,9 @@
      */
     public void register( String name, String oid )
     {
-        if ( ! Character.isDigit( oid.charAt( 0 ) ) )
+        if ( !Character.isDigit( oid.charAt( 0 ) ) )
         {
-            throw new RuntimeException( "Swap the parameter order: the oid " +
-                "does not start with a digit!" );
+            throw new RuntimeException( "Swap the parameter order: the oid " + "does not start with a digit!" );
         }
 
         /*
@@ -328,16 +323,16 @@
          */
         String lowerCase = name.toLowerCase();
 
-        if ( ! lowerCase.equals( name ) )
+        if ( !lowerCase.equals( name ) )
         {
             byName.put( lowerCase, oid );
         }
-        
+
         // Put both the name and the oid as names
         byName.put( name, oid );
 
         byName.put( oid, oid );
-        
+
         /*
          * Update OID Map
          * 
@@ -350,26 +345,26 @@
          */
         Object value = null;
 
-        if ( ! byOid.containsKey( oid ) )
+        if ( !byOid.containsKey( oid ) )
         {
             value = name;
         }
-        else 
+        else
         {
             ArrayList list = null;
 
             value = byOid.get( oid );
-            
+
             if ( value instanceof String )
             {
                 String existingName = ( String ) value;
-                
+
                 // if the existing name is already there we don't readd it
                 if ( existingName.equalsIgnoreCase( name ) )
                 {
                     return;
                 }
-                
+
                 list = new ArrayList();
 
                 list.add( value );
@@ -380,16 +375,16 @@
             else if ( value instanceof ArrayList )
             {
                 list = ( ArrayList ) value;
-                
+
                 for ( int ii = 0; ii < list.size(); ii++ )
                 {
                     // One form or another of the name already exists in list
-                    if ( ! name.equalsIgnoreCase( ( String ) list.get( ii ) ) )
+                    if ( !name.equalsIgnoreCase( ( String ) list.get( ii ) ) )
                     {
                         return;
                     }
                 }
-                
+
                 list.add( name );
             }
         }
@@ -399,22 +394,23 @@
         monitor.registered( name, oid );
     }
 
+
     /**
      * Get the map of all the oids by their name
      * @return The Map that contains all the oids
      */
     public Map getOidByName()
     {
-    	return byName;
+        return byName;
     }
 
+
     /**
      * Get the map of all the oids by their name
      * @return The Map that contains all the oids
      */
     public Map getNameByOid()
     {
-    	return byOid;
+        return byOid;
     }
 }
-

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalOidRegistry.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/GlobalRegistries.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalRegistries.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalRegistries.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalRegistries.java Sun Feb 19 19:57:02 2006
@@ -64,40 +64,31 @@
     private GlobalSyntaxRegistry syntaxRegistry;
 
 
-    public GlobalRegistries( BootstrapRegistries bootstrapRegistries )
+    public GlobalRegistries(BootstrapRegistries bootstrapRegistries)
     {
-        oidRegistry = new GlobalOidRegistry(
-                ( BootstrapOidRegistry ) bootstrapRegistries.getOidRegistry() );
-        normalizerRegistry = new GlobalNormalizerRegistry(
-                ( BootstrapNormalizerRegistry ) bootstrapRegistries.getNormalizerRegistry());
-        comparatorRegistry = new GlobalComparatorRegistry(
-                ( BootstrapComparatorRegistry ) bootstrapRegistries.getComparatorRegistry());
-        syntaxCheckerRegistry = new GlobalSyntaxCheckerRegistry(
-                ( BootstrapSyntaxCheckerRegistry ) bootstrapRegistries.getSyntaxCheckerRegistry());
-        syntaxRegistry = new GlobalSyntaxRegistry(
-                ( BootstrapSyntaxRegistry ) bootstrapRegistries.getSyntaxRegistry(),
-                oidRegistry );
-        matchingRuleRegistry = new GlobalMatchingRuleRegistry(
-                ( BootstrapMatchingRuleRegistry ) bootstrapRegistries.getMatchingRuleRegistry(),
-                oidRegistry );
-        attributeTypeRegistry = new GlobalAttributeTypeRegistry(
-                ( BootstrapAttributeTypeRegistry ) bootstrapRegistries.getAttributeTypeRegistry(),
-                oidRegistry );
-        objectClassRegistry = new GlobalObjectClassRegistry(
-                ( BootstrapObjectClassRegistry ) bootstrapRegistries.getObjectClassRegistry(),
-                oidRegistry );
+        oidRegistry = new GlobalOidRegistry( ( BootstrapOidRegistry ) bootstrapRegistries.getOidRegistry() );
+        normalizerRegistry = new GlobalNormalizerRegistry( ( BootstrapNormalizerRegistry ) bootstrapRegistries
+            .getNormalizerRegistry() );
+        comparatorRegistry = new GlobalComparatorRegistry( ( BootstrapComparatorRegistry ) bootstrapRegistries
+            .getComparatorRegistry() );
+        syntaxCheckerRegistry = new GlobalSyntaxCheckerRegistry( ( BootstrapSyntaxCheckerRegistry ) bootstrapRegistries
+            .getSyntaxCheckerRegistry() );
+        syntaxRegistry = new GlobalSyntaxRegistry( ( BootstrapSyntaxRegistry ) bootstrapRegistries.getSyntaxRegistry(),
+            oidRegistry );
+        matchingRuleRegistry = new GlobalMatchingRuleRegistry( ( BootstrapMatchingRuleRegistry ) bootstrapRegistries
+            .getMatchingRuleRegistry(), oidRegistry );
+        attributeTypeRegistry = new GlobalAttributeTypeRegistry( ( BootstrapAttributeTypeRegistry ) bootstrapRegistries
+            .getAttributeTypeRegistry(), oidRegistry );
+        objectClassRegistry = new GlobalObjectClassRegistry( ( BootstrapObjectClassRegistry ) bootstrapRegistries
+            .getObjectClassRegistry(), oidRegistry );
         ditContentRuleRegistry = new GlobalDitContentRuleRegistry(
-                ( BootstrapDitContentRuleRegistry ) bootstrapRegistries.getDitContentRuleRegistry(),
-                oidRegistry );
+            ( BootstrapDitContentRuleRegistry ) bootstrapRegistries.getDitContentRuleRegistry(), oidRegistry );
         ditStructureRuleRegistry = new GlobalDitStructureRuleRegistry(
-                ( BootstrapDitStructureRuleRegistry ) bootstrapRegistries.getDitStructureRuleRegistry(),
-                oidRegistry );
+            ( BootstrapDitStructureRuleRegistry ) bootstrapRegistries.getDitStructureRuleRegistry(), oidRegistry );
         matchingRuleUseRegistry = new GlobalMatchingRuleUseRegistry(
-                ( BootstrapMatchingRuleUseRegistry ) bootstrapRegistries.getMatchingRuleUseRegistry(),
-                oidRegistry );
-        nameFormRegistry = new GlobalNameFormRegistry(
-                ( BootstrapNameFormRegistry ) bootstrapRegistries.getNameFormRegistry(),
-                oidRegistry );
+            ( BootstrapMatchingRuleUseRegistry ) bootstrapRegistries.getMatchingRuleUseRegistry(), oidRegistry );
+        nameFormRegistry = new GlobalNameFormRegistry( ( BootstrapNameFormRegistry ) bootstrapRegistries
+            .getNameFormRegistry(), oidRegistry );
     }
 
 
@@ -106,56 +97,67 @@
         return attributeTypeRegistry;
     }
 
+
     public ComparatorRegistry getComparatorRegistry()
     {
         return comparatorRegistry;
     }
 
+
     public DITContentRuleRegistry getDitContentRuleRegistry()
     {
         return ditContentRuleRegistry;
     }
 
+
     public DITStructureRuleRegistry getDitStructureRuleRegistry()
     {
         return ditStructureRuleRegistry;
     }
 
+
     public MatchingRuleRegistry getMatchingRuleRegistry()
     {
         return matchingRuleRegistry;
     }
 
+
     public MatchingRuleUseRegistry getMatchingRuleUseRegistry()
     {
         return matchingRuleUseRegistry;
     }
 
+
     public NameFormRegistry getNameFormRegistry()
     {
         return nameFormRegistry;
     }
 
+
     public NormalizerRegistry getNormalizerRegistry()
     {
         return normalizerRegistry;
     }
 
+
     public ObjectClassRegistry getObjectClassRegistry()
     {
         return objectClassRegistry;
     }
 
+
     public OidRegistry getOidRegistry()
     {
         return oidRegistry;
     }
 
+
     public SyntaxCheckerRegistry getSyntaxCheckerRegistry()
     {
         return syntaxCheckerRegistry;
     }
 
+
     public SyntaxRegistry getSyntaxRegistry()
     {
         return syntaxRegistry;
@@ -166,7 +168,6 @@
     // Code used to sanity check the resolution of entities in registries
     // ------------------------------------------------------------------------
 
-
     /**
      * Attempts to resolve the dependent schema objects of all entities that
      * refer to other objects within the registries.  Null references will be
@@ -251,9 +252,8 @@
             if ( mr.getComparator() == null )
             {
                 String schema = matchingRuleRegistry.getSchemaName( mr.getOid() );
-                errors.add( new NullPointerException( "matchingRule "
-                        + mr.getName() + " in schema " + schema + " with OID "
-                        + mr.getOid() + " has a null comparator" ) );
+                errors.add( new NullPointerException( "matchingRule " + mr.getName() + " in schema " + schema
+                    + " with OID " + mr.getOid() + " has a null comparator" ) );
                 isSuccess = false;
             }
         }
@@ -268,9 +268,8 @@
             if ( mr.getNormalizer() == null )
             {
                 String schema = matchingRuleRegistry.getSchemaName( mr.getOid() );
-                errors.add( new NullPointerException( "matchingRule "
-                        + mr.getName() + " in schema " + schema + " with OID "
-                        + mr.getOid() + " has a null normalizer" ) );
+                errors.add( new NullPointerException( "matchingRule " + mr.getName() + " in schema " + schema
+                    + " with OID " + mr.getOid() + " has a null normalizer" ) );
                 isSuccess = false;
             }
         }
@@ -287,9 +286,8 @@
             if ( mr.getSyntax() == null )
             {
                 String schema = matchingRuleRegistry.getSchemaName( mr.getOid() );
-                errors.add( new NullPointerException( "matchingRule "
-                        + mr.getName() + " in schema " + schema + " with OID " + mr.getOid()
-                        + " has a null Syntax" ) );
+                errors.add( new NullPointerException( "matchingRule " + mr.getName() + " in schema " + schema
+                    + " with OID " + mr.getOid() + " has a null Syntax" ) );
                 isSuccess = false;
             }
         }
@@ -375,9 +373,8 @@
             if ( at.getSyntax() == null )
             {
                 String schema = attributeTypeRegistry.getSchemaName( at.getOid() );
-                errors.add( new NullPointerException( "attributeType "
-                        + at.getName() + " in schema " + schema + " with OID "
-                        + at.getOid() + " has a null Syntax" ) );
+                errors.add( new NullPointerException( "attributeType " + at.getName() + " in schema " + schema
+                    + " with OID " + at.getOid() + " has a null Syntax" ) );
                 isSuccess = false;
             }
         }
@@ -391,22 +388,22 @@
         {
             // ----
         }
-//        try
-//        {
-//            String schema = attributeTypeRegistry.getSchemaName( at.getOid() );
-//            if ( ! hasMatchingRule && at.getSyntax().isHumanReadible() )
-//            {
-//                errors.add( new NullPointerException( "attributeType "
-//                        + at.getName() + " in schema " + schema + " with OID "
-//                        + at.getOid() + " has a no matchingRules defined" ) );
-//                isSuccess = false;
-//            }
-//        }
-//        catch ( NamingException e )
-//        {
-//            errors.add( e );
-//            isSuccess = false;
-//        }
+        //        try
+        //        {
+        //            String schema = attributeTypeRegistry.getSchemaName( at.getOid() );
+        //            if ( ! hasMatchingRule && at.getSyntax().isHumanReadible() )
+        //            {
+        //                errors.add( new NullPointerException( "attributeType "
+        //                        + at.getName() + " in schema " + schema + " with OID "
+        //                        + at.getOid() + " has a no matchingRules defined" ) );
+        //                isSuccess = false;
+        //            }
+        //        }
+        //        catch ( NamingException e )
+        //        {
+        //            errors.add( e );
+        //            isSuccess = false;
+        //        }
 
         return isSuccess;
     }
@@ -435,7 +432,7 @@
 
         for ( int ii = 0; ii < superiors.length; ii++ )
         {
-            isSuccess &= resolve( superiors[ii], errors ) ;
+            isSuccess &= resolve( superiors[ii], errors );
         }
 
         AttributeType[] mayList = new AttributeType[0];
@@ -452,10 +449,9 @@
 
         for ( int ii = 0; ii < mayList.length; ii++ )
         {
-            isSuccess &= resolve( mayList[ii], errors ) ;
+            isSuccess &= resolve( mayList[ii], errors );
         }
 
-
         AttributeType[] mustList = new AttributeType[0];
         try
         {
@@ -470,7 +466,7 @@
 
         for ( int ii = 0; ii < mustList.length; ii++ )
         {
-            isSuccess &= resolve( mustList[ii], errors ) ;
+            isSuccess &= resolve( mustList[ii], errors );
         }
 
         return isSuccess;

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalRegistries.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/GlobalSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalSyntaxCheckerRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalSyntaxCheckerRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalSyntaxCheckerRegistry.java Sun Feb 19 19:57:02 2006
@@ -48,12 +48,11 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates a default SyntaxCheckerRegistry by initializing the map and the
      * montior.
      */
-    public GlobalSyntaxCheckerRegistry( BootstrapSyntaxCheckerRegistry bootstrap )
+    public GlobalSyntaxCheckerRegistry(BootstrapSyntaxCheckerRegistry bootstrap)
     {
         this.oidToSchema = new HashMap();
         this.syntaxCheckers = new HashMap();
@@ -62,7 +61,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -82,14 +81,11 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
-    public void register( String schema, String oid, SyntaxChecker syntaxChecker )
-            throws NamingException
+    public void register( String schema, String oid, SyntaxChecker syntaxChecker ) throws NamingException
     {
         if ( syntaxCheckers.containsKey( oid ) || bootstrap.hasSyntaxChecker( oid ) )
         {
-            NamingException e = new NamingException( "SyntaxChecker with OID "
-                + oid + " already registered!" );
+            NamingException e = new NamingException( "SyntaxChecker with OID " + oid + " already registered!" );
             monitor.registerFailed( oid, syntaxChecker, e );
             throw e;
         }
@@ -133,11 +129,11 @@
 
     public String getSchemaName( String oid ) throws NamingException
     {
-        if ( ! Character.isDigit( oid.charAt( 0 ) ) )
+        if ( !Character.isDigit( oid.charAt( 0 ) ) )
         {
             throw new NamingException( "OID " + oid + " is not a numeric OID" );
         }
-        
+
         if ( oidToSchema.containsKey( oid ) )
         {
             return ( String ) oidToSchema.get( oid );
@@ -148,7 +144,6 @@
             return bootstrap.getSchemaName( oid );
         }
 
-        throw new NamingException( "OID " + oid + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + oid + " not found in oid to " + "schema name map!" );
     }
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalSyntaxCheckerRegistry.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/GlobalSyntaxRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalSyntaxRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalSyntaxRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalSyntaxRegistry.java Sun Feb 19 19:57:02 2006
@@ -52,11 +52,10 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates an empty BootstrapSyntaxRegistry.
      */
-    public GlobalSyntaxRegistry( BootstrapSyntaxRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalSyntaxRegistry(BootstrapSyntaxRegistry bootstrap, OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -66,7 +65,7 @@
         this.bootstrap = bootstrap;
         if ( this.bootstrap == null )
         {
-            throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
+            throw new NullPointerException( "the bootstrap registry cannot be null" );
         }
     }
 
@@ -86,19 +85,17 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, Syntax dITContentRule ) throws NamingException
     {
-        if ( byOid.containsKey( dITContentRule.getOid() ) ||
-             bootstrap.hasSyntax( dITContentRule.getOid() ) )
+        if ( byOid.containsKey( dITContentRule.getOid() ) || bootstrap.hasSyntax( dITContentRule.getOid() ) )
         {
-            NamingException e = new NamingException( "dITContentRule w/ OID " +
-                dITContentRule.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "dITContentRule w/ OID " + dITContentRule.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( dITContentRule, e );
             throw e;
         }
 
-        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
+        oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() );
         byOid.put( dITContentRule.getOid(), dITContentRule );
         oidToSchema.put( dITContentRule.getOid(), schema );
         monitor.registered( dITContentRule );
@@ -123,8 +120,7 @@
             return dITContentRule;
         }
 
-        NamingException e = new NamingException( "dITContentRule w/ OID "
-            + id + " not registered!" );
+        NamingException e = new NamingException( "dITContentRule w/ OID " + id + " not registered!" );
         monitor.lookupFailed( id, e );
         throw e;
     }
@@ -136,8 +132,7 @@
         {
             try
             {
-                return byOid.containsKey( oidRegistry.getOid( id ) ) ||
-                       bootstrap.hasSyntax( id );
+                return byOid.containsKey( oidRegistry.getOid( id ) ) || bootstrap.hasSyntax( id );
             }
             catch ( NamingException e )
             {
@@ -163,14 +158,13 @@
             return bootstrap.getSchemaName( id );
         }
 
-        throw new NamingException( "OID " + id + " not found in oid to " +
-            "schema name map!" );
+        throw new NamingException( "OID " + id + " not found in oid to " + "schema name map!" );
     }
 
 
     public Iterator list()
     {
         return new JoinIterator( new Iterator[]
-            { byOid.values().iterator(),bootstrap.list() } );
+            { byOid.values().iterator(), bootstrap.list() } );
     }
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/GlobalSyntaxRegistry.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/MatchingRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistry.java Sun Feb 19 19:57:02 2006
@@ -1,80 +1,84 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package org.apache.directory.server.core.schema;
-
-
-import java.util.Iterator;
-
-import javax.naming.NamingException;
-
-import org.apache.directory.shared.ldap.schema.MatchingRule;
-
-
-/**
- * A registry used to track system matchingRules.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public interface MatchingRuleRegistry
-{
-    /**
-     * Registers a MatchingRule with this registry.
-     * 
-     * @param schema the name of the schema the MatchingRule is associated with
-     * @param matchingRule the MatchingRule to register
-     * @throws NamingException if the matchingRule is already registered or the 
-     * registration operation is not supported
-     */
-    void register( String schema, MatchingRule matchingRule ) throws NamingException;
-    
-    /**
-     * Looks up a MatchingRule by its unique Object Identifier or by name.
-     * 
-     * @param id the object identifier or the name identifier
-     * @return the MatchingRule for the id
-     * @throws NamingException if there is a backing store failure or the 
-     * MatchingRule does not exist.
-     */
-    MatchingRule lookup( String id ) throws NamingException;
-
-    /**
-     * Gets the name of the schema this schema object is associated with.
-     *
-     * @param id the object identifier or the name
-     * @return the schema name
-     * @throws NamingException if the schema object does not exist
-     */
-    String getSchemaName( String id ) throws NamingException;
-
-    /**
-     * Checks to see if a MatchingRule exists.  Backing store failures simply 
-     * return false.
-     * 
-     * @param oid the object identifier
-     * @return true if a MatchingRule definition exists for the oid, false 
-     * otherwise
-     */
-    boolean hasMatchingRule( String oid );
-
-    /**
-     * Gets an Iterator over the MatchingRules within this registry.
-     *
-     * @return an iterator over all MatchingRules in registry
-     */
-    Iterator list();
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.directory.server.core.schema;
+
+
+import java.util.Iterator;
+
+import javax.naming.NamingException;
+
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+
+
+/**
+ * A registry used to track system matchingRules.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface MatchingRuleRegistry
+{
+    /**
+     * Registers a MatchingRule with this registry.
+     * 
+     * @param schema the name of the schema the MatchingRule is associated with
+     * @param matchingRule the MatchingRule to register
+     * @throws NamingException if the matchingRule is already registered or the 
+     * registration operation is not supported
+     */
+    void register( String schema, MatchingRule matchingRule ) throws NamingException;
+
+
+    /**
+     * Looks up a MatchingRule by its unique Object Identifier or by name.
+     * 
+     * @param id the object identifier or the name identifier
+     * @return the MatchingRule for the id
+     * @throws NamingException if there is a backing store failure or the 
+     * MatchingRule does not exist.
+     */
+    MatchingRule lookup( String id ) throws NamingException;
+
+
+    /**
+     * Gets the name of the schema this schema object is associated with.
+     *
+     * @param id the object identifier or the name
+     * @return the schema name
+     * @throws NamingException if the schema object does not exist
+     */
+    String getSchemaName( String id ) throws NamingException;
+
+
+    /**
+     * Checks to see if a MatchingRule exists.  Backing store failures simply 
+     * return false.
+     * 
+     * @param oid the object identifier
+     * @return true if a MatchingRule definition exists for the oid, false 
+     * otherwise
+     */
+    boolean hasMatchingRule( String oid );
+
+
+    /**
+     * Gets an Iterator over the MatchingRules within this registry.
+     *
+     * @return an iterator over all MatchingRules in registry
+     */
+    Iterator list();
+}

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistry.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/MatchingRuleRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -1,62 +1,65 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package org.apache.directory.server.core.schema;
-
-
-import javax.naming.NamingException;
-
-import org.apache.directory.shared.ldap.schema.MatchingRule;
-
-
-/**
- * Monitor interface for a MatchingRuleRegistry.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public interface MatchingRuleRegistryMonitor
-{
-    /**
-     * Monitors when a MatchingRule is registered successfully.
-     * 
-     * @param matchingRule the MatchingRule registered
-     */
-    void registered( MatchingRule matchingRule );
-
-    /**
-     * Monitors when a MatchingRule is successfully looked up.
-     * 
-     * @param matchingRule the MatchingRule looked up
-     */
-    void lookedUp( MatchingRule matchingRule );
-
-    /**
-     * Monitors when a lookup attempt fails.
-     * 
-     * @param oid the OID for the MatchingRule to lookup
-     * @param fault the exception to be thrown for the fault
-     */
-    void lookupFailed( String oid, NamingException fault );
-    
-    /**
-     * Monitors when a registration attempt fails.
-     * 
-     * @param matchingRule the MatchingRule which failed registration
-     * @param fault the exception to be thrown for the fault
-     */
-    void registerFailed( MatchingRule matchingRule, NamingException fault );
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.directory.server.core.schema;
+
+
+import javax.naming.NamingException;
+
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+
+
+/**
+ * Monitor interface for a MatchingRuleRegistry.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface MatchingRuleRegistryMonitor
+{
+    /**
+     * Monitors when a MatchingRule is registered successfully.
+     * 
+     * @param matchingRule the MatchingRule registered
+     */
+    void registered( MatchingRule matchingRule );
+
+
+    /**
+     * Monitors when a MatchingRule is successfully looked up.
+     * 
+     * @param matchingRule the MatchingRule looked up
+     */
+    void lookedUp( MatchingRule matchingRule );
+
+
+    /**
+     * Monitors when a lookup attempt fails.
+     * 
+     * @param oid the OID for the MatchingRule to lookup
+     * @param fault the exception to be thrown for the fault
+     */
+    void lookupFailed( String oid, NamingException fault );
+
+
+    /**
+     * Monitors when a registration attempt fails.
+     * 
+     * @param matchingRule the MatchingRule which failed registration
+     * @param fault the exception to be thrown for the fault
+     */
+    void registerFailed( MatchingRule matchingRule, NamingException fault );
+}

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistryMonitor.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/MatchingRuleRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistryMonitorAdapter.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistryMonitorAdapter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistryMonitorAdapter.java Sun Feb 19 19:57:02 2006
@@ -1,80 +1,80 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package org.apache.directory.server.core.schema;
-
-
-import javax.naming.NamingException;
-
-import org.apache.directory.shared.ldap.schema.MatchingRule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * An adapter for a MatchingRuleRegistryMonitor.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class MatchingRuleRegistryMonitorAdapter
-    implements MatchingRuleRegistryMonitor
-{
-    private static final Logger log = LoggerFactory.getLogger( MatchingRuleRegistryMonitorAdapter.class );
-    
-    /**
-     * @see org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor#registered(
-     * org.apache.directory.shared.ldap.schema.MatchingRule)
-     */
-    public void registered( MatchingRule rule )
-    {
-    }
-    
-
-    /**
-     * @see org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor#lookedUp(
-     * org.apache.directory.shared.ldap.schema.MatchingRule)
-     */
-    public void lookedUp( MatchingRule rule )
-    {
-    }
-
-    
-    /**
-     * @see org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor#lookupFailed(
-     * java.lang.String, javax.naming.NamingException)
-     */
-    public void lookupFailed( String oid, NamingException fault )
-    {
-        if ( fault != null )
-        {
-            log.warn( "Failed to look up the matching rule: " + oid, fault );
-        }
-    }
-
-    
-    /**
-     * @see org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor#registerFailed(
-     * org.apache.directory.shared.ldap.schema.MatchingRule, javax.naming.NamingException)
-     */
-    public void registerFailed( MatchingRule rule, NamingException fault )
-    {
-        if ( fault != null )
-        {
-            log.warn( "Failed to register a matching rule: " + rule, fault );
-        }
-    }
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.directory.server.core.schema;
+
+
+import javax.naming.NamingException;
+
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * An adapter for a MatchingRuleRegistryMonitor.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class MatchingRuleRegistryMonitorAdapter implements MatchingRuleRegistryMonitor
+{
+    private static final Logger log = LoggerFactory.getLogger( MatchingRuleRegistryMonitorAdapter.class );
+
+
+    /**
+     * @see org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor#registered(
+     * org.apache.directory.shared.ldap.schema.MatchingRule)
+     */
+    public void registered( MatchingRule rule )
+    {
+    }
+
+
+    /**
+     * @see org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor#lookedUp(
+     * org.apache.directory.shared.ldap.schema.MatchingRule)
+     */
+    public void lookedUp( MatchingRule rule )
+    {
+    }
+
+
+    /**
+     * @see org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor#lookupFailed(
+     * java.lang.String, javax.naming.NamingException)
+     */
+    public void lookupFailed( String oid, NamingException fault )
+    {
+        if ( fault != null )
+        {
+            log.warn( "Failed to look up the matching rule: " + oid, fault );
+        }
+    }
+
+
+    /**
+     * @see org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor#registerFailed(
+     * org.apache.directory.shared.ldap.schema.MatchingRule, javax.naming.NamingException)
+     */
+    public void registerFailed( MatchingRule rule, NamingException fault )
+    {
+        if ( fault != null )
+        {
+            log.warn( "Failed to register a matching rule: " + rule, fault );
+        }
+    }
+}

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleRegistryMonitorAdapter.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/MatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistry.java Sun Feb 19 19:57:02 2006
@@ -43,7 +43,8 @@
      * the registration operation is not supported
      */
     void register( String schema, MatchingRuleUse matchingRuleUse ) throws NamingException;
-    
+
+
     /**
      * Looks up an matchingRuleUse by its name.
      * 
@@ -53,6 +54,7 @@
      */
     MatchingRuleUse lookup( String name ) throws NamingException;
 
+
     /**
      * Gets the name of the schema this schema object is associated with.
      *
@@ -62,6 +64,7 @@
      */
     String getSchemaName( String name ) throws NamingException;
 
+
     /**
      * Checks to see if an matchingRuleUse exists.
      * 
@@ -70,6 +73,7 @@
      * otherwise
      */
     boolean hasMatchingRuleUse( String name );
+
 
     /**
      * Lists all the MatchingRuleUses within this registry.

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistry.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/MatchingRuleUseRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -35,6 +35,7 @@
      */
     void registered( MatchingRuleUse matchingRuleUse );
 
+
     /**
      * Monitors when a Comparator is successfully looked up.
      *
@@ -42,6 +43,7 @@
      */
     void lookedUp( MatchingRuleUse matchingRuleUse );
 
+
     /**
      * Monitors when a lookup attempt fails.
      *
@@ -49,6 +51,7 @@
      * @param fault the exception to be thrown for the fault
      */
     void lookupFailed( String name, Throwable fault );
+
 
     /**
      * Monitors when a registration attempt fails.

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistryMonitor.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/MatchingRuleUseRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistryMonitorAdapter.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistryMonitorAdapter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistryMonitorAdapter.java Sun Feb 19 19:57:02 2006
@@ -29,11 +29,11 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class MatchingRuleUseRegistryMonitorAdapter
-    implements MatchingRuleUseRegistryMonitor
+public class MatchingRuleUseRegistryMonitorAdapter implements MatchingRuleUseRegistryMonitor
 {
     private static final Logger log = LoggerFactory.getLogger( MatchingRuleUseRegistryMonitorAdapter.class );
-    
+
+
     public void registered( MatchingRuleUse matchingRuleUse )
     {
     }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MatchingRuleUseRegistryMonitorAdapter.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/NameFormRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistry.java Sun Feb 19 19:57:02 2006
@@ -41,7 +41,8 @@
      * registration operation is not supported
      */
     void register( String schema, NameForm nameForm ) throws NamingException;
-    
+
+
     /**
      * Looks up a nameForm by its unique Object Identifier or by name.
      * 
@@ -51,6 +52,7 @@
      */
     NameForm lookup( String id ) throws NamingException;
 
+
     /**
      * Gets the name of the schema this schema object is associated with.
      *
@@ -60,6 +62,7 @@
      */
     String getSchemaName( String id ) throws NamingException;
 
+
     /**
      * Checks to see if an nameForm exists.
      * 
@@ -69,10 +72,11 @@
      */
     boolean hasNameForm( String id );
 
+
     /**
      * Lists all the NameForms within this registry.
      *
      * @return an Iterator over all the NameForms within this registry
-     */ 
+     */
     Iterator list();
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistry.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/NameFormRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -35,6 +35,7 @@
      */
     void registered( NameForm nameForm );
 
+
     /**
      * Monitors when a Comparator is successfully looked up.
      *
@@ -42,6 +43,7 @@
      */
     void lookedUp( NameForm nameForm );
 
+
     /**
      * Monitors when a lookup attempt fails.
      *
@@ -49,6 +51,7 @@
      * @param fault the exception to be thrown for the fault
      */
     void lookupFailed( String oid, Throwable fault );
+
 
     /**
      * Monitors when a registration attempt fails.

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistryMonitor.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/NameFormRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistryMonitorAdapter.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistryMonitorAdapter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistryMonitorAdapter.java Sun Feb 19 19:57:02 2006
@@ -32,7 +32,8 @@
 public class NameFormRegistryMonitorAdapter implements NameFormRegistryMonitor
 {
     private static final Logger log = LoggerFactory.getLogger( NameFormRegistryMonitorAdapter.class );
-    
+
+
     public void registered( NameForm nameForm )
     {
     }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NameFormRegistryMonitorAdapter.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



Mime
View raw message