directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [22/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/SyntaxRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistryMonitor.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.Syntax;
-
-
-/**
- * Monitor interface for a SyntaxRegistry.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public interface SyntaxRegistryMonitor
-{
-    /**
-     * Monitors when a Syntax is registered successfully.
-     * 
-     * @param syntax the Syntax registered
-     */
-    void registered( Syntax syntax );
-
-    /**
-     * Monitors when a Syntax is successfully looked up.
-     * 
-     * @param syntax the Syntax looked up
-     */
-    void lookedUp( Syntax syntax );
-
-    /**
-     * Monitors when a lookup attempt fails.
-     * 
-     * @param oid the OID for the Syntax 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 syntax the Syntax which failed registration
-     * @param fault the exception to be thrown for the fault
-     */
-    void registerFailed( Syntax syntax, 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.Syntax;
+
+
+/**
+ * Monitor interface for a SyntaxRegistry.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface SyntaxRegistryMonitor
+{
+    /**
+     * Monitors when a Syntax is registered successfully.
+     * 
+     * @param syntax the Syntax registered
+     */
+    void registered( Syntax syntax );
+
+
+    /**
+     * Monitors when a Syntax is successfully looked up.
+     * 
+     * @param syntax the Syntax looked up
+     */
+    void lookedUp( Syntax syntax );
+
+
+    /**
+     * Monitors when a lookup attempt fails.
+     * 
+     * @param oid the OID for the Syntax 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 syntax the Syntax which failed registration
+     * @param fault the exception to be thrown for the fault
+     */
+    void registerFailed( Syntax syntax, NamingException fault );
+}

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistryMonitor.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/SyntaxRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistryMonitorAdapter.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistryMonitorAdapter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistryMonitorAdapter.java Sun Feb 19 19:57:02 2006
@@ -1,79 +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.Syntax;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * An adapter for the SyntaxRegistry's monitor.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class SyntaxRegistryMonitorAdapter implements SyntaxRegistryMonitor
-{
-    private static final Logger log = LoggerFactory.getLogger( SyntaxRegistryMonitorAdapter.class );
-
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.schema.SyntaxRegistryMonitor#registered(
-     * org.apache.eve.schema.Syntax)
-     */
-    public void registered( Syntax syntax)
-    {
-    }
-
-    
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.schema.SyntaxRegistryMonitor#lookedUp(
-     * org.apache.eve.schema.Syntax)
-     */
-    public void lookedUp( Syntax syntax )
-    {
-    }
-
-    
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.schema.SyntaxRegistryMonitor#lookupFailed(
-     * java.lang.String, javax.naming.NamingException)
-     */
-    public void lookupFailed( String oid, NamingException fault )
-    {
-        if ( fault != null )
-        {
-            log.warn( "Failed to look up the syntax: " + oid, fault );
-        }
-    }
-
-    
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.schema.SyntaxRegistryMonitor#registerFailed(
-     * org.apache.eve.schema.Syntax, javax.naming.NamingException)
-     */
-    public void registerFailed( Syntax syntax, NamingException fault )
-    {
-        if ( fault != null )
-        {
-            log.warn( "Failed to register a syntax: " + syntax, 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.Syntax;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * An adapter for the SyntaxRegistry's monitor.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class SyntaxRegistryMonitorAdapter implements SyntaxRegistryMonitor
+{
+    private static final Logger log = LoggerFactory.getLogger( SyntaxRegistryMonitorAdapter.class );
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.schema.SyntaxRegistryMonitor#registered(
+     * org.apache.eve.schema.Syntax)
+     */
+    public void registered( Syntax syntax )
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.schema.SyntaxRegistryMonitor#lookedUp(
+     * org.apache.eve.schema.Syntax)
+     */
+    public void lookedUp( Syntax syntax )
+    {
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.schema.SyntaxRegistryMonitor#lookupFailed(
+     * java.lang.String, javax.naming.NamingException)
+     */
+    public void lookupFailed( String oid, NamingException fault )
+    {
+        if ( fault != null )
+        {
+            log.warn( "Failed to look up the syntax: " + oid, fault );
+        }
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.server.schema.SyntaxRegistryMonitor#registerFailed(
+     * org.apache.eve.schema.Syntax, javax.naming.NamingException)
+     */
+    public void registerFailed( Syntax syntax, NamingException fault )
+    {
+        if ( fault != null )
+        {
+            log.warn( "Failed to register a syntax: " + syntax, fault );
+        }
+    }
+}

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java Sun Feb 19 19:57:02 2006
@@ -62,7 +62,7 @@
      *
      * @param type the producer type
      */
-    protected AbstractBootstrapProducer( ProducerTypeEnum type )
+    protected AbstractBootstrapProducer(ProducerTypeEnum type)
     {
         this.type = type;
     }
@@ -77,30 +77,23 @@
     }
 
 
-    protected static BootstrapSyntax
-        newSyntax( String oid, BootstrapRegistries registries )
+    protected static BootstrapSyntax newSyntax( String oid, BootstrapRegistries registries )
     {
         return new BootstrapSyntax( oid, registries.getSyntaxCheckerRegistry() );
     }
 
 
-
-    protected static BootstrapAttributeType
-        newAttributeType( String oid, BootstrapRegistries registries )
+    protected static BootstrapAttributeType newAttributeType( String oid, BootstrapRegistries registries )
     {
         return new BootstrapAttributeType( oid, registries );
     }
 
 
-
-    protected static BootstrapObjectClass
-        newObjectClass( String oid, BootstrapRegistries registries )
+    protected static BootstrapObjectClass newObjectClass( String oid, BootstrapRegistries registries )
     {
         return new BootstrapObjectClass( oid, registries );
     }
 
-
-
     /**
      * A mutable Syntax for the bootstrap phase that uses the
      * syntaxCheckerRegistry to dynamically resolve syntax checkers.
@@ -110,7 +103,7 @@
         final SyntaxCheckerRegistry registry;
 
 
-        protected BootstrapSyntax( String oid, SyntaxCheckerRegistry registry )
+        protected BootstrapSyntax(String oid, SyntaxCheckerRegistry registry)
         {
             super( oid );
             this.registry = registry;
@@ -135,7 +128,7 @@
         }
 
 
-        public SyntaxChecker getSyntaxChecker( ) throws NamingException
+        public SyntaxChecker getSyntaxChecker() throws NamingException
         {
             return registry.lookup( getOid() );
         }
@@ -147,7 +140,6 @@
         }
     }
 
-
     public static class BootstrapMatchingRule extends AbstractMatchingRule
     {
         final SyntaxRegistry syntaxRegistry;
@@ -156,7 +148,7 @@
         String syntaxOid;
 
 
-        protected BootstrapMatchingRule( String oid, BootstrapRegistries registries )
+        protected BootstrapMatchingRule(String oid, BootstrapRegistries registries)
         {
             super( oid );
             this.syntaxRegistry = registries.getSyntaxRegistry();
@@ -170,16 +162,19 @@
             super.setNames( names );
         }
 
+
         public void setSyntaxOid( String syntaxOid )
         {
             this.syntaxOid = syntaxOid;
         }
 
+
         public void setDescription( String description )
         {
             super.setDescription( description );
         }
 
+
         public void setObsolete( boolean isObsolete )
         {
             super.setObsolete( isObsolete );
@@ -188,24 +183,24 @@
 
         // accessors
 
-
         public Syntax getSyntax() throws NamingException
         {
             return syntaxRegistry.lookup( syntaxOid );
         }
 
+
         public Comparator getComparator() throws NamingException
         {
             return comparatorRegistry.lookup( getOid() );
         }
 
+
         public Normalizer getNormalizer() throws NamingException
         {
             return normalizerRegistry.lookup( getOid() );
         }
     }
 
-
     /**
      * A concrete mutable attributeType implementation for bootstrapping which
      * uses registries for dynamically resolving dependent objects.
@@ -224,7 +219,7 @@
         private String syntaxId;
 
 
-        protected BootstrapAttributeType( String oid, BootstrapRegistries registries )
+        protected BootstrapAttributeType(String oid, BootstrapRegistries registries)
         {
             super( oid );
 
@@ -233,11 +228,13 @@
             attributeTypeRegistry = registries.getAttributeTypeRegistry();
         }
 
+
         public void setSuperiorId( String superiorId )
         {
             this.superiorId = superiorId;
         }
 
+
         public AttributeType getSuperior() throws NamingException
         {
             if ( superiorId == null )
@@ -248,11 +245,13 @@
             return this.attributeTypeRegistry.lookup( superiorId );
         }
 
+
         public void setNames( String[] names )
         {
             super.setNames( names );
         }
 
+
         public MatchingRule getEquality() throws NamingException
         {
             if ( equalityId != null )
@@ -268,11 +267,13 @@
             return null;
         }
 
+
         public void setEqualityId( String equalityId )
         {
             this.equalityId = equalityId;
         }
 
+
         public MatchingRule getSubstr() throws NamingException
         {
             if ( substrId != null )
@@ -288,11 +289,13 @@
             return null;
         }
 
+
         public void setSubstrId( String substrId )
         {
             this.substrId = substrId;
         }
 
+
         public MatchingRule getOrdering() throws NamingException
         {
             if ( orderingId != null )
@@ -308,16 +311,19 @@
             return null;
         }
 
+
         public void setOrderingId( String orderingId )
         {
             this.orderingId = orderingId;
         }
 
+
         public void setSyntaxId( String syntaxId )
         {
             this.syntaxId = syntaxId;
         }
 
+
         public Syntax getSyntax() throws NamingException
         {
             if ( syntaxId != null )
@@ -333,49 +339,54 @@
             return null;
         }
 
+
         public void setSingleValue( boolean singleValue )
         {
             super.setSingleValue( singleValue );
         }
 
+
         public void setCollective( boolean collective )
         {
             super.setCollective( collective );
         }
 
+
         public void setCanUserModify( boolean canUserModify )
         {
             super.setCanUserModify( canUserModify );
         }
 
+
         public void setObsolete( boolean obsolete )
         {
             super.setObsolete( obsolete );
         }
 
+
         public void setDescription( String description )
         {
             super.setDescription( description );
         }
 
+
         public void setUsage( UsageEnum usage )
         {
             super.setUsage( usage );
         }
 
+
         public void setLength( int length )
         {
             super.setLength( length );
         }
     }
 
-
     /**
      * A concrete mutable objectClass implementation for bootstrapping which
      * uses registries for dynamically resolving dependent objects.
      */
-    public static class BootstrapObjectClass extends AbstractSchemaObject
-        implements ObjectClass
+    public static class BootstrapObjectClass extends AbstractSchemaObject implements ObjectClass
     {
         private final ObjectClassRegistry objectClassRegistry;
         private final AttributeTypeRegistry attributeTypeRegistry;
@@ -397,7 +408,7 @@
          * @param oid the OID of the new objectClass
          * @param registries the bootstrap registries to use for resolving dependent objects
          */
-        protected BootstrapObjectClass( String oid, BootstrapRegistries registries )
+        protected BootstrapObjectClass(String oid, BootstrapRegistries registries)
         {
             super( oid );
 
@@ -410,7 +421,6 @@
         // ObjectClass Accessors
         // --------------------------------------------------------------------
 
-
         public ObjectClass[] getSuperClasses() throws NamingException
         {
             if ( superClasses == null )
@@ -418,7 +428,7 @@
                 superClasses = new ObjectClass[superClassIds.length];
             }
 
-            for( int ii = 0; ii < superClassIds.length; ii++ )
+            for ( int ii = 0; ii < superClassIds.length; ii++ )
             {
                 superClasses[ii] = objectClassRegistry.lookup( superClassIds[ii] );
             }
@@ -452,7 +462,7 @@
                 mustList = new AttributeType[mustListIds.length];
             }
 
-            for( int ii = 0; ii < mustListIds.length; ii++ )
+            for ( int ii = 0; ii < mustListIds.length; ii++ )
             {
                 mustList[ii] = attributeTypeRegistry.lookup( mustListIds[ii] );
             }
@@ -474,7 +484,7 @@
                 mayList = new AttributeType[mayListIds.length];
             }
 
-            for( int ii = 0; ii < mayListIds.length; ii++ )
+            for ( int ii = 0; ii < mayListIds.length; ii++ )
             {
                 mayList[ii] = attributeTypeRegistry.lookup( mayListIds[ii] );
             }
@@ -493,22 +503,22 @@
         // SchemaObject Mutators
         // --------------------------------------------------------------------
 
-
         public void setObsolete( boolean obsolete )
         {
             super.setObsolete( obsolete );
         }
 
+
         public void setNames( String[] names )
         {
             super.setNames( names );
         }
 
+
         public void setDescription( String description )
         {
             super.setDescription( description );
         }
-
 
     }
 }

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java Sun Feb 19 19:57:02 2006
@@ -28,7 +28,6 @@
 import org.apache.directory.shared.ldap.util.BigIntegerComparator;
 
 
-
 /**
  * A producer of Comparator objects for the eve schema.
  *
@@ -47,12 +46,10 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Comparator comparator;
 

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java Sun Feb 19 19:57:02 2006
@@ -40,27 +40,28 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see BootstrapProducer#produce(BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapMatchingRule mrule = null;
 
         mrule = new BootstrapMatchingRule( "1.2.6.1.4.1.18060.1.1.1.2.1", registries );
-        mrule.setNames( new String[] { "exactDnAsStringMatch" } );
+        mrule.setNames( new String[]
+            { "exactDnAsStringMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.12" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         mrule = new BootstrapMatchingRule( "1.2.6.1.4.1.18060.1.1.1.2.2", registries );
-        mrule.setNames( new String[] { "bigIntegerMatch" } );
+        mrule.setNames( new String[]
+            { "bigIntegerMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.27" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
 
         mrule = new BootstrapMatchingRule( "1.2.6.1.4.1.18060.1.1.1.2.3", registries );
-        mrule.setNames( new String[] { "jdbmStringMatch" } );
+        mrule.setNames( new String[]
+            { "jdbmStringMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
     }

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java Sun Feb 19 19:57:02 2006
@@ -42,12 +42,10 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Normalizer normalizer;
 

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.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 BootstrapAttributeTypeRegistry.
      */
-    public BootstrapAttributeTypeRegistry( OidRegistry oidRegistry )
+    public BootstrapAttributeTypeRegistry(OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -80,13 +79,12 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, AttributeType attributeType ) throws NamingException
     {
         if ( byOid.containsKey( attributeType.getOid() ) )
         {
-            NamingException e = new NamingException( "attributeType w/ OID " +
-                attributeType.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "attributeType w/ OID " + attributeType.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( attributeType, e );
             throw e;
         }
@@ -107,10 +105,9 @@
     {
         id = oidRegistry.getOid( id );
 
-        if ( ! byOid.containsKey( id ) )
+        if ( !byOid.containsKey( id ) )
         {
-            NamingException e = new NamingException( "attributeType w/ OID "
-                + id + " not registered!" );
+            NamingException e = new NamingException( "attributeType w/ OID " + id + " not registered!" );
             monitor.lookupFailed( id, e );
             throw e;
         }
@@ -147,8 +144,7 @@
             return ( String ) oidToSchema.get( 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/bootstrap/BootstrapAttributeTypeRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java Sun Feb 19 19:57:02 2006
@@ -49,7 +49,6 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates a default ComparatorRegistry by initializing the map and the
      * montior.
@@ -79,13 +78,11 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, String oid, Comparator comparator ) throws NamingException
     {
         if ( comparators.containsKey( oid ) )
         {
-            NamingException e = new NamingException( "Comparator with OID "
-                + oid + " already registered!" );
+            NamingException e = new NamingException( "Comparator with OID " + oid + " already registered!" );
             monitor.registerFailed( oid, comparator, e );
             throw e;
         }
@@ -105,7 +102,6 @@
             return c;
         }
 
-
         NamingException e = new NamingException( "Comparator not found for OID: " + oid );
         monitor.lookupFailed( oid, e );
         throw e;
@@ -120,17 +116,16 @@
 
     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 );
         }
 
-        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/bootstrap/BootstrapComparatorRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.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 BootstrapDitContentRuleRegistry.
      */
-    public BootstrapDitContentRuleRegistry( OidRegistry oidRegistry )
+    public BootstrapDitContentRuleRegistry(OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -80,18 +79,17 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, DITContentRule dITContentRule ) throws NamingException
     {
         if ( byOid.containsKey( 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 );
@@ -102,10 +100,9 @@
     {
         id = oidRegistry.getOid( id );
 
-        if ( ! byOid.containsKey( id ) )
+        if ( !byOid.containsKey( id ) )
         {
-            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;
         }
@@ -142,8 +139,7 @@
             return ( String ) oidToSchema.get( 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/bootstrap/BootstrapDitContentRuleRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.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 BootstrapDitStructureRuleRegistry( OidRegistry oidRegistry )
+    public BootstrapDitStructureRuleRegistry(OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -80,13 +79,12 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, DITStructureRule dITStructureRule ) throws NamingException
     {
         if ( byOid.containsKey( 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;
         }
@@ -102,10 +100,9 @@
     {
         id = oidRegistry.getOid( id );
 
-        if ( ! byOid.containsKey( id ) )
+        if ( !byOid.containsKey( id ) )
         {
-            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;
         }
@@ -142,11 +139,8 @@
             return ( String ) oidToSchema.get( 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()

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java Sun Feb 19 19:57:02 2006
@@ -1,186 +1,182 @@
-/*
- *   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.bootstrap;
-
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.naming.NamingException;
-
-import org.apache.directory.server.core.schema.MatchingRuleRegistry;
-import org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor;
-import org.apache.directory.server.core.schema.MatchingRuleRegistryMonitorAdapter;
-import org.apache.directory.server.core.schema.OidRegistry;
-import org.apache.directory.shared.ldap.schema.MatchingRule;
-
-
-/**
- * A MatchingRuleRegistry service used to lookup matching rules by OID.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class BootstrapMatchingRuleRegistry implements MatchingRuleRegistry
-{
-    /** a map using an OID for the key and a MatchingRule for the value */
-    private final Map byOid;
-    /** maps an OID to a schema name*/
-    private final Map oidToSchema;
-    /** the registry used to resolve names to OIDs */
-    private final OidRegistry oidRegistry;
-    /** a monitor used to track noteable registry events */
-    private MatchingRuleRegistryMonitor monitor = null;
-    
-    
-    // ------------------------------------------------------------------------
-    // C O N S T R U C T O R S
-    // ------------------------------------------------------------------------
-    
-    
-    /**
-     * Creates a BootstrapMatchingRuleRegistry using existing MatchingRulees
-     * for lookups.
-     * 
-     */
-    public BootstrapMatchingRuleRegistry( OidRegistry oidRegistry )
-    {
-        this.oidToSchema = new HashMap();
-        this.oidRegistry = oidRegistry;
-        this.byOid = new HashMap();
-        this.monitor = new MatchingRuleRegistryMonitorAdapter();
-    }
-    
-
-    // ------------------------------------------------------------------------
-    // MatchingRuleRegistry interface methods
-    // ------------------------------------------------------------------------
-    
-    
-    /**
-     * @see org.apache.directory.server.core.schema.MatchingRuleRegistry#lookup(String)
-     */
-    public MatchingRule lookup( String id ) throws NamingException
-    {
-        id = oidRegistry.getOid( id );
-
-        if ( byOid.containsKey( id ) )
-        {
-            MatchingRule MatchingRule = ( MatchingRule ) byOid.get( id );
-            monitor.lookedUp( MatchingRule );
-            return MatchingRule;
-        }
-        
-        NamingException fault = new NamingException( "Unknown MatchingRule OID " + id );
-        monitor.lookupFailed( id, fault );
-        throw fault;
-    }
-    
-
-    /**
-     * @see MatchingRuleRegistry#register(String, MatchingRule)
-     */
-    public void register( String schema, MatchingRule matchingRule ) throws NamingException
-    {
-        if ( byOid.containsKey( matchingRule.getOid() ) )
-        {
-            NamingException e = new NamingException( "matchingRule w/ OID " +
-                matchingRule.getOid() + " has already been registered!" );
-            monitor.registerFailed( matchingRule, e );
-            throw e;
-        }
-
-        oidToSchema.put( matchingRule.getOid(), schema );
-
-        String[] names = matchingRule.getNames();
-        for ( int ii = 0; ii < names.length; ii++ )
-        {
-            oidRegistry.register( names[ii], matchingRule.getOid() );
-        }
-
-        byOid.put( matchingRule.getOid(), matchingRule );
-        monitor.registered( matchingRule );
-    }
-
-    
-    /**
-     * @see org.apache.directory.server.core.schema.MatchingRuleRegistry#hasMatchingRule(String)
-     */
-    public boolean hasMatchingRule( String id )
-    {
-        if ( oidRegistry.hasOid( id ) )
-        {
-            try
-            {
-                return byOid.containsKey( oidRegistry.getOid( id ) );
-            }
-            catch ( NamingException e )
-            {
-                return false;
-            }
-        }
-
-        return false;
-    }
-
-
-    public String getSchemaName( String id ) throws NamingException
-    {
-        id = oidRegistry.getOid( id );
-        if ( oidToSchema.containsKey( id ) )
-        {
-            return ( String ) oidToSchema.get( id );
-        }
-
-        throw new NamingException( "OID " + id + " not found in oid to " +
-            "schema name map!" );
-    }
-
-
-    // ------------------------------------------------------------------------
-    // package friendly monitor methods
-    // ------------------------------------------------------------------------
-    
-    
-    /**
-     * Gets the monitor for this registry.
-     * 
-     * @return the monitor
-     */
-    MatchingRuleRegistryMonitor getMonitor()
-    {
-        return monitor;
-    }
-
-    
-    /**
-     * Sets the monitor for this registry.
-     * 
-     * @param monitor the monitor to set
-     */
-    void setMonitor( MatchingRuleRegistryMonitor monitor )
-    {
-        this.monitor = monitor;
-    }
-
-
-    public Iterator list()
-    {
-        return byOid.values().iterator();
-    }
-}
+/*
+ *   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.bootstrap;
+
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
+import org.apache.directory.server.core.schema.MatchingRuleRegistry;
+import org.apache.directory.server.core.schema.MatchingRuleRegistryMonitor;
+import org.apache.directory.server.core.schema.MatchingRuleRegistryMonitorAdapter;
+import org.apache.directory.server.core.schema.OidRegistry;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+
+
+/**
+ * A MatchingRuleRegistry service used to lookup matching rules by OID.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class BootstrapMatchingRuleRegistry implements MatchingRuleRegistry
+{
+    /** a map using an OID for the key and a MatchingRule for the value */
+    private final Map byOid;
+    /** maps an OID to a schema name*/
+    private final Map oidToSchema;
+    /** the registry used to resolve names to OIDs */
+    private final OidRegistry oidRegistry;
+    /** a monitor used to track noteable registry events */
+    private MatchingRuleRegistryMonitor monitor = null;
+
+
+    // ------------------------------------------------------------------------
+    // C O N S T R U C T O R S
+    // ------------------------------------------------------------------------
+
+    /**
+     * Creates a BootstrapMatchingRuleRegistry using existing MatchingRulees
+     * for lookups.
+     * 
+     */
+    public BootstrapMatchingRuleRegistry(OidRegistry oidRegistry)
+    {
+        this.oidToSchema = new HashMap();
+        this.oidRegistry = oidRegistry;
+        this.byOid = new HashMap();
+        this.monitor = new MatchingRuleRegistryMonitorAdapter();
+    }
+
+
+    // ------------------------------------------------------------------------
+    // MatchingRuleRegistry interface methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * @see org.apache.directory.server.core.schema.MatchingRuleRegistry#lookup(String)
+     */
+    public MatchingRule lookup( String id ) throws NamingException
+    {
+        id = oidRegistry.getOid( id );
+
+        if ( byOid.containsKey( id ) )
+        {
+            MatchingRule MatchingRule = ( MatchingRule ) byOid.get( id );
+            monitor.lookedUp( MatchingRule );
+            return MatchingRule;
+        }
+
+        NamingException fault = new NamingException( "Unknown MatchingRule OID " + id );
+        monitor.lookupFailed( id, fault );
+        throw fault;
+    }
+
+
+    /**
+     * @see MatchingRuleRegistry#register(String, MatchingRule)
+     */
+    public void register( String schema, MatchingRule matchingRule ) throws NamingException
+    {
+        if ( byOid.containsKey( matchingRule.getOid() ) )
+        {
+            NamingException e = new NamingException( "matchingRule w/ OID " + matchingRule.getOid()
+                + " has already been registered!" );
+            monitor.registerFailed( matchingRule, e );
+            throw e;
+        }
+
+        oidToSchema.put( matchingRule.getOid(), schema );
+
+        String[] names = matchingRule.getNames();
+        for ( int ii = 0; ii < names.length; ii++ )
+        {
+            oidRegistry.register( names[ii], matchingRule.getOid() );
+        }
+
+        byOid.put( matchingRule.getOid(), matchingRule );
+        monitor.registered( matchingRule );
+    }
+
+
+    /**
+     * @see org.apache.directory.server.core.schema.MatchingRuleRegistry#hasMatchingRule(String)
+     */
+    public boolean hasMatchingRule( String id )
+    {
+        if ( oidRegistry.hasOid( id ) )
+        {
+            try
+            {
+                return byOid.containsKey( oidRegistry.getOid( id ) );
+            }
+            catch ( NamingException e )
+            {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+
+    public String getSchemaName( String id ) throws NamingException
+    {
+        id = oidRegistry.getOid( id );
+        if ( oidToSchema.containsKey( id ) )
+        {
+            return ( String ) oidToSchema.get( id );
+        }
+
+        throw new NamingException( "OID " + id + " not found in oid to " + "schema name map!" );
+    }
+
+
+    // ------------------------------------------------------------------------
+    // package friendly monitor methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Gets the monitor for this registry.
+     * 
+     * @return the monitor
+     */
+    MatchingRuleRegistryMonitor getMonitor()
+    {
+        return monitor;
+    }
+
+
+    /**
+     * Sets the monitor for this registry.
+     * 
+     * @param monitor the monitor to set
+     */
+    void setMonitor( MatchingRuleRegistryMonitor monitor )
+    {
+        this.monitor = monitor;
+    }
+
+
+    public Iterator list()
+    {
+        return byOid.values().iterator();
+    }
+}

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java Sun Feb 19 19:57:02 2006
@@ -49,7 +49,6 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates an empty BootstrapMatchingRuleUseRegistry.
      */
@@ -76,14 +75,12 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
-    public void register( String schema, MatchingRuleUse matchingRuleUse )
-        throws NamingException
+    public void register( String schema, MatchingRuleUse matchingRuleUse ) throws NamingException
     {
         if ( byName.containsKey( matchingRuleUse.getName() ) )
         {
-            NamingException e = new NamingException( "matchingRuleUse w/ name "
-                + matchingRuleUse.getName() + " has already been registered!" );
+            NamingException e = new NamingException( "matchingRuleUse w/ name " + matchingRuleUse.getName()
+                + " has already been registered!" );
             monitor.registerFailed( matchingRuleUse, e );
             throw e;
         }
@@ -96,10 +93,9 @@
 
     public MatchingRuleUse lookup( String name ) throws NamingException
     {
-        if ( ! byName.containsKey( name ) )
+        if ( !byName.containsKey( name ) )
         {
-            NamingException e = new NamingException( "matchingRuleUse w/ name "
-                + name + " not registered!" );
+            NamingException e = new NamingException( "matchingRuleUse w/ name " + name + " not registered!" );
             monitor.lookupFailed( name, e );
             throw e;
         }
@@ -123,8 +119,7 @@
             return ( String ) nameToSchema.get( id );
         }
 
-        throw new NamingException( "Name " + id + " not found in name to " +
-            "schema name map!" );
+        throw new NamingException( "Name " + id + " not found in name to " + "schema name map!" );
     }
 
 

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.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 BootstrapNameFormRegistry( OidRegistry oidRegistry )
+    public BootstrapNameFormRegistry(OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -80,13 +79,12 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, NameForm nameForm ) throws NamingException
     {
         if ( byOid.containsKey( nameForm.getOid() ) )
         {
-            NamingException e = new NamingException( "nameForm w/ OID " +
-                nameForm.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "nameForm w/ OID " + nameForm.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( nameForm, e );
             throw e;
         }
@@ -102,10 +100,9 @@
     {
         id = oidRegistry.getOid( id );
 
-        if ( ! byOid.containsKey( id ) )
+        if ( !byOid.containsKey( id ) )
         {
-            NamingException e = new NamingException( "nameForm w/ OID " + id
-                + " not registered!" );
+            NamingException e = new NamingException( "nameForm w/ OID " + id + " not registered!" );
             monitor.lookupFailed( id, e );
             throw e;
         }
@@ -142,8 +139,7 @@
             return ( String ) oidToSchema.get( 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/bootstrap/BootstrapNameFormRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java Sun Feb 19 19:57:02 2006
@@ -48,7 +48,6 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates a default normalizer registry.
      */
@@ -75,14 +74,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 ( byOid.containsKey( oid ) )
         {
-            NamingException e = new NamingException( "Normalizer already " +
-                "registered for OID " + oid );
+            NamingException e = new NamingException( "Normalizer already " + "registered for OID " + oid );
             monitor.registerFailed( oid, normalizer, e );
             throw e;
         }
@@ -95,10 +91,9 @@
 
     public Normalizer lookup( String oid ) throws NamingException
     {
-        if ( ! byOid.containsKey( oid ) )
+        if ( !byOid.containsKey( oid ) )
         {
-            NamingException e = new NamingException( "Normalizer for OID "
-                + oid + " does not exist!" );
+            NamingException e = new NamingException( "Normalizer for OID " + oid + " does not exist!" );
             monitor.lookupFailed( oid, e );
             throw e;
         }
@@ -127,7 +122,6 @@
             return ( String ) oidToSchema.get( 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/bootstrap/BootstrapNormalizerRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.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 BootstrapObjectClassRegistry( OidRegistry oidRegistry )
+    public BootstrapObjectClassRegistry(OidRegistry oidRegistry)
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -80,13 +79,12 @@
     // Service Methods
     // ------------------------------------------------------------------------
 
-
     public void register( String schema, ObjectClass objectClass ) throws NamingException
     {
         if ( byOid.containsKey( objectClass.getOid() ) )
         {
-            NamingException e = new NamingException( "objectClass w/ OID " +
-                objectClass.getOid() + " has already been registered!" );
+            NamingException e = new NamingException( "objectClass w/ OID " + objectClass.getOid()
+                + " has already been registered!" );
             monitor.registerFailed( objectClass, e );
             throw e;
         }
@@ -102,10 +100,9 @@
     {
         id = oidRegistry.getOid( id );
 
-        if ( ! byOid.containsKey( id ) )
+        if ( !byOid.containsKey( id ) )
         {
-            NamingException e = new NamingException( "objectClass w/ OID "
-                + id + " not registered!" );
+            NamingException e = new NamingException( "objectClass w/ OID " + id + " not registered!" );
             monitor.lookupFailed( id, e );
             throw e;
         }
@@ -142,8 +139,7 @@
             return ( String ) oidToSchema.get( 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/bootstrap/BootstrapObjectClassRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java Sun Feb 19 19:57:02 2006
@@ -47,13 +47,12 @@
     // C O N S T R U C T O R S
     // ------------------------------------------------------------------------
 
-
     /**
      * Creates an ObjectFactoryRegistry that looks up an object factory to use.
      *
      * @param oidRegistry an object identifier registry
      */
-    public BootstrapObjectFactoryRegistry( OidRegistry oidRegistry )
+    public BootstrapObjectFactoryRegistry(OidRegistry oidRegistry)
     {
         this.oidRegistry = oidRegistry;
     }

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java Sun Feb 19 19:57:02 2006
@@ -39,17 +39,17 @@
  * @version $Rev$
  */
 public class BootstrapOidRegistry implements OidRegistry
-{ 
+{
     /** Maps OID to a name or a list of names if more than one name exists */
     private Map byOid = new HashMap();
-    
+
     /** Maps several names to an OID */
     private Map byName = new HashMap();
-    
+
     /** Default OidRegistryMonitor */
     private OidRegistryMonitor monitor = new OidRegistryMonitorAdapter();
-    
-    
+
+
     /**
      * @see org.apache.directory.server.core.schema.OidRegistry#getOid(java.lang.String)
      */
@@ -84,22 +84,21 @@
          * byName lookup.  BTW these normalized versions of the key are not
          * returned on a getNameSet.
          */
-         String lowerCase = name.trim().toLowerCase();
-         if ( ! name.equals( lowerCase )
-            && 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 );
-             return oid;
-         }
-
-         NamingException fault = new NamingException ( "OID for name '"
-                 + name + "' was not " + "found within the OID registry" );
-         monitor.oidResolutionFailed( name, fault );
-         throw fault;
+        String lowerCase = name.trim().toLowerCase();
+        if ( !name.equals( lowerCase ) && 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 );
+            return oid;
+        }
+
+        NamingException fault = new NamingException( "OID for name '" + name + "' was not "
+            + "found within the OID registry" );
+        monitor.oidResolutionFailed( name, fault );
+        throw fault;
     }
 
 
@@ -124,21 +123,20 @@
     public String getPrimaryName( String oid ) throws NamingException
     {
         Object value = byOid.get( oid );
-        
+
         if ( null == value )
         {
-            NamingException fault = new NamingException ( "OID '" + oid
-                    + "' was not found within the OID registry" );
+            NamingException fault = new NamingException( "OID '" + oid + "' was not found within the OID registry" );
             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 );
         return name;
@@ -151,22 +149,21 @@
     public List getNameSet( String oid ) throws NamingException
     {
         Object value = byOid.get( oid );
-        
+
         if ( null == value )
         {
-            NamingException fault = new NamingException ( "OID '" + oid
-                    + "' was not found within the OID registry" );
+            NamingException fault = new NamingException( "OID '" + oid + "' was not found within the OID registry" );
             monitor.oidDoesNotExist( oid, fault );
             throw fault;
         }
-        
+
         if ( value instanceof String )
         {
             List list = Collections.singletonList( value );
             monitor.namesResolved( oid, list );
             return list;
         }
-        
+
         monitor.namesResolved( oid, ( List ) value );
         return ( List ) value;
     }
@@ -179,34 +176,36 @@
     {
         return Collections.unmodifiableSet( byOid.keySet() ).iterator();
     }
-    
+
+
     /**
      * 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;
     }
 
+
     /**
      * @see org.apache.directory.server.core.schema.OidRegistry#register(String, String)
      */
     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!" );
         }
 
         /*
@@ -214,15 +213,15 @@
          * the lower cased name is different from the given name name.  
          */
         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
          * 
@@ -234,25 +233,25 @@
          * 2). If we do not have a value then we just add it as a String
          */
         Object value;
-        if ( ! byOid.containsKey( oid ) )
+        if ( !byOid.containsKey( oid ) )
         {
             value = name;
         }
-        else 
+        else
         {
             ArrayList list;
             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( name );
                 list.add( value );
@@ -261,16 +260,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 );
             }
         }
@@ -278,8 +277,8 @@
         byOid.put( oid, value );
         monitor.registered( name, oid );
     }
-    
-    
+
+
     /**
      * Gets the monitor.
      * 
@@ -290,7 +289,7 @@
         return monitor;
     }
 
-    
+
     /**
      * Sets the monitor.
      * 
@@ -301,4 +300,3 @@
         this.monitor = monitor;
     }
 }
-

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java Sun Feb 19 19:57:02 2006
@@ -39,6 +39,7 @@
      */
     ProducerTypeEnum getType();
 
+
     /**
      * Produces schema objects announcing each one after creation via the
      * callback before continuing on to create more objects.
@@ -49,6 +50,5 @@
      * throw these exceptions so we must throw this as well since
      * implementations will have to call the callback methods
      */
-    void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException;
+    void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException;
 }

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java Sun Feb 19 19:57:02 2006
@@ -92,66 +92,79 @@
         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;
     }
 
+
     public ObjectFactoryRegistry getObjectFactoryRegistry()
     {
         return objectFactoryRegistry;
     }
 
+
     public StateFactoryRegistry getStateFactoryRegistry()
     {
         return stateFactoryRegistry;
@@ -162,7 +175,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
@@ -247,9 +259,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;
             }
         }
@@ -264,9 +275,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;
             }
         }
@@ -283,9 +293,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;
             }
         }
@@ -377,9 +386,8 @@
             {
                 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,23 +399,22 @@
             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;
-//        }
+        //        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;
     }
@@ -437,7 +444,7 @@
 
         for ( int ii = 0; ii < superiors.length; ii++ )
         {
-            isSuccess &= resolve( superiors[ii], errors ) ;
+            isSuccess &= resolve( superiors[ii], errors );
         }
 
         AttributeType[] mayList = new org.apache.directory.shared.ldap.schema.AttributeType[0];
@@ -455,10 +462,9 @@
 
         for ( int ii = 0; ii < mayList.length; ii++ )
         {
-            isSuccess &= resolve( mayList[ii], errors ) ;
+            isSuccess &= resolve( mayList[ii], errors );
         }
 
-
         AttributeType[] mustList = new org.apache.directory.shared.ldap.schema.AttributeType[0];
 
         try
@@ -474,7 +480,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/bootstrap/BootstrapRegistries.java
------------------------------------------------------------------------------
    svn:eol-style = native

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