directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [23/45] - in /directory/trunks/apacheds: ./ core-plugin/ core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ core-shared/ core-shared/src/...
Date Mon, 20 Feb 2006 03:58:21 GMT
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java Sun Feb 19 19:57:02 2006
@@ -75,9 +75,7 @@
     /** the callback that just calls register() */
     private final ProducerCallback cb = new ProducerCallback()
     {
-        public void schemaObjectProduced( BootstrapProducer producer,
-                                          String registryKey,
-                                          Object schemaObject )
+        public void schemaObjectProduced( BootstrapProducer producer, String registryKey, Object schemaObject )
             throws NamingException
         {
             register( producer.getType(), registryKey, schemaObject );
@@ -95,7 +93,6 @@
     }
 
 
-
     /**
      * Loads a set of schemas by loading and running all producers for each
      * dependent schema first.
@@ -104,10 +101,9 @@
      * @param registries the registries to fill with producer created objects
      * @throws NamingException if there are any failures during this process
      */
-    public final void load( Collection bootstrapSchemas, BootstrapRegistries registries )
-        throws NamingException
+    public final void load( Collection bootstrapSchemas, BootstrapRegistries registries ) throws NamingException
     {
-        BootstrapSchema[] schemas = new BootstrapSchema[ bootstrapSchemas.size() ];
+        BootstrapSchema[] schemas = new BootstrapSchema[bootstrapSchemas.size()];
         schemas = ( BootstrapSchema[] ) bootstrapSchemas.toArray( schemas );
         HashMap loaded = new HashMap();
         HashMap notLoaded = new HashMap();
@@ -116,9 +112,9 @@
         {
             notLoaded.put( schemas[ii].getSchemaName(), schemas[ii] );
         }
-        
+
         BootstrapSchema schema;
-        
+
         // Create system schema and kick it off by loading system which
         // will never depend on anything.
         schema = new SystemSchema();
@@ -148,10 +144,8 @@
      * @throws NamingException if there is a cycle detected and/or another
      * failure results while loading, producing and or registering schema objects
      */
-    public final void loadDepsFirst( Stack beenthere, HashMap notLoaded,
-                                     BootstrapSchema schema,
-                                     BootstrapRegistries registries )
-        throws NamingException
+    public final void loadDepsFirst( Stack beenthere, HashMap notLoaded, BootstrapSchema schema,
+        BootstrapRegistries registries ) throws NamingException
     {
         beenthere.push( schema.getSchemaName() );
         String[] deps = schema.getDependencies();
@@ -172,7 +166,7 @@
          */
         for ( int ii = 0; ii < deps.length; ii++ )
         {
-            if ( ! notLoaded.containsKey( deps[ii] ) )
+            if ( !notLoaded.containsKey( deps[ii] ) )
             {
                 continue;
             }
@@ -183,8 +177,7 @@
             {
                 // push again so we show the cycle in output
                 beenthere.push( dep.getSchemaName() );
-                throw new NamingException( "schema dependency cycle detected: "
-                    + beenthere );
+                throw new NamingException( "schema dependency cycle detected: " + beenthere );
             }
 
             loadDepsFirst( beenthere, notLoaded, dep, registries );
@@ -204,8 +197,7 @@
      * @param registries the registries to fill with producer created objects
      * @throws NamingException if there are any failures during this process
      */
-    public final void load( BootstrapSchema schema, BootstrapRegistries registries )
-        throws NamingException
+    public final void load( BootstrapSchema schema, BootstrapRegistries registries ) throws NamingException
     {
         this.registries.set( registries );
         this.schemas.set( schema );
@@ -224,7 +216,6 @@
     // Utility Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * Registers objects
      *
@@ -234,86 +225,85 @@
      * @throws NamingException if there are problems when registering the object
      * in any of the registries
      */
-    private void register( ProducerTypeEnum type, String id,
-                           Object schemaObject ) throws NamingException
+    private void register( ProducerTypeEnum type, String id, Object schemaObject ) throws NamingException
     {
         BootstrapSchema schema = ( BootstrapSchema ) this.schemas.get();
         BootstrapRegistries registries = ( BootstrapRegistries ) this.registries.get();
 
-        switch( type.getValue() )
+        switch ( type.getValue() )
         {
-            case( ProducerTypeEnum.NORMALIZER_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.NORMALIZER_PRODUCER_VAL  ):
                 Normalizer normalizer = ( Normalizer ) schemaObject;
                 NormalizerRegistry normalizerRegistry;
                 normalizerRegistry = registries.getNormalizerRegistry();
                 normalizerRegistry.register( schema.getSchemaName(), id, normalizer );
                 break;
-            case( ProducerTypeEnum.COMPARATOR_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.COMPARATOR_PRODUCER_VAL  ):
                 Comparator comparator = ( Comparator ) schemaObject;
                 ComparatorRegistry comparatorRegistry;
                 comparatorRegistry = registries.getComparatorRegistry();
                 comparatorRegistry.register( schema.getSchemaName(), id, comparator );
                 break;
-            case( ProducerTypeEnum.SYNTAX_CHECKER_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.SYNTAX_CHECKER_PRODUCER_VAL  ):
                 SyntaxChecker syntaxChecker = ( SyntaxChecker ) schemaObject;
                 SyntaxCheckerRegistry syntaxCheckerRegistry;
                 syntaxCheckerRegistry = registries.getSyntaxCheckerRegistry();
                 syntaxCheckerRegistry.register( schema.getSchemaName(), id, syntaxChecker );
                 break;
-            case( ProducerTypeEnum.SYNTAX_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.SYNTAX_PRODUCER_VAL  ):
                 Syntax syntax = ( Syntax ) schemaObject;
                 SyntaxRegistry syntaxRegistry = registries.getSyntaxRegistry();
                 syntaxRegistry.register( schema.getSchemaName(), syntax );
                 break;
-            case( ProducerTypeEnum.MATCHING_RULE_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.MATCHING_RULE_PRODUCER_VAL  ):
                 MatchingRule matchingRule = ( MatchingRule ) schemaObject;
                 MatchingRuleRegistry matchingRuleRegistry;
                 matchingRuleRegistry = registries.getMatchingRuleRegistry();
                 matchingRuleRegistry.register( schema.getSchemaName(), matchingRule );
                 break;
-            case( ProducerTypeEnum.ATTRIBUTE_TYPE_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.ATTRIBUTE_TYPE_PRODUCER_VAL  ):
                 AttributeType attributeType = ( AttributeType ) schemaObject;
                 AttributeTypeRegistry attributeTypeRegistry;
                 attributeTypeRegistry = registries.getAttributeTypeRegistry();
                 attributeTypeRegistry.register( schema.getSchemaName(), attributeType );
                 break;
-            case( ProducerTypeEnum.OBJECT_CLASS_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.OBJECT_CLASS_PRODUCER_VAL  ):
                 ObjectClass objectClass = ( ObjectClass ) schemaObject;
                 ObjectClassRegistry objectClassRegistry;
                 objectClassRegistry = registries.getObjectClassRegistry();
                 objectClassRegistry.register( schema.getSchemaName(), objectClass );
                 break;
-            case( ProducerTypeEnum.MATCHING_RULE_USE_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.MATCHING_RULE_USE_PRODUCER_VAL  ):
                 MatchingRuleUse matchingRuleUse = ( MatchingRuleUse ) schemaObject;
                 MatchingRuleUseRegistry matchingRuleUseRegistry;
                 matchingRuleUseRegistry = registries.getMatchingRuleUseRegistry();
                 matchingRuleUseRegistry.register( schema.getSchemaName(), matchingRuleUse );
                 break;
-            case( ProducerTypeEnum.DIT_CONTENT_RULE_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.DIT_CONTENT_RULE_PRODUCER_VAL  ):
                 DITContentRule ditContentRule = ( DITContentRule ) schemaObject;
                 DITContentRuleRegistry ditContentRuleRegistry;
                 ditContentRuleRegistry = registries.getDitContentRuleRegistry();
                 ditContentRuleRegistry.register( schema.getSchemaName(), ditContentRule );
                 break;
-            case( ProducerTypeEnum.NAME_FORM_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.NAME_FORM_PRODUCER_VAL  ):
                 NameForm nameForm = ( NameForm ) schemaObject;
                 NameFormRegistry nameFormRegistry;
                 nameFormRegistry = registries.getNameFormRegistry();
                 nameFormRegistry.register( schema.getSchemaName(), nameForm );
                 break;
-            case( ProducerTypeEnum.DIT_STRUCTURE_RULE_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.DIT_STRUCTURE_RULE_PRODUCER_VAL  ):
                 DITStructureRule ditStructureRule = ( DITStructureRule ) schemaObject;
                 DITStructureRuleRegistry ditStructureRuleRegistry;
                 ditStructureRuleRegistry = registries.getDitStructureRuleRegistry();
                 ditStructureRuleRegistry.register( schema.getSchemaName(), ditStructureRule );
                 break;
-            case( ProducerTypeEnum.STATE_FACTORY_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.STATE_FACTORY_PRODUCER_VAL  ):
                 ServerDirStateFactory stateFactory = ( ServerDirStateFactory ) schemaObject;
                 StateFactoryRegistry stateFactoryRegistry;
                 stateFactoryRegistry = registries.getStateFactoryRegistry();
                 stateFactoryRegistry.register( stateFactory );
                 break;
-            case( ProducerTypeEnum.OBJECT_FACTORY_PRODUCER_VAL ):
+            case ( ProducerTypeEnum.OBJECT_FACTORY_PRODUCER_VAL  ):
                 ServerDirObjectFactory objectFactory = ( ServerDirObjectFactory ) schemaObject;
                 ObjectFactoryRegistry objectFactoryRegistry;
                 objectFactoryRegistry = registries.getObjectFactoryRegistry();
@@ -333,8 +323,7 @@
      * @param producerBase the producer's base name
      * @throws NamingException if there are failures loading classes
      */
-    private BootstrapProducer getProducer( BootstrapSchema schema, String producerBase )
-        throws NamingException
+    private BootstrapProducer getProducer( BootstrapSchema schema, String producerBase ) throws NamingException
     {
         Class clazz = null;
         boolean failedTargetLoad = false;
@@ -361,10 +350,9 @@
             }
             catch ( ClassNotFoundException e )
             {
-                NamingException ne = new NamingException( "Failed to load " +
-                    producerBase + " for " + schema.getSchemaName()
-                    + " schema using following classes: "  + targetClassName
-                    + ", " + defaultClassName );
+                NamingException ne = new NamingException( "Failed to load " + producerBase + " for "
+                    + schema.getSchemaName() + " schema using following classes: " + targetClassName + ", "
+                    + defaultClassName );
                 ne.setRootCause( e );
                 throw ne;
             }

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

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

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapStateFactoryRegistry.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/BootstrapSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.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 an instance of a BootstrapSyntaxRegistry.
      */
@@ -75,15 +74,12 @@
     // 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 ( byOid.containsKey( oid ) )
         {
-            NamingException e = new NamingException( "SyntaxChecker with OID " +
-                oid + " already registered!" );
-            monitor.registerFailed( oid, syntaxChecker,e );
+            NamingException e = new NamingException( "SyntaxChecker with OID " + oid + " already registered!" );
+            monitor.registerFailed( oid, syntaxChecker, e );
             throw e;
         }
 
@@ -95,10 +91,9 @@
 
     public SyntaxChecker lookup( String oid ) throws NamingException
     {
-        if ( ! byOid.containsKey( oid ) )
+        if ( !byOid.containsKey( oid ) )
         {
-            NamingException e = new NamingException( "SyntaxChecker for OID "
-                + oid + " not found!" );
+            NamingException e = new NamingException( "SyntaxChecker for OID " + oid + " not found!" );
             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/BootstrapSyntaxCheckerRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.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/BootstrapSyntaxRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java Sun Feb 19 19:57:02 2006
@@ -1,179 +1,175 @@
-/*
- *   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.OidRegistry;
-import org.apache.directory.server.core.schema.SyntaxRegistry;
-import org.apache.directory.server.core.schema.SyntaxRegistryMonitor;
-import org.apache.directory.server.core.schema.SyntaxRegistryMonitorAdapter;
-import org.apache.directory.shared.ldap.schema.Syntax;
-
-
-/**
- * A SyntaxRegistry service available during server startup when other resources
- * like a syntax backing store is unavailable.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class BootstrapSyntaxRegistry implements SyntaxRegistry
-{
-    /** a map of entries using an OID for the key and a Syntax for the value */
-    private final Map byOid;
-    /** maps an OID to a schema name*/
-    private final Map oidToSchema;
-    /** the OID oidRegistry this oidRegistry uses to register new syntax OIDs */
-    private final OidRegistry oidRegistry;
-    /** a monitor used to track noteable oidRegistry events */
-    private SyntaxRegistryMonitor monitor = null;
-    
-    
-    // ------------------------------------------------------------------------
-    // C O N S T R U C T O R S
-    // ------------------------------------------------------------------------
-    
-    
-    /**
-     * Creates a BootstrapSyntaxRegistry.
-     */
-    public BootstrapSyntaxRegistry( OidRegistry registry )
-    {
-        this.oidRegistry = registry;
-        this.byOid = new HashMap();
-        this.oidToSchema = new HashMap();
-        this.monitor = new SyntaxRegistryMonitorAdapter();
-    }
-    
-
-    // ------------------------------------------------------------------------
-    // SyntaxRegistry interface methods
-    // ------------------------------------------------------------------------
-    
-    
-    /**
-     * @see org.apache.directory.server.core.schema.SyntaxRegistry#lookup(java.lang.String)
-     */
-    public Syntax lookup( String id ) throws NamingException
-    {
-        id = oidRegistry.getOid( id );
-
-        if ( byOid.containsKey( id ) )
-        {
-            Syntax syntax = ( Syntax ) byOid.get( id );
-            monitor.lookedUp( syntax );
-            return syntax;
-        }
-        
-        NamingException fault = new NamingException( "Unknown syntax OID " + id );
-        monitor.lookupFailed( id, fault );
-        throw fault;
-    }
-    
-
-    /**
-     * @see org.apache.directory.server.core.schema.SyntaxRegistry#register(String,Syntax)
-     */
-    public void register( String schema, Syntax syntax ) throws NamingException
-    {
-        if ( byOid.containsKey( syntax.getOid() ) )
-        {
-            NamingException e = new NamingException( "syntax w/ OID " +
-                syntax.getOid() + " has already been registered!" );
-            monitor.registerFailed( syntax, e );
-            throw e;
-        }
-
-        oidRegistry.register( syntax.getName(), syntax.getOid() );
-        byOid.put( syntax.getOid(), syntax );
-        oidToSchema.put( syntax.getOid(), schema );
-        monitor.registered( syntax );
-    }
-
-    
-    /**
-     * @see org.apache.directory.server.core.schema.SyntaxRegistry#hasSyntax(java.lang.String)
-     */
-    public boolean hasSyntax( 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 oidRegistry.
-     * 
-     * @return the monitor
-     */
-    SyntaxRegistryMonitor getMonitor()
-    {
-        return monitor;
-    }
-
-    
-    /**
-     * Sets the monitor for this oidRegistry.
-     * 
-     * @param monitor the monitor to set
-     */
-    void setMonitor( SyntaxRegistryMonitor 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.OidRegistry;
+import org.apache.directory.server.core.schema.SyntaxRegistry;
+import org.apache.directory.server.core.schema.SyntaxRegistryMonitor;
+import org.apache.directory.server.core.schema.SyntaxRegistryMonitorAdapter;
+import org.apache.directory.shared.ldap.schema.Syntax;
+
+
+/**
+ * A SyntaxRegistry service available during server startup when other resources
+ * like a syntax backing store is unavailable.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class BootstrapSyntaxRegistry implements SyntaxRegistry
+{
+    /** a map of entries using an OID for the key and a Syntax for the value */
+    private final Map byOid;
+    /** maps an OID to a schema name*/
+    private final Map oidToSchema;
+    /** the OID oidRegistry this oidRegistry uses to register new syntax OIDs */
+    private final OidRegistry oidRegistry;
+    /** a monitor used to track noteable oidRegistry events */
+    private SyntaxRegistryMonitor monitor = null;
+
+
+    // ------------------------------------------------------------------------
+    // C O N S T R U C T O R S
+    // ------------------------------------------------------------------------
+
+    /**
+     * Creates a BootstrapSyntaxRegistry.
+     */
+    public BootstrapSyntaxRegistry(OidRegistry registry)
+    {
+        this.oidRegistry = registry;
+        this.byOid = new HashMap();
+        this.oidToSchema = new HashMap();
+        this.monitor = new SyntaxRegistryMonitorAdapter();
+    }
+
+
+    // ------------------------------------------------------------------------
+    // SyntaxRegistry interface methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * @see org.apache.directory.server.core.schema.SyntaxRegistry#lookup(java.lang.String)
+     */
+    public Syntax lookup( String id ) throws NamingException
+    {
+        id = oidRegistry.getOid( id );
+
+        if ( byOid.containsKey( id ) )
+        {
+            Syntax syntax = ( Syntax ) byOid.get( id );
+            monitor.lookedUp( syntax );
+            return syntax;
+        }
+
+        NamingException fault = new NamingException( "Unknown syntax OID " + id );
+        monitor.lookupFailed( id, fault );
+        throw fault;
+    }
+
+
+    /**
+     * @see org.apache.directory.server.core.schema.SyntaxRegistry#register(String,Syntax)
+     */
+    public void register( String schema, Syntax syntax ) throws NamingException
+    {
+        if ( byOid.containsKey( syntax.getOid() ) )
+        {
+            NamingException e = new NamingException( "syntax w/ OID " + syntax.getOid()
+                + " has already been registered!" );
+            monitor.registerFailed( syntax, e );
+            throw e;
+        }
+
+        oidRegistry.register( syntax.getName(), syntax.getOid() );
+        byOid.put( syntax.getOid(), syntax );
+        oidToSchema.put( syntax.getOid(), schema );
+        monitor.registered( syntax );
+    }
+
+
+    /**
+     * @see org.apache.directory.server.core.schema.SyntaxRegistry#hasSyntax(java.lang.String)
+     */
+    public boolean hasSyntax( 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 oidRegistry.
+     * 
+     * @return the monitor
+     */
+    SyntaxRegistryMonitor getMonitor()
+    {
+        return monitor;
+    }
+
+
+    /**
+     * Sets the monitor for this oidRegistry.
+     * 
+     * @param monitor the monitor to set
+     */
+    void setMonitor( SyntaxRegistryMonitor 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/BootstrapSyntaxRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.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/InetorgpersonComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonComparatorProducer.java Sun Feb 19 19:57:02 2006
@@ -29,7 +29,6 @@
 import org.apache.directory.shared.ldap.schema.NormalizingComparator;
 
 
-
 /**
  * A producer of Comparator objects for the inetorgperson schema.  This code has been
  * automatically generated using schema files in the OpenLDAP format along with
@@ -51,12 +50,10 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
 
         Comparator comparator;
@@ -65,43 +62,39 @@
          * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.3
          * =========================================================
 
-            ( 2.5.13.5 NAME 'caseExactMatch'
-              SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         ( 2.5.13.5 NAME 'caseExactMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-            ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
-              SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
 
-            ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
-              SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
 
-        */
+         */
 
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimNormalizer() ),
-                new ComparableComparator() );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "2.5.13.5", comparator );
 
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimNormalizer() ),
-                new ComparableComparator() );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "2.5.13.7", comparator );
 
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                new ComparableComparator() );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "2.5.13.12", comparator );
 
         /*
          * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.4
          * =========================================================
 
-            ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
-              SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-        */
-
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                new ComparableComparator() );
+         ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
+
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.3", comparator );
     }
 }

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

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

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonMatchingRuleProducer.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/InetorgpersonNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.java Sun Feb 19 19:57:02 2006
@@ -26,7 +26,6 @@
 import org.apache.directory.shared.ldap.schema.Normalizer;
 
 
-
 /**
  * A producer of Normalizer objects for the inetorgperson schema.  This code has been
  * automatically generated using schema files in the OpenLDAP format along with
@@ -48,26 +47,24 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         /*
          * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.3
          * =========================================================
 
-            ( 2.5.13.5 NAME 'caseExactMatch'
-              SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         ( 2.5.13.5 NAME 'caseExactMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-            ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
-              SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         ( 2.5.13.7 NAME 'caseExactSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
 
-            ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
-              SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-        */
+         ( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
 
         Normalizer normalizer;
 
@@ -84,9 +81,9 @@
          * Straight out of RFC 2798 for InetOrgPerson: Section 9.3.4
          * =========================================================
 
-            ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
-              SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-        */
+         ( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
 
         normalizer = new CachingNormalizer( new DeepTrimToLowerNormalizer() );
         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.3", normalizer );

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/InetorgpersonNormalizerProducer.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/NisComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.java Sun Feb 19 19:57:02 2006
@@ -49,23 +49,20 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Comparator comparator;
 
         /* Really an openLDAP matching rule but its used in he nis so its here
          *
-            ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
-             SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
          */
-        comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimNormalizer() ),
-                new ComparableComparator() );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
         cb.schemaObjectProduced( this, "1.3.6.1.4.1.4203.1.2.1", comparator );
     }
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisComparatorProducer.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/NisMatchingRuleProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisMatchingRuleProducer.java Sun Feb 19 19:57:02 2006
@@ -43,23 +43,22 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapMatchingRule mrule;
 
         /* Really an openLDAP matching rule but its used in he nis so its here
          *
-            ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
-             SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         ( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
          */
 
-        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.4203.1.2.1", registries  );
-        mrule.setNames( new String[] { "caseExactIA5SubstringsMatch" } );
+        mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.4203.1.2.1", registries );
+        mrule.setNames( new String[]
+            { "caseExactIA5SubstringsMatch" } );
         mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
         cb.schemaObjectProduced( this, mrule.getOid(), mrule );
     }

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

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

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisNormalizerProducer.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/NisSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.java Sun Feb 19 19:57:02 2006
@@ -24,7 +24,6 @@
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 
 
-
 /**
  * A producer of SyntaxChecker objects for the nis schema.  This code has been
  * automatically generated using schema files in the OpenLDAP format along with
@@ -46,12 +45,10 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         SyntaxChecker syntaxChecker;
 

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxCheckerProducer.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/NisSyntaxProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.java Sun Feb 19 19:57:02 2006
@@ -44,12 +44,10 @@
     // BootstrapProducer Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see org.apache.directory.server.core.schema.bootstrap.BootstrapProducer#produce(org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries, org.apache.directory.server.core.schema.bootstrap.ProducerCallback)
      */
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-        throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         BootstrapSyntax syntax;
         SyntaxCheckerRegistry syntaxCheckerRegistry = registries.getSyntaxCheckerRegistry();
@@ -57,13 +55,15 @@
         // 1.3.6.1.1.1.0.0 - RFC2307 NIS Netgroup Triple
         syntax = new BootstrapSyntax( "1.3.6.1.1.1.0.0", syntaxCheckerRegistry );
         syntax.setDescription( "RFC2307 NIS Netgroup Triple" );
-        syntax.setNames( new String[] { "NIS Netgroup Triple" } );
+        syntax.setNames( new String[]
+            { "NIS Netgroup Triple" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         // 1.3.6.1.1.1.0.1 - RFC2307 Boot Parameter Syntax
         syntax = new BootstrapSyntax( "1.3.6.1.1.1.0.1", syntaxCheckerRegistry );
-        syntax.setNames( new String[] { "NIS Boot Parameter" } );
+        syntax.setNames( new String[]
+            { "NIS Boot Parameter" } );
         syntax.setHumanReadible( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NisSyntaxProducer.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/ProducerCallback.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java Sun Feb 19 19:57:02 2006
@@ -37,7 +37,6 @@
      * @throws NamingException if there are problems registering these objects
      * with bootstrap registries
      */
-    void schemaObjectProduced( BootstrapProducer producer,
-                               String registryKey, Object schemaObject )
+    void schemaObjectProduced( BootstrapProducer producer, String registryKey, Object schemaObject )
         throws NamingException;
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.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/SystemComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java Sun Feb 19 19:57:02 2006
@@ -46,184 +46,177 @@
     }
 
 
-    public void produce( BootstrapRegistries registries, ProducerCallback cb )
-            throws NamingException
+    public void produce( BootstrapRegistries registries, ProducerCallback cb ) throws NamingException
     {
         Comparator comparator;
 
         /*
          * Straight out of RFC 2252: Section 8
          * =======================================
-        ( 2.5.13.0 NAME 'objectIdentifierMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+         ( 2.5.13.0 NAME 'objectIdentifierMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
          */
-         comparator = new ObjectIdentifierComparator();
-         cb.schemaObjectProduced( this, "2.5.13.0", comparator );
+        comparator = new ObjectIdentifierComparator();
+        cb.schemaObjectProduced( this, "2.5.13.0", comparator );
 
         /*
-        ( 2.5.13.1 NAME 'distinguishedNameMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-          */
-         comparator = new DnComparator( new ConcreteNameComponentNormalizer(
-                 registries.getAttributeTypeRegistry() ) );
-         cb.schemaObjectProduced( this, "2.5.13.1", comparator );
-
-         /*
-        ( 2.5.13.2 NAME 'caseIgnoreMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.2", comparator );
-
-         /*
-        ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.3", comparator );
+         ( 2.5.13.1 NAME 'distinguishedNameMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+         */
+        comparator = new DnComparator( new ConcreteNameComponentNormalizer( registries.getAttributeTypeRegistry() ) );
+        cb.schemaObjectProduced( this, "2.5.13.1", comparator );
+
+        /*
+         ( 2.5.13.2 NAME 'caseIgnoreMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "2.5.13.2", comparator );
 
-         /*
-        ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
+        /*
+         ( 2.5.13.3 NAME 'caseIgnoreOrderingMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "2.5.13.3", comparator );
+
+        /*
+         ( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch'
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
-         comparator = new NormalizingComparator(
-                new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.4", comparator );
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "2.5.13.4", comparator );
 
         /*
          ( 2.5.13.6 NAME 'caseExactOrderingMatch'
-           SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.6", comparator );
+
+        /*
+         ( 2.5.13.8 NAME 'numericStringMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.8", comparator );
+
+        /*
+         ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.6", comparator );
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.10", comparator );
 
         /*
-        ( 2.5.13.8 NAME 'numericStringMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.8", comparator );
-
-         /*
-        ( 2.5.13.10 NAME 'numericStringSubstringsMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.10", comparator );
-
-         /*
-        ( 2.5.13.11 NAME 'caseIgnoreListMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.11", comparator );
+         ( 2.5.13.11 NAME 'caseIgnoreListMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "2.5.13.11", comparator );
 
         /*
-       ( 2.5.13.14 NAME 'integerMatch'
+         ( 2.5.13.14 NAME 'integerMatch'
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, "2.5.13.14", comparator );
 
         /*
-       ( 2.5.13.14 NAME 'integerOrderingMatch'
+         ( 2.5.13.14 NAME 'integerOrderingMatch'
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, "2.5.13.15", comparator );
 
         /*
-       ( 2.5.13.16 NAME 'bitStringMatch'
+         ( 2.5.13.16 NAME 'bitStringMatch'
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, "2.5.13.16", comparator );
 
         /*
-       ( 2.5.13.17 NAME 'octetStringMatch'
+         ( 2.5.13.17 NAME 'octetStringMatch'
          SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
          */
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, "2.5.13.17", comparator );
 
         /*
-        ( 2.5.13.18 NAME 'octetStringOrderingMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.18", comparator );
-
-         /*
-        ( 2.5.13.20 NAME 'telephoneNumberMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.20", comparator );
-
-         /*
-        ( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.21", comparator );
-
-         /*
-        ( 2.5.13.22 NAME 'presentationAddressMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.22", comparator );
-
-         /*
-        ( 2.5.13.23 NAME 'uniqueMemberMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "2.5.13.23", comparator );
-
-         /*
-        ( 2.5.13.24 NAME 'protocolInformationMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.24", comparator );
-
-         /*
-        ( 2.5.13.27 NAME 'generalizedTimeMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.27", comparator );
-
-         /*
-        ( 2.5.13.28 NAME 'generalizedTimeOrderingMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.28", comparator );
-
-         /*
-        ( 2.5.13.29 NAME 'integerFirstComponentMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.29", comparator );
-
-         /*
-        ( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
-          */
-         comparator = new ComparableComparator();
-         cb.schemaObjectProduced( this, "2.5.13.30", comparator );
+         ( 2.5.13.18 NAME 'octetStringOrderingMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.18", comparator );
+
+        /*
+         ( 2.5.13.20 NAME 'telephoneNumberMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.20", comparator );
+
+        /*
+         ( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.21", comparator );
+
+        /*
+         ( 2.5.13.22 NAME 'presentationAddressMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.22", comparator );
+
+        /*
+         ( 2.5.13.23 NAME 'uniqueMemberMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "2.5.13.23", comparator );
+
+        /*
+         ( 2.5.13.24 NAME 'protocolInformationMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.24", comparator );
+
+        /*
+         ( 2.5.13.27 NAME 'generalizedTimeMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.27", comparator );
+
+        /*
+         ( 2.5.13.28 NAME 'generalizedTimeOrderingMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.28", comparator );
+
+        /*
+         ( 2.5.13.29 NAME 'integerFirstComponentMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.29", comparator );
+
+        /*
+         ( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )
+         */
+        comparator = new ComparableComparator();
+        cb.schemaObjectProduced( this, "2.5.13.30", comparator );
 
         /*
          * Straight out of RFC 3698: Section 2.6
@@ -235,30 +228,28 @@
         comparator = new ComparableComparator();
         cb.schemaObjectProduced( this, "2.5.13.31", comparator );
 
-         /*
-        ( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.1", comparator );
-
-         /*
-        ( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match'
-          SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-          */
-         comparator = new NormalizingComparator(
-                 new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
-                 new ComparableComparator() );
-         cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.2", comparator );
+        /*
+         ( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.1", comparator );
+
+        /*
+         ( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match'
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+         */
+        comparator = new NormalizingComparator( new CachingNormalizer( new DeepTrimToLowerNormalizer() ),
+            new ComparableComparator() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.109.114.2", comparator );
 
         /*
          * MatchingRules from section 2 of http://www.faqs.org/rfcs/rfc3698.html
          * for Additional MatchingRules
 
          ( 2.5.13.13 NAME 'booleanMatch'
-           SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+         SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
          */
 

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

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