directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [21/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/NormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistry.java Sun Feb 19 19:57:02 2006
@@ -1,71 +1,74 @@
-/*
- *   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.Normalizer;
-
-
-/**
- * Normalizer registry service interface.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public interface NormalizerRegistry
-{
-    /**
-     * Registers a Normalizer with this registry.
-     * 
-     * @param schema the name of the schema the Normalizer is associated with
-     * @param normalizer the Normalizer to register
-     * @throws NamingException if the Normalizer is already registered or the
-     *      registration operation is not supported
-     */
-    void register( String schema, String oid, Normalizer normalizer ) throws NamingException;
-    
-    /**
-     * Looks up a Normalizer by its unique Object Identifier.
-     * 
-     * @param oid the object identifier
-     * @return the Normalizer for the oid
-     * @throws NamingException if there is a backing store failure or the 
-     *      Normalizer does not exist.
-     */
-    Normalizer lookup( String oid ) throws NamingException;
-
-    /**
-     * Gets the name of the schema this schema object is associated with.
-     *
-     * @param oid the object identifier
-     * @return the schema name
-     * @throws NamingException if the schema object does not exist
-     */
-    String getSchemaName( String oid ) throws NamingException;
-
-    /**
-     * Checks to see if a Normalizer exists.  Backing store failures simply 
-     * return false.
-     * 
-     * @param oid the object identifier
-     * @return true if a Normalizer definition exists for the oid, false 
-     *      otherwise
-     */
-    boolean hasNormalizer( String oid );
-}
+/*
+ *   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.Normalizer;
+
+
+/**
+ * Normalizer registry service interface.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface NormalizerRegistry
+{
+    /**
+     * Registers a Normalizer with this registry.
+     * 
+     * @param schema the name of the schema the Normalizer is associated with
+     * @param normalizer the Normalizer to register
+     * @throws NamingException if the Normalizer is already registered or the
+     *      registration operation is not supported
+     */
+    void register( String schema, String oid, Normalizer normalizer ) throws NamingException;
+
+
+    /**
+     * Looks up a Normalizer by its unique Object Identifier.
+     * 
+     * @param oid the object identifier
+     * @return the Normalizer for the oid
+     * @throws NamingException if there is a backing store failure or the 
+     *      Normalizer does not exist.
+     */
+    Normalizer lookup( String oid ) throws NamingException;
+
+
+    /**
+     * Gets the name of the schema this schema object is associated with.
+     *
+     * @param oid the object identifier
+     * @return the schema name
+     * @throws NamingException if the schema object does not exist
+     */
+    String getSchemaName( String oid ) throws NamingException;
+
+
+    /**
+     * Checks to see if a Normalizer exists.  Backing store failures simply 
+     * return false.
+     * 
+     * @param oid the object identifier
+     * @return true if a Normalizer definition exists for the oid, false 
+     *      otherwise
+     */
+    boolean hasNormalizer( String oid );
+}

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistry.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/NormalizerRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -1,65 +1,68 @@
-/*
- *   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.Normalizer;
-
-
-/**
- * Monitor interface for a NormalizerRegistry.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public interface NormalizerRegistryMonitor
-{
-    /**
-     * Monitors when a Normalizer is registered successfully.
-     * 
-     * @param oid
-     * @param normalizer the Normalizer registered
-     */
-    void registered( String oid, Normalizer normalizer );
-
-    /**
-     * Monitors when a Normalizer is successfully looked up.
-     * 
-     * @param oid
-     * @param normalizer the Normalizer looked up
-     */
-    void lookedUp( String oid, Normalizer normalizer );
-
-    /**
-     * Monitors when a lookup attempt fails.
-     * 
-     * @param oid the OID for the Normalizer 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 oid
-     * @param normalizer the Normalizer which failed registration
-     * @param fault the exception to be thrown for the fault
-     */
-    void registerFailed( String oid, Normalizer normalizer, 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.Normalizer;
+
+
+/**
+ * Monitor interface for a NormalizerRegistry.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface NormalizerRegistryMonitor
+{
+    /**
+     * Monitors when a Normalizer is registered successfully.
+     * 
+     * @param oid
+     * @param normalizer the Normalizer registered
+     */
+    void registered( String oid, Normalizer normalizer );
+
+
+    /**
+     * Monitors when a Normalizer is successfully looked up.
+     * 
+     * @param oid
+     * @param normalizer the Normalizer looked up
+     */
+    void lookedUp( String oid, Normalizer normalizer );
+
+
+    /**
+     * Monitors when a lookup attempt fails.
+     * 
+     * @param oid the OID for the Normalizer 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 oid
+     * @param normalizer the Normalizer which failed registration
+     * @param fault the exception to be thrown for the fault
+     */
+    void registerFailed( String oid, Normalizer normalizer, NamingException fault );
+}

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

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

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/NormalizerRegistryMonitorAdapter.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/ObjectClassRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassRegistry.java Sun Feb 19 19:57:02 2006
@@ -42,6 +42,7 @@
      */
     void register( String schema, ObjectClass objectClass ) throws NamingException;
 
+
     /**
      * Looks up an objectClass by its unique Object Identifier or by name.
      *
@@ -51,6 +52,7 @@
      */
     ObjectClass lookup( String id ) throws NamingException;
 
+
     /**
      * Gets the name of the schema this schema object is associated with.
      *
@@ -60,6 +62,7 @@
      */
     String getSchemaName( String id ) throws NamingException;
 
+
     /**
      * Checks to see if an objectClass exists.
      *
@@ -68,6 +71,7 @@
      * otherwise
      */
     boolean hasObjectClass( String id );
+
 
     /**
      * Gets an Iterator over the ObjectClasses within this ObjectClassRegistry.

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

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

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

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

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassRegistryMonitorAdapter.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/ObjectFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectFactoryRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectFactoryRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectFactoryRegistry.java Sun Feb 19 19:57:02 2006
@@ -45,6 +45,7 @@
      */
     ServerDirObjectFactory getObjectFactories( LdapContext ctx ) throws NamingException;
 
+
     /**
      * Registers a server-side object factory with this registry.
      *

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectFactoryRegistry.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/OidRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistry.java Sun Feb 19 19:57:02 2006
@@ -42,6 +42,7 @@
      */
     String getOid( String name ) throws NamingException;
 
+
     /**
      * Checks to see if an identifier, oid or name exists within this registry.
      *
@@ -50,6 +51,7 @@
      */
     boolean hasOid( String id );
 
+
     /**
      * Gets the primary name associated with an OID.  The primary name is the
      * first name specified for the OID.
@@ -59,7 +61,8 @@
      * @throws NamingException if oid does not exist
      */
     String getPrimaryName( String oid ) throws NamingException;
-    
+
+
     /**
      * Gets the names associated with an OID.  An OID is unique however it may 
      * have many names used to refer to it.  A good example is the cn and
@@ -73,14 +76,16 @@
      * @throws NamingException if oid does not exist
      */
     List getNameSet( String oid ) throws NamingException;
-    
+
+
     /**
      * Lists all the OIDs within the registry.  This may be a really big list.
      * 
      * @return all the OIDs registered
      */
     Iterator list();
-    
+
+
     /**
      * Adds an OID name pair to the registry.
      * 
@@ -88,12 +93,14 @@
      * @param oid the OID to add or associate a new name with
      */
     void register( String name, String oid );
-    
+
+
     /**
      * Get the map of all the oids by their name
      * @return The Map that contains all the oids
      */
     public Map getOidByName();
+
 
     /**
      * Get the map of all the oids by their name

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistry.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/OidRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -37,7 +37,8 @@
      * @param oid the OID argument and return value
      */
     void getOidWithOid( String oid );
-    
+
+
     /**
      * Monitors when an OID is resolved successfully for a name.
      *  
@@ -45,7 +46,8 @@
      * @param oid the OID returned for the name
      */
     void oidResolved( String name, String oid );
-    
+
+
     /**
      * Monitors when an OID is resolved successfully by using a normalized form
      * of the name.
@@ -55,7 +57,8 @@
      * @param oid the OID returned for the name
      */
     void oidResolved( String name, String normalized, String oid );
-    
+
+
     /**
      * Monitors when resolution of an OID by name fails.
      * 
@@ -63,7 +66,8 @@
      * @param fault the exception thrown for the failure after this call
      */
     void oidResolutionFailed( String name, NamingException fault );
-    
+
+
     /**
      * Monitors when a name lookups fail due to the use of an unknown OID.
      *  
@@ -71,7 +75,8 @@
      * @param fault the exception thrown for the failure after this call
      */
     void oidDoesNotExist( String oid, NamingException fault );
-    
+
+
     /**
      * Monitors situations where a primary name is resolved for a OID.
      * 
@@ -80,6 +85,7 @@
      */
     void nameResolved( String oid, String primaryName );
 
+
     /**
      * Monitors situations where a names are resolved for a OID.
      * 
@@ -87,7 +93,8 @@
      * @param names the names found for the OID
      */
     void namesResolved( String oid, List names );
-    
+
+
     /**
      * Monitors the successful registration of a name for an OID.
      * 

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistryMonitor.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/OidRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistryMonitorAdapter.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistryMonitorAdapter.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistryMonitorAdapter.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.core.schema;
 
+
 import java.util.List;
 
 import javax.naming.NamingException;
@@ -34,6 +35,7 @@
 {
     private static final Logger log = LoggerFactory.getLogger( OidRegistryMonitorAdapter.class );
 
+
     /* (non-Javadoc)
      * @see org.apache.directory.server.schema.OidRegistryMonitor#getOidWithOid(
      * java.lang.String)
@@ -42,7 +44,7 @@
     {
     }
 
-    
+
     /* (non-Javadoc)
      * @see org.apache.directory.server.schema.OidRegistryMonitor#oidResolved(
      * java.lang.String, java.lang.String)
@@ -50,7 +52,7 @@
     public void oidResolved( String name, String oid )
     {
     }
-    
+
 
     /* (non-Javadoc)
      * @see org.apache.directory.server.schema.OidRegistryMonitor#oidResolved(
@@ -60,7 +62,7 @@
     {
     }
 
-    
+
     /* (non-Javadoc)
      * @see org.apache.directory.server.schema.OidRegistryMonitor#oidResolutionFailed(
      * java.lang.String, javax.naming.NamingException)
@@ -73,7 +75,7 @@
         }
     }
 
-    
+
     /* (non-Javadoc)
      * @see org.apache.directory.server.schema.OidRegistryMonitor#oidDoesNotExist(
      * java.lang.String, javax.naming.NamingException)
@@ -86,7 +88,7 @@
         }
     }
 
-    
+
     /* (non-Javadoc)
      * @see org.apache.directory.server.schema.OidRegistryMonitor#nameResolved(
      * java.lang.String, java.lang.String)
@@ -95,7 +97,7 @@
     {
     }
 
-    
+
     /* (non-Javadoc)
      * @see org.apache.directory.server.schema.OidRegistryMonitor#namesResolved(
      * java.lang.String, java.util.List)
@@ -104,7 +106,7 @@
     {
     }
 
-    
+
     /* (non-Javadoc)
      * @see org.apache.directory.server.schema.OidRegistryMonitor#registered(
      * java.lang.String, java.lang.String)

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/OidRegistryMonitorAdapter.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/Registries.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/Registries.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/SchemaChecker.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Sun Feb 19 19:57:02 2006
@@ -48,6 +48,7 @@
     /** the SLF4J logger for this class */
     private static Logger log = LoggerFactory.getLogger( SchemaChecker.class );
 
+
     /**
      * Makes sure modify operations do not leave the entry without a STRUCTURAL
      * objectClass.  At least one STRUCTURAL objectClass must be specified for
@@ -62,15 +63,14 @@
      * without a STRUCTURAL objectClass
      */
     public static void preventStructuralClassRemovalOnModifyReplace( ObjectClassRegistry registry, Name name, int mod,
-                                                                     Attribute attribute )
-            throws NamingException
+        Attribute attribute ) throws NamingException
     {
         if ( mod != DirContext.REPLACE_ATTRIBUTE )
         {
             return;
         }
 
-        if ( ! "objectclass".equalsIgnoreCase( attribute.getID() ) )
+        if ( !"objectclass".equalsIgnoreCase( attribute.getID() ) )
         {
             return;
         }
@@ -122,8 +122,7 @@
      * without a STRUCTURAL objectClass
      */
     public static void preventStructuralClassRemovalOnModifyReplace( ObjectClassRegistry registry, Name name, int mod,
-                                                                     Attributes attributes )
-            throws NamingException
+        Attributes attributes ) throws NamingException
     {
         if ( mod != DirContext.REPLACE_ATTRIBUTE )
         {
@@ -184,15 +183,14 @@
      * without a STRUCTURAL objectClass
      */
     public static void preventStructuralClassRemovalOnModifyRemove( ObjectClassRegistry registry, Name name, int mod,
-                                                                    Attribute attribute, Attribute entryObjectClasses )
-            throws NamingException
+        Attribute attribute, Attribute entryObjectClasses ) throws NamingException
     {
         if ( mod != DirContext.REMOVE_ATTRIBUTE )
         {
             return;
         }
 
-        if ( ! "objectclass".equalsIgnoreCase( attribute.getID() ) )
+        if ( !"objectclass".equalsIgnoreCase( attribute.getID() ) )
         {
             return;
         }
@@ -255,8 +253,7 @@
      * without a STRUCTURAL objectClass
      */
     public static void preventStructuralClassRemovalOnModifyRemove( ObjectClassRegistry registry, Name name, int mod,
-                                                                    Attributes attributes, Attribute entryObjectClasses )
-            throws NamingException
+        Attributes attributes, Attribute entryObjectClasses ) throws NamingException
     {
         if ( mod != DirContext.REMOVE_ATTRIBUTE )
         {
@@ -332,7 +329,7 @@
      * @throws NamingException if the modify operation is removing an Rdn attribute
      */
     public static void preventRdnChangeOnModifyReplace( Name name, int mod, Attribute attribute )
-            throws NamingException
+        throws NamingException
     {
         if ( mod != DirContext.REPLACE_ATTRIBUTE )
         {
@@ -342,7 +339,7 @@
         Set rdnAttributes = getRdnAttributes( name );
         String id = ( String ) attribute.getID();
 
-        if ( ! rdnAttributes.contains( id ) )
+        if ( !rdnAttributes.contains( id ) )
         {
             return;
         }
@@ -370,7 +367,7 @@
         {
             // if the old rdn value is not in the rdn attribute then
             // we must complain with a schema violation
-            if ( ! attribute.contains( rdnValue ) )
+            if ( !attribute.contains( rdnValue ) )
             {
                 String msg = "Modify operation attempts to delete RDN attribute values in use for ";
                 msg += id + " on entry " + name + " and violates schema constraints";
@@ -405,7 +402,7 @@
      * @throws NamingException if the modify operation is removing an Rdn attribute
      */
     public static void preventRdnChangeOnModifyReplace( Name name, int mod, Attributes attributes )
-            throws NamingException
+        throws NamingException
     {
         if ( mod != DirContext.REPLACE_ATTRIBUTE )
         {
@@ -444,7 +441,7 @@
                 {
                     // if the old rdn value is not in the rdn attribute then
                     // we must complain with a schema violation
-                    if ( ! rdnAttr.contains( rdnValue ) )
+                    if ( !rdnAttr.contains( rdnValue ) )
                     {
                         String msg = "Modify operation attempts to delete RDN attribute values in use for ";
                         msg += id + " on entry " + name + " and violates schema constraints";
@@ -480,8 +477,7 @@
      * @param attribute the attribute being modified
      * @throws NamingException if the modify operation is removing an Rdn attribute
      */
-    public static void preventRdnChangeOnModifyRemove( Name name, int mod, Attribute attribute )
-            throws NamingException
+    public static void preventRdnChangeOnModifyRemove( Name name, int mod, Attribute attribute ) throws NamingException
     {
         if ( mod != DirContext.REMOVE_ATTRIBUTE )
         {
@@ -491,7 +487,7 @@
         Set rdnAttributes = getRdnAttributes( name );
         String id = attribute.getID();
 
-        if ( ! rdnAttributes.contains( id ) )
+        if ( !rdnAttributes.contains( id ) )
         {
             return;
         }
@@ -552,7 +548,7 @@
      * @throws NamingException if the modify operation is removing an Rdn attribute
      */
     public static void preventRdnChangeOnModifyRemove( Name name, int mod, Attributes attributes )
-            throws NamingException
+        throws NamingException
     {
         if ( mod != DirContext.REMOVE_ATTRIBUTE )
         {
@@ -618,7 +614,7 @@
      */
     private static String getRdnValue( String id, Name name ) throws NamingException
     {
-        String [] comps = NamespaceTools.getCompositeComponents( name.get( name.size() - 1 ) );
+        String[] comps = NamespaceTools.getCompositeComponents( name.get( name.size() - 1 ) );
 
         for ( int ii = 0; ii < comps.length; ii++ )
         {
@@ -644,7 +640,7 @@
      */
     private static Set getRdnAttributes( Name name ) throws NamingException
     {
-        String [] comps = NamespaceTools.getCompositeComponents( name.get( name.size() - 1 ) );
+        String[] comps = NamespaceTools.getCompositeComponents( name.get( name.size() - 1 ) );
         Set attributes = new HashSet();
 
         for ( int ii = 0; ii < comps.length; ii++ )

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

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

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Sun Feb 19 19:57:02 2006
@@ -91,16 +91,16 @@
      * a binary attribute tranforming filter: String -> byte[]
      */
     private BinaryAttributeFilter binaryAttributeFilter;
-    
+
     private TopFilter topFilter;
-    
+
     private List filters = new ArrayList();
 
     /**
      * the global schema object registries
      */
     private GlobalRegistries globalRegistries;
-    
+
     private Set binaries;
 
     /**
@@ -113,6 +113,7 @@
      */
     private String startUpTimeStamp;
 
+
     /**
      * Creates a schema service interceptor.
      */
@@ -160,9 +161,8 @@
     }
 
 
-    public NamingEnumeration search( NextInterceptor nextInterceptor,
-                                     Name base, Map env, ExprNode filter,
-                                     SearchControls searchCtls ) throws NamingException
+    public NamingEnumeration search( NextInterceptor nextInterceptor, Name base, Map env, ExprNode filter,
+        SearchControls searchCtls ) throws NamingException
     {
         // check to make sure the DN searched for is a subentry
         if ( !subschemaSubentryDn.equals( base.toString() ) )
@@ -177,15 +177,12 @@
             return new SearchResultFilteringEnumeration( e, searchCtls, invocation, filters );
         }
 
-        if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE &&
-                filter instanceof SimpleNode )
+        if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE && filter instanceof SimpleNode )
         {
             SimpleNode node = ( SimpleNode ) filter;
 
-            if ( node.getAttribute().equalsIgnoreCase( "objectClass" ) &&
-                    node.getValue().equalsIgnoreCase( "subschema" ) &&
-                    node.getAssertionType() == SimpleNode.EQUALITY
-            )
+            if ( node.getAttribute().equalsIgnoreCase( "objectClass" )
+                && node.getValue().equalsIgnoreCase( "subschema" ) && node.getAssertionType() == SimpleNode.EQUALITY )
             {
                 // call.setBypass( true );
                 Attributes attrs = getSubschemaEntry( searchCtls.getReturningAttributes() );
@@ -193,8 +190,7 @@
                 return new SingletonEnumeration( result );
             }
         }
-        else if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE &&
-                    filter instanceof PresenceNode )
+        else if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE && filter instanceof PresenceNode )
         {
             PresenceNode node = ( PresenceNode ) filter;
 
@@ -337,7 +333,6 @@
         // timeestamps are hacks for now until the schema is actually updateable these
         // use the servers startup time stamp for both modify and create timestamps
 
-
         if ( returnAllOperationalAttributes || set.contains( "createtimestamp" ) )
         {
             attr = new LockableAttributeImpl( "createTimestamp" );
@@ -436,7 +431,7 @@
         OidRegistry oidRegistry = globalRegistries.getOidRegistry();
         ObjectClassRegistry registry = globalRegistries.getObjectClassRegistry();
 
-        if ( ! oidRegistry.hasOid( attrId ) )
+        if ( !oidRegistry.hasOid( attrId ) )
         {
             return false;
         }
@@ -512,20 +507,20 @@
             return new LockableAttributeImpl( "objectClasses" );
         }
 
-        switch( modOp )
+        switch ( modOp )
         {
-            case( DirContext.ADD_ATTRIBUTE ):
+            case ( DirContext.ADD_ATTRIBUTE  ):
                 return AttributeUtils.getUnion( existing, changes );
-            case( DirContext.REPLACE_ATTRIBUTE ):
+            case ( DirContext.REPLACE_ATTRIBUTE  ):
                 return ( Attribute ) changes.clone();
-            case( DirContext.REMOVE_ATTRIBUTE ):
+            case ( DirContext.REMOVE_ATTRIBUTE  ):
                 return AttributeUtils.getDifference( existing, changes );
             default:
                 throw new InternalError( "" );
         }
     }
-    
-    
+
+
     /**
      * Given the objectClasses for an entry, this method adds missing ancestors 
      * in the hierarchy except for top which it removes.  This is used for this
@@ -535,24 +530,25 @@
      * @param objectClassAttr the objectClass attribute to modify
      * @throws NamingException if there are problems 
      */
-    public static void alterObjectClasses( Attribute objectClassAttr, ObjectClassRegistry registry ) throws NamingException
+    public static void alterObjectClasses( Attribute objectClassAttr, ObjectClassRegistry registry )
+        throws NamingException
     {
-        if ( ! objectClassAttr.getID().equalsIgnoreCase( "objectClass" ) )
+        if ( !objectClassAttr.getID().equalsIgnoreCase( "objectClass" ) )
         {
-            throw new LdapNamingException( "Expecting an objectClass attribute but got " + objectClassAttr.getID(), 
+            throw new LdapNamingException( "Expecting an objectClass attribute but got " + objectClassAttr.getID(),
                 ResultCodeEnum.OPERATIONSERROR );
         }
-        
+
         Set objectClasses = new HashSet();
         for ( int ii = 0; ii < objectClassAttr.size(); ii++ )
         {
             String val = ( String ) objectClassAttr.get( ii );
-            if ( ! val.equalsIgnoreCase( "top" ) )
+            if ( !val.equalsIgnoreCase( "top" ) )
             {
                 objectClasses.add( val.toLowerCase() );
             }
         }
-        
+
         for ( int ii = 0; ii < objectClassAttr.size(); ii++ )
         {
             String val = ( String ) objectClassAttr.get( ii );
@@ -560,15 +556,15 @@
             {
                 objectClassAttr.remove( val );
             }
-            
+
             ObjectClass objectClass = registry.lookup( val );
-            
+
             // cannot use Collections.addAll(Collection, Object[]) since it's 1.5
             ObjectClass top = registry.lookup( "top" );
             ObjectClass[] superiors = objectClass.getSuperClasses();
             for ( int jj = 0; jj < superiors.length; jj++ )
             {
-                if ( superiors[jj] != top && ! objectClasses.contains( superiors[jj].getName().toLowerCase() ) )
+                if ( superiors[jj] != top && !objectClasses.contains( superiors[jj].getName().toLowerCase() ) )
                 {
                     objectClassAttr.add( superiors[jj].getName() );
                 }
@@ -580,7 +576,7 @@
     public void modify( NextInterceptor next, Name name, int modOp, Attributes mods ) throws NamingException
     {
         Attributes entry = nexus.lookup( name );
-        Attribute objectClass = getResultantObjectClasses( modOp, mods.get( "objectClass"), entry.get( "objectClass" ) );
+        Attribute objectClass = getResultantObjectClasses( modOp, mods.get( "objectClass" ), entry.get( "objectClass" ) );
         ObjectClassRegistry ocRegistry = this.globalRegistries.getObjectClassRegistry();
         AttributeTypeRegistry atRegistry = this.globalRegistries.getAttributeTypeRegistry();
 
@@ -590,7 +586,7 @@
             String id = ( String ) changes.next();
             Attribute change = mods.get( id );
 
-            if ( ! atRegistry.hasAttributeType( change.getID() ) && ! objectClass.contains( "extensibleObject" ) )
+            if ( !atRegistry.hasAttributeType( change.getID() ) && !objectClass.contains( "extensibleObject" ) )
             {
                 throw new LdapInvalidAttributeIdentifierException( "unrecognized attributeID " + change.getID() );
             }
@@ -602,9 +598,8 @@
 
             // for required attributes we need to check if all values are removed
             // if so then we have a schema violation that must be thrown
-            if ( modOp == DirContext.REMOVE_ATTRIBUTE &&
-                 isRequired( change.getID(), objectClass ) &&
-                 isCompleteRemoval( change, entry ) )
+            if ( modOp == DirContext.REMOVE_ATTRIBUTE && isRequired( change.getID(), objectClass )
+                && isCompleteRemoval( change, entry ) )
             {
                 throw new LdapSchemaViolationException( ResultCodeEnum.OBJECTCLASSVIOLATION );
             }
@@ -628,38 +623,38 @@
         {
             Attribute alteredObjectClass = ( Attribute ) objectClass.clone();
             alterObjectClasses( alteredObjectClass, ocRegistry );
-            
-            if ( ! alteredObjectClass.equals( objectClass ) )
+
+            if ( !alteredObjectClass.equals( objectClass ) )
             {
                 Attribute ocMods = mods.get( "objectClass" );
-                switch( modOp )
+                switch ( modOp )
                 {
-                    case( DirContext.ADD_ATTRIBUTE ):
+                    case ( DirContext.ADD_ATTRIBUTE  ):
                         if ( ocMods.contains( "top" ) )
                         {
                             ocMods.remove( "top" );
                         }
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( ! objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
                             {
                                 ocMods.add( alteredObjectClass.get( ii ) );
                             }
                         }
                         break;
-                    case( DirContext.REMOVE_ATTRIBUTE ):
+                    case ( DirContext.REMOVE_ATTRIBUTE  ):
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( ! objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
                             {
                                 ocMods.remove( alteredObjectClass.get( ii ) );
                             }
                         }
                         break;
-                    case( DirContext.REPLACE_ATTRIBUTE ):
+                    case ( DirContext.REPLACE_ATTRIBUTE  ):
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( ! objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
                             {
                                 ocMods.add( alteredObjectClass.get( ii ) );
                             }
@@ -669,7 +664,7 @@
                 }
             }
         }
-        
+
         next.modify( name, modOp, mods );
     }
 
@@ -679,14 +674,14 @@
         Attributes entry = nexus.lookup( name );
         Set modset = new HashSet();
         ModificationItem objectClassMod = null;
-                    
+
         for ( int ii = 0; ii < mods.length; ii++ )
         {
             if ( mods[ii].getAttribute().getID().equalsIgnoreCase( "objectclass" ) )
             {
                 objectClassMod = mods[ii];
             }
-            
+
             StringBuffer keybuf = new StringBuffer();
             keybuf.append( mods[ii].getModificationOp() );
             keybuf.append( mods[ii].getAttribute().getID() );
@@ -694,9 +689,9 @@
             {
                 keybuf.append( mods[ii].getAttribute().get( jj ) );
             }
-            if ( ! modset.add( keybuf.toString() ) && mods[ii].getModificationOp() == DirContext.ADD_ATTRIBUTE )
+            if ( !modset.add( keybuf.toString() ) && mods[ii].getModificationOp() == DirContext.ADD_ATTRIBUTE )
             {
-                throw new LdapAttributeInUseException( "found two copies of the following modification item: " 
+                throw new LdapAttributeInUseException( "found two copies of the following modification item: "
                     + mods[ii] );
             }
         }
@@ -708,8 +703,8 @@
         }
         else
         {
-            objectClass = getResultantObjectClasses( objectClassMod.getModificationOp(),
-                    objectClassMod.getAttribute(), entry.get( "objectClass" ) );
+            objectClass = getResultantObjectClasses( objectClassMod.getModificationOp(), objectClassMod.getAttribute(),
+                entry.get( "objectClass" ) );
         }
 
         ObjectClassRegistry ocRegistry = this.globalRegistries.getObjectClassRegistry();
@@ -720,7 +715,7 @@
             int modOp = mods[ii].getModificationOp();
             Attribute change = mods[ii].getAttribute();
 
-            if ( ! atRegistry.hasAttributeType( change.getID() ) && ! objectClass.contains( "extensibleObject" ) )
+            if ( !atRegistry.hasAttributeType( change.getID() ) && !objectClass.contains( "extensibleObject" ) )
             {
                 throw new LdapInvalidAttributeIdentifierException();
             }
@@ -739,7 +734,8 @@
                     throw new LdapSchemaViolationException( ResultCodeEnum.OBJECTCLASSVIOLATION );
                 }
                 SchemaChecker.preventRdnChangeOnModifyRemove( name, modOp, change );
-                SchemaChecker.preventStructuralClassRemovalOnModifyRemove( ocRegistry, name, modOp, change, objectClass );
+                SchemaChecker
+                    .preventStructuralClassRemovalOnModifyRemove( ocRegistry, name, modOp, change, objectClass );
             }
 
             if ( modOp == DirContext.REPLACE_ATTRIBUTE )
@@ -755,38 +751,38 @@
         {
             Attribute alteredObjectClass = ( Attribute ) objectClass.clone();
             alterObjectClasses( alteredObjectClass, ocRegistry );
-            
-            if ( ! alteredObjectClass.equals( objectClass ) )
+
+            if ( !alteredObjectClass.equals( objectClass ) )
             {
                 Attribute ocMods = objectClassMod.getAttribute();
-                switch( objectClassMod.getModificationOp() )
+                switch ( objectClassMod.getModificationOp() )
                 {
-                    case( DirContext.ADD_ATTRIBUTE ):
+                    case ( DirContext.ADD_ATTRIBUTE  ):
                         if ( ocMods.contains( "top" ) )
                         {
                             ocMods.remove( "top" );
                         }
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( ! objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
                             {
                                 ocMods.add( alteredObjectClass.get( ii ) );
                             }
                         }
                         break;
-                    case( DirContext.REMOVE_ATTRIBUTE ):
+                    case ( DirContext.REMOVE_ATTRIBUTE  ):
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( ! objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
                             {
                                 ocMods.remove( alteredObjectClass.get( ii ) );
                             }
                         }
                         break;
-                    case( DirContext.REPLACE_ATTRIBUTE ):
+                    case ( DirContext.REPLACE_ATTRIBUTE  ):
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( ! objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
                             {
                                 ocMods.add( alteredObjectClass.get( ii ) );
                             }
@@ -800,14 +796,14 @@
         next.modify( name, mods );
     }
 
-    
+
     private void filterTop( Attributes entry ) throws NamingException
     {
         // add top if objectClass is included and missing top
         Attribute oc = entry.get( "objectClass" );
         if ( oc != null )
         {
-            if ( ! oc.contains( "top" ) )
+            if ( !oc.contains( "top" ) )
             {
                 oc.add( "top" );
             }
@@ -818,13 +814,13 @@
     private void filterBinaryAttributes( Attributes entry ) throws NamingException
     {
         long t0 = -1;
-        
+
         if ( log.isDebugEnabled() )
         {
             t0 = System.currentTimeMillis();
-            log.debug( "Filtering entry " + AttributeUtils.toString( entry ) );  
+            log.debug( "Filtering entry " + AttributeUtils.toString( entry ) );
         }
-        
+
         /*
          * start converting values of attributes to byte[]s which are not
          * human readable and those that are in the binaries set
@@ -868,15 +864,14 @@
                 entry.put( binary );
             }
         }
-        
+
         if ( log.isDebugEnabled() )
         {
             long t1 = System.currentTimeMillis();
-            log.debug( "Time to filter entry = " + (t1 - t0) + " ms" );
+            log.debug( "Time to filter entry = " + ( t1 - t0 ) + " ms" );
         }
     }
 
-
     /**
      * A special filter over entry attributes which replaces Attribute String values with their respective byte[]
      * representations using schema information and the value held in the JNDI environment property:
@@ -887,7 +882,8 @@
      */
     private class BinaryAttributeFilter implements SearchResultFilter
     {
-        public boolean accept( Invocation invocation, SearchResult result, SearchControls controls ) throws NamingException
+        public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
+            throws NamingException
         {
             filterBinaryAttributes( result.getAttributes() );
             return true;
@@ -899,13 +895,15 @@
      */
     private class TopFilter implements SearchResultFilter
     {
-        public boolean accept( Invocation invocation, SearchResult result, SearchControls controls ) throws NamingException
+        public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
+            throws NamingException
         {
             filterTop( result.getAttributes() );
             return true;
         }
     }
 
+
     /**
      * Check that all the attributes exist in the schema for this entry.
      */
@@ -915,13 +913,13 @@
         NamingEnumeration attrEnum = attrs.getIDs();
         while ( attrEnum.hasMoreElements() )
         {
-            String name = (String)attrEnum.nextElement();
-            if ( ! atRegistry.hasAttributeType( name ) )
+            String name = ( String ) attrEnum.nextElement();
+            if ( !atRegistry.hasAttributeType( name ) )
             {
                 throw new LdapInvalidAttributeIdentifierException( name + " not found in attribute registry!" );
             }
         }
-        
+
         alterObjectClasses( attrs.get( "objectClass" ), this.globalRegistries.getObjectClassRegistry() );
         next.add( upName, normName, attrs );
     }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.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/SerializableComparator.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SerializableComparator.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SerializableComparator.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SerializableComparator.java Sun Feb 19 19:57:02 2006
@@ -47,7 +47,6 @@
     // S T A T I C   M E T H O D S
     // ------------------------------------------------------------------------
 
-
     /**
      * Sets the global Comparator registry for comparator lookups.
      *
@@ -63,8 +62,7 @@
     // C O N T R U C T O R S
     // ------------------------------------------------------------------------
 
-
-    public SerializableComparator( String matchingRuleOid )
+    public SerializableComparator(String matchingRuleOid)
     {
         this.matchingRuleOid = matchingRuleOid;
     }
@@ -73,7 +71,6 @@
     // ------------------------------------------------------------------------
     // C O M P A R A T O R   I M P L E M E N T A T I O N S
     // ------------------------------------------------------------------------
-
 
     /**
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SerializableComparator.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/StateFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/StateFactoryRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/StateFactoryRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/StateFactoryRegistry.java Sun Feb 19 19:57:02 2006
@@ -47,6 +47,7 @@
      */
     ServerDirStateFactory getStateFactories( Object obj ) throws NamingException;
 
+
     /**
      * Registers a server-side state factory with this registry.
      *

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/StateFactoryRegistry.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/SyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistry.java Sun Feb 19 19:57:02 2006
@@ -1,72 +1,74 @@
-/*
- *   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.SyntaxChecker;
-
-
-/**
- * SyntaxChecker registry component's service interface.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public interface SyntaxCheckerRegistry
-{
-    /**
-     * Registers a SyntaxChecker with this registry.
-     * 
-     * @param schema the name of the schema the SyntaxChecker is associated with
-     * @param syntaxChecker the SyntaxChecker to register
-     * @throws NamingException if the SyntaxChecker is already registered or the
-     *      registration operation is not supported
-     */
-    void register( String schema, String oid, SyntaxChecker syntaxChecker )
-        throws NamingException;
-    
-    /**
-     * Looks up a SyntaxChecker by its unique Object Identifier.
-     * 
-     * @param oid the object identifier
-     * @return the SyntaxChecker for the oid
-     * @throws NamingException if there is a backing store failure or the 
-     *      SyntaxChecker does not exist.
-     */
-    SyntaxChecker lookup( String oid ) throws NamingException;
-
-    /**
-     * Gets the name of the schema this schema object is associated with.
-     *
-     * @param oid the object identifier
-     * @return the schema name
-     * @throws NamingException if the schema object does not exist
-     */
-    String getSchemaName( String oid ) throws NamingException;
-
-    /**
-     * Checks to see if a SyntaxChecker exists.  Backing store failures simply 
-     * return false.
-     * 
-     * @param oid the object identifier
-     * @return true if a SyntaxChecker definition exists for the oid, false 
-     *      otherwise
-     */
-    boolean hasSyntaxChecker( String oid );
-}
+/*
+ *   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.SyntaxChecker;
+
+
+/**
+ * SyntaxChecker registry component's service interface.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface SyntaxCheckerRegistry
+{
+    /**
+     * Registers a SyntaxChecker with this registry.
+     * 
+     * @param schema the name of the schema the SyntaxChecker is associated with
+     * @param syntaxChecker the SyntaxChecker to register
+     * @throws NamingException if the SyntaxChecker is already registered or the
+     *      registration operation is not supported
+     */
+    void register( String schema, String oid, SyntaxChecker syntaxChecker ) throws NamingException;
+
+
+    /**
+     * Looks up a SyntaxChecker by its unique Object Identifier.
+     * 
+     * @param oid the object identifier
+     * @return the SyntaxChecker for the oid
+     * @throws NamingException if there is a backing store failure or the 
+     *      SyntaxChecker does not exist.
+     */
+    SyntaxChecker lookup( String oid ) throws NamingException;
+
+
+    /**
+     * Gets the name of the schema this schema object is associated with.
+     *
+     * @param oid the object identifier
+     * @return the schema name
+     * @throws NamingException if the schema object does not exist
+     */
+    String getSchemaName( String oid ) throws NamingException;
+
+
+    /**
+     * Checks to see if a SyntaxChecker exists.  Backing store failures simply 
+     * return false.
+     * 
+     * @param oid the object identifier
+     * @return true if a SyntaxChecker definition exists for the oid, false 
+     *      otherwise
+     */
+    boolean hasSyntaxChecker( String oid );
+}

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistry.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/SyntaxCheckerRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistryMonitor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistryMonitor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistryMonitor.java Sun Feb 19 19:57:02 2006
@@ -1,65 +1,68 @@
-/*
- *   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.SyntaxChecker;
-
-
-/**
- * Monitor interface for a SyntaxCheckerRegistry.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public interface SyntaxCheckerRegistryMonitor
-{
-    /**
-     * Monitors when a SyntaxChecker is registered successfully.
-     * 
-     * @param oid
-     * @param syntaxChecker the SyntaxChecker registered
-     */
-    void registered( String oid, SyntaxChecker syntaxChecker );
-
-    /**
-     * Monitors when a SyntaxChecker is successfully looked up.
-     * 
-     * @param oid
-     * @param syntaxChecker the SyntaxChecker looked up
-     */
-    void lookedUp( String oid, SyntaxChecker syntaxChecker );
-
-    /**
-     * Monitors when a lookup attempt fails.
-     * 
-     * @param oid the OID for the SyntaxChecker 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 oid
-     * @param syntaxChecker the SyntaxChecker which failed registration
-     * @param fault the exception to be thrown for the fault
-     */
-    void registerFailed( String oid, SyntaxChecker syntaxChecker, 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.SyntaxChecker;
+
+
+/**
+ * Monitor interface for a SyntaxCheckerRegistry.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public interface SyntaxCheckerRegistryMonitor
+{
+    /**
+     * Monitors when a SyntaxChecker is registered successfully.
+     * 
+     * @param oid
+     * @param syntaxChecker the SyntaxChecker registered
+     */
+    void registered( String oid, SyntaxChecker syntaxChecker );
+
+
+    /**
+     * Monitors when a SyntaxChecker is successfully looked up.
+     * 
+     * @param oid
+     * @param syntaxChecker the SyntaxChecker looked up
+     */
+    void lookedUp( String oid, SyntaxChecker syntaxChecker );
+
+
+    /**
+     * Monitors when a lookup attempt fails.
+     * 
+     * @param oid the OID for the SyntaxChecker 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 oid
+     * @param syntaxChecker the SyntaxChecker which failed registration
+     * @param fault the exception to be thrown for the fault
+     */
+    void registerFailed( String oid, SyntaxChecker syntaxChecker, NamingException fault );
+}

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

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

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxCheckerRegistryMonitorAdapter.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/SyntaxRegistry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistry.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SyntaxRegistry.java Sun Feb 19 19:57:02 2006
@@ -41,7 +41,8 @@
      * does not exist.
      */
     Syntax lookup( String id ) throws NamingException;
-    
+
+
     /**
      * Registers a Syntax with this registry.  
      * 
@@ -52,6 +53,7 @@
      */
     void register( String schema, Syntax syntax ) throws NamingException;
 
+
     /**
      * Gets the name of the schema this schema object is associated with.
      *
@@ -61,6 +63,7 @@
      */
     String getSchemaName( String id ) throws NamingException;
 
+
     /**
      * Checks to see if a Syntax exists.  Backing store failures simply return
      * false.
@@ -69,6 +72,7 @@
      * @return true if a Syntax definition exists for the id, false otherwise
      */
     boolean hasSyntax( String id );
+
 
     /**
      * Lists all the Syntaxes within this registry.

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

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