directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [11/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
Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.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/interceptor/InterceptorException.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorException.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorException.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorException.java Sun Feb 19 19:57:02 2006
@@ -42,7 +42,7 @@
      *
      * @param interceptor the Interceptor causing the failure
      */
-    public InterceptorException( Interceptor interceptor )
+    public InterceptorException(Interceptor interceptor)
     {
         this.interceptor = interceptor;
     }
@@ -54,7 +54,7 @@
      * @param interceptor the Interceptor causing the failure
      * @param explanation String explanation of why the Interceptor failed
      */
-    public InterceptorException( Interceptor interceptor, String explanation )
+    public InterceptorException(Interceptor interceptor, String explanation)
     {
         super( explanation );
         this.interceptor = interceptor;
@@ -67,7 +67,7 @@
      * @param interceptor the Interceptor causing the failure
      * @param rootCause   the root cause of this exception
      */
-    public InterceptorException( Interceptor interceptor, Throwable rootCause )
+    public InterceptorException(Interceptor interceptor, Throwable rootCause)
     {
         this( interceptor );
         super.setRootCause( rootCause );
@@ -81,8 +81,7 @@
      * @param explanation String explanation of why the Interceptor failed
      * @param rootCause   the root cause of this exception
      */
-    public InterceptorException( Interceptor interceptor, String explanation,
-                                 Throwable rootCause )
+    public InterceptorException(Interceptor interceptor, String explanation, Throwable rootCause)
     {
         this( interceptor, explanation );
         super.setRootCause( rootCause );

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorException.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/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Sun Feb 19 19:57:02 2006
@@ -1,137 +1,177 @@
-/*
- *   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.interceptor;
-
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.Name;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
-import javax.naming.directory.SearchControls;
-
-import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
-import org.apache.directory.shared.ldap.filter.ExprNode;
-
-
-/**
- * Represents the next {@link Interceptor} in the interceptor chain.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$, $Date$
- * @see Interceptor
- * @see InterceptorChain
- */
-public interface NextInterceptor
-{
-    /**
-     * Calls the next interceptor's {@link Interceptor#compare(NextInterceptor,Name,String,Object)}.
-     */
-    boolean compare(Name name, String oid, Object value ) throws NamingException;
-    
-    /**
-     * Calls the next interceptor's {@link Interceptor#getRootDSE(NextInterceptor)}.
-     */
-    Attributes getRootDSE() throws NamingException; 
-    /**
-     * Calls the next interceptor's {@link Interceptor#getMatchedName(NextInterceptor, Name, boolean)}.
-     */
-    Name getMatchedName( Name name, boolean normalized ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#getSuffix(NextInterceptor, Name, boolean)}.
-     */
-    Name getSuffix( Name name, boolean normalized ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#listSuffixes(NextInterceptor, boolean)}.
-     */
-    Iterator listSuffixes( boolean normalized ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link DirectoryPartitionNexus#addContextPartition(DirectoryPartitionConfiguration)}.
-     */
-    void addContextPartition( DirectoryPartitionConfiguration cfg ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link DirectoryPartitionNexus#removeContextPartition(Name)}.
-     */
-    void removeContextPartition( Name suffix ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#delete(NextInterceptor, Name)}.
-     */
-    void delete( Name name ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#add(NextInterceptor, String, Name, Attributes)}.
-     */
-    void add( String userProvidedName, Name normalizedName, Attributes entry ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#modify(NextInterceptor, Name, int, Attributes)}.
-     */
-    void modify( Name name, int modOp, Attributes attributes ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#modify(NextInterceptor, Name, ModificationItem[])}.
-     */
-    void modify( Name name, ModificationItem[] items ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#list(NextInterceptor, Name)}.
-     */
-    NamingEnumeration list( Name baseName ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#search(NextInterceptor, Name, Map, ExprNode, SearchControls)}.
-     */
-    NamingEnumeration search( Name baseName, Map environment, ExprNode filter,
-                              SearchControls searchControls ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#lookup(NextInterceptor, Name)}.
-     */
-    Attributes lookup( Name name ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#lookup(NextInterceptor, Name, String[])}.
-     */
-    Attributes lookup( Name name, String [] attrIds ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#hasEntry(NextInterceptor, Name)}.
-     */
-    boolean hasEntry( Name name ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#isSuffix(NextInterceptor, Name)}.
-     */
-    boolean isSuffix( Name name ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#modifyRn(NextInterceptor, Name, String, boolean)}.
-     */
-    void modifyRn( Name name, String newRn, boolean deleteOldRn ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#move(NextInterceptor, Name, Name)}.
-     */
-    void move( Name oldName, Name newParentName ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#move(NextInterceptor, Name, Name, String, boolean)}.
-     */
-    void move( Name oldName, Name newParentName, String newRn,
-               boolean deleteOldRn ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#bind(NextInterceptor, Name, byte[], List, String)
-     */
-    void bind( Name bindDn, byte[] credentials, List mechanisms, String saslAuthId ) throws NamingException;
-    /**
-     * Calls the next interceptor's {@link Interceptor#unbind(NextInterceptor, Name)
-     */
-    void unbind( Name bindDn ) throws NamingException;
-}
+/*
+ *   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.interceptor;
+
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+
+import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.shared.ldap.filter.ExprNode;
+
+
+/**
+ * Represents the next {@link Interceptor} in the interceptor chain.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ * @see Interceptor
+ * @see InterceptorChain
+ */
+public interface NextInterceptor
+{
+    /**
+     * Calls the next interceptor's {@link Interceptor#compare(NextInterceptor,Name,String,Object)}.
+     */
+    boolean compare( Name name, String oid, Object value ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#getRootDSE(NextInterceptor)}.
+     */
+    Attributes getRootDSE() throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#getMatchedName(NextInterceptor, Name, boolean)}.
+     */
+    Name getMatchedName( Name name, boolean normalized ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#getSuffix(NextInterceptor, Name, boolean)}.
+     */
+    Name getSuffix( Name name, boolean normalized ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#listSuffixes(NextInterceptor, boolean)}.
+     */
+    Iterator listSuffixes( boolean normalized ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link DirectoryPartitionNexus#addContextPartition(DirectoryPartitionConfiguration)}.
+     */
+    void addContextPartition( DirectoryPartitionConfiguration cfg ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link DirectoryPartitionNexus#removeContextPartition(Name)}.
+     */
+    void removeContextPartition( Name suffix ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#delete(NextInterceptor, Name)}.
+     */
+    void delete( Name name ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#add(NextInterceptor, String, Name, Attributes)}.
+     */
+    void add( String userProvidedName, Name normalizedName, Attributes entry ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#modify(NextInterceptor, Name, int, Attributes)}.
+     */
+    void modify( Name name, int modOp, Attributes attributes ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#modify(NextInterceptor, Name, ModificationItem[])}.
+     */
+    void modify( Name name, ModificationItem[] items ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#list(NextInterceptor, Name)}.
+     */
+    NamingEnumeration list( Name baseName ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#search(NextInterceptor, Name, Map, ExprNode, SearchControls)}.
+     */
+    NamingEnumeration search( Name baseName, Map environment, ExprNode filter, SearchControls searchControls )
+        throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#lookup(NextInterceptor, Name)}.
+     */
+    Attributes lookup( Name name ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#lookup(NextInterceptor, Name, String[])}.
+     */
+    Attributes lookup( Name name, String[] attrIds ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#hasEntry(NextInterceptor, Name)}.
+     */
+    boolean hasEntry( Name name ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#isSuffix(NextInterceptor, Name)}.
+     */
+    boolean isSuffix( Name name ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#modifyRn(NextInterceptor, Name, String, boolean)}.
+     */
+    void modifyRn( Name name, String newRn, boolean deleteOldRn ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#move(NextInterceptor, Name, Name)}.
+     */
+    void move( Name oldName, Name newParentName ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#move(NextInterceptor, Name, Name, String, boolean)}.
+     */
+    void move( Name oldName, Name newParentName, String newRn, boolean deleteOldRn ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#bind(NextInterceptor, Name, byte[], List, String)
+     */
+    void bind( Name bindDn, byte[] credentials, List mechanisms, String saslAuthId ) throws NamingException;
+
+
+    /**
+     * Calls the next interceptor's {@link Interceptor#unbind(NextInterceptor, Name)
+     */
+    void unbind( Name bindDn ) throws NamingException;
+}

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.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/invocation/Invocation.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.java Sun Feb 19 19:57:02 2006
@@ -1,180 +1,180 @@
-/*
- *   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.invocation;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Collection;
-
-import javax.naming.Context;
-
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
-
-
-/**
- * Represents a call from JNDI {@link Context} to {@link DirectoryPartitionNexus}.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$, $Date$
- */
-public class Invocation
-{
-    private final Context caller;
-    private final String name;
-    private final List parameters;
-    private final Collection bypassed;
-    private final DirectoryPartitionNexusProxy proxy;
-
-
-    /**
-     * Creates a new instance that represents an invocation without parameters.
-     * 
-     * @param caller the JNDI {@link Context} that made this invocation
-     * @param name the name of the called method
-     */
-    public Invocation( DirectoryPartitionNexusProxy proxy, Context caller, String name )
-    {
-        this( proxy, caller, name, null, Collections.EMPTY_SET );
-    }
-
-
-    /**
-     * Creates a new instance.
-     *
-     * @param caller the JNDI {@link Context} that made this invocation
-     * @param name the name of the called method
-     * @param parameters the array of parameters passed to the called method
-     */
-    public Invocation( DirectoryPartitionNexusProxy proxy, Context caller, String name, Object[] parameters )
-    {
-        this( proxy, caller, name, parameters, Collections.EMPTY_SET );
-    }
-
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param caller the JNDI {@link Context} that made this invocation
-     * @param name the name of the called method
-     * @param parameters the array of parameters passed to the called method
-     * @param bypassed the set of bypassed Interceptor names
-     */
-    public Invocation( DirectoryPartitionNexusProxy proxy, Context caller, String name, Object[] parameters,
-                       Collection bypassed )
-    {
-        if( proxy == null )
-        {
-            throw new NullPointerException( "proxy" );
-        }
-        if( caller == null )
-        {
-            throw new NullPointerException( "caller" );
-        }
-        if( name == null )
-        {
-            throw new NullPointerException( "name" );
-        }
-
-        if( parameters == null )
-        {
-            parameters = new Object[ 0 ];
-        }
-
-        if ( bypassed == null )
-        {
-            this.bypassed = Collections.EMPTY_SET;
-        }
-        else
-        {
-            this.bypassed = Collections.unmodifiableCollection( bypassed );
-        }
-
-        this.proxy = proxy;
-        this.caller = caller;
-        this.name = name;
-
-        List paramList = new ArrayList();
-        for( int i = 0; i < parameters.length; i++ )
-        {
-            paramList.add( parameters[ i ] );
-        }
-
-        this.parameters = Collections.unmodifiableList( paramList );
-    }
-
-
-    /**
-     * Returns the proxy object to the {@link DirectoryPartitionNexus}.
-     */
-    public DirectoryPartitionNexusProxy getProxy()
-    {
-        return proxy;
-    }
-
-
-    /**
-     * Returns the JNDI {@link Context} which made this invocation.
-     */
-    public Context getCaller()
-    {
-        return caller;
-    }
-
-
-    /**
-     * Returns the name of the called method.
-     */
-    public String getName()
-    {
-        return name;
-    }
-
-
-    /**
-     * Returns the list of parameters parameters passed to the called method.
-     */
-    public List getParameters()
-    {
-        return parameters;
-    }
-
-
-    /**
-     * Checks to see if an interceptor is bypassed.
-     *
-     * @param interceptorName the interceptorName of the interceptor to check for bypass
-     * @return true if the interceptor should be bypassed, false otherwise
-     */
-    public boolean isBypassed( String interceptorName )
-    {
-        return bypassed.contains( interceptorName );
-    }
-
-
-    /**
-     * Checks to see if any interceptors are bypassed by this Invocation.
-     *
-     * @return true if at least one bypass exists
-     */
-    public boolean hasBypass()
-    {
-        return !bypassed.isEmpty();
-    }
-}
+/*
+ *   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.invocation;
+
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Collection;
+
+import javax.naming.Context;
+
+import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DirectoryPartitionNexusProxy;
+
+
+/**
+ * Represents a call from JNDI {@link Context} to {@link DirectoryPartitionNexus}.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class Invocation
+{
+    private final Context caller;
+    private final String name;
+    private final List parameters;
+    private final Collection bypassed;
+    private final DirectoryPartitionNexusProxy proxy;
+
+
+    /**
+     * Creates a new instance that represents an invocation without parameters.
+     * 
+     * @param caller the JNDI {@link Context} that made this invocation
+     * @param name the name of the called method
+     */
+    public Invocation(DirectoryPartitionNexusProxy proxy, Context caller, String name)
+    {
+        this( proxy, caller, name, null, Collections.EMPTY_SET );
+    }
+
+
+    /**
+     * Creates a new instance.
+     *
+     * @param caller the JNDI {@link Context} that made this invocation
+     * @param name the name of the called method
+     * @param parameters the array of parameters passed to the called method
+     */
+    public Invocation(DirectoryPartitionNexusProxy proxy, Context caller, String name, Object[] parameters)
+    {
+        this( proxy, caller, name, parameters, Collections.EMPTY_SET );
+    }
+
+
+    /**
+     * Creates a new instance.
+     * 
+     * @param caller the JNDI {@link Context} that made this invocation
+     * @param name the name of the called method
+     * @param parameters the array of parameters passed to the called method
+     * @param bypassed the set of bypassed Interceptor names
+     */
+    public Invocation(DirectoryPartitionNexusProxy proxy, Context caller, String name, Object[] parameters,
+        Collection bypassed)
+    {
+        if ( proxy == null )
+        {
+            throw new NullPointerException( "proxy" );
+        }
+        if ( caller == null )
+        {
+            throw new NullPointerException( "caller" );
+        }
+        if ( name == null )
+        {
+            throw new NullPointerException( "name" );
+        }
+
+        if ( parameters == null )
+        {
+            parameters = new Object[0];
+        }
+
+        if ( bypassed == null )
+        {
+            this.bypassed = Collections.EMPTY_SET;
+        }
+        else
+        {
+            this.bypassed = Collections.unmodifiableCollection( bypassed );
+        }
+
+        this.proxy = proxy;
+        this.caller = caller;
+        this.name = name;
+
+        List paramList = new ArrayList();
+        for ( int i = 0; i < parameters.length; i++ )
+        {
+            paramList.add( parameters[i] );
+        }
+
+        this.parameters = Collections.unmodifiableList( paramList );
+    }
+
+
+    /**
+     * Returns the proxy object to the {@link DirectoryPartitionNexus}.
+     */
+    public DirectoryPartitionNexusProxy getProxy()
+    {
+        return proxy;
+    }
+
+
+    /**
+     * Returns the JNDI {@link Context} which made this invocation.
+     */
+    public Context getCaller()
+    {
+        return caller;
+    }
+
+
+    /**
+     * Returns the name of the called method.
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+
+    /**
+     * Returns the list of parameters parameters passed to the called method.
+     */
+    public List getParameters()
+    {
+        return parameters;
+    }
+
+
+    /**
+     * Checks to see if an interceptor is bypassed.
+     *
+     * @param interceptorName the interceptorName of the interceptor to check for bypass
+     * @return true if the interceptor should be bypassed, false otherwise
+     */
+    public boolean isBypassed( String interceptorName )
+    {
+        return bypassed.contains( interceptorName );
+    }
+
+
+    /**
+     * Checks to see if any interceptors are bypassed by this Invocation.
+     *
+     * @return true if at least one bypass exists
+     */
+    public boolean hasBypass()
+    {
+        return !bypassed.isEmpty();
+    }
+}

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/Invocation.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/invocation/InvocationStack.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.java Sun Feb 19 19:57:02 2006
@@ -1,128 +1,135 @@
-/*
- *   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.invocation;
-
-
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.Context;
-
-
-/**
- * Keeps track of recursive {@link Invocation}s.  This stack assumes an invocation
- * occurs in the same thread since it is called first, so we manages stacks
- * for each invocation in {@link ThreadLocal}-like manner.  You can just use
- * {@link #getInstance()} to get current invocation stack.
- * <p>
- * Using {@link InvocationStack}, you can find out current effective JNDI
- * {@link Context} or detect infinite recursions.
- * 
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$, $Date$
- */
-public final class InvocationStack
-{
-    // I didn't use ThreadLocal to release contexts explicitly.
-    // It seems like JDK 1.5 supports explicit release by introducing
-    // <tt>ThreadLocal.remove()</tt>, but we're still targetting 1.4.
-    private static final Map stacks = new IdentityHashMap();
-    
-    /**
-     * Returns the invocation stack of current thread.
-     */
-    public static InvocationStack getInstance()
-    {
-        Thread currentThread = Thread.currentThread();
-        InvocationStack ctx;
-        synchronized( stacks )
-        {
-            ctx = ( InvocationStack ) stacks.get( currentThread );
-            if( ctx == null )
-            {
-                ctx = new InvocationStack();
-            }
-        }
-        return ctx;
-    }
-
-    private final Thread thread;
-    private final List stack = new ArrayList();
-
-    private InvocationStack()
-    {
-        Thread currentThread = Thread.currentThread();
-        this.thread = currentThread;
-        // This operation is already synchronized from getInstance()
-        stacks.put( currentThread, this );
-    }
-    
-    /**
-     * Returns an array of {@link Invocation}s.  0th element is the
-     * latest invocation.
-     */
-    public Invocation[] toArray()
-    {
-        Invocation[] result = new Invocation[ stack.size() ];
-        result = ( Invocation[] ) stack.toArray( result );
-        return result;
-    }
-    
-    /**
-     * Returns the latest invocation.
-     */
-    public Invocation peek()
-    {
-        return ( Invocation ) this.stack.get( 0 );
-    }
-
-    /**
-     * Returns true if the stack is empty false otherwise.
-     */
-    public boolean isEmpty()
-    {
-        return this.stack.isEmpty();
-    }
-
-    /**
-     * Pushes the specified invocation to this stack.
-     */
-    public void push( Invocation invocation )
-    {
-        this.stack.add( 0, invocation );
-    }
-    
-    /**
-     * Pops the latest invocation from this stack.  This stack is released
-     * automatically if you pop all items from this stack.
-     */
-    public Invocation pop()
-    {
-        Invocation invocation = ( Invocation ) this.stack.remove( 0 );
-        if( this.stack.size() == 0 )
-        {
-            synchronized( stacks )
-            {
-                stacks.remove( thread );
-            }
-        }
-
-        return invocation;
-    }
-}
+/*
+ *   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.invocation;
+
+
+import java.util.ArrayList;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.Context;
+
+
+/**
+ * Keeps track of recursive {@link Invocation}s.  This stack assumes an invocation
+ * occurs in the same thread since it is called first, so we manages stacks
+ * for each invocation in {@link ThreadLocal}-like manner.  You can just use
+ * {@link #getInstance()} to get current invocation stack.
+ * <p>
+ * Using {@link InvocationStack}, you can find out current effective JNDI
+ * {@link Context} or detect infinite recursions.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public final class InvocationStack
+{
+    // I didn't use ThreadLocal to release contexts explicitly.
+    // It seems like JDK 1.5 supports explicit release by introducing
+    // <tt>ThreadLocal.remove()</tt>, but we're still targetting 1.4.
+    private static final Map stacks = new IdentityHashMap();
+
+
+    /**
+     * Returns the invocation stack of current thread.
+     */
+    public static InvocationStack getInstance()
+    {
+        Thread currentThread = Thread.currentThread();
+        InvocationStack ctx;
+        synchronized ( stacks )
+        {
+            ctx = ( InvocationStack ) stacks.get( currentThread );
+            if ( ctx == null )
+            {
+                ctx = new InvocationStack();
+            }
+        }
+        return ctx;
+    }
+
+    private final Thread thread;
+    private final List stack = new ArrayList();
+
+
+    private InvocationStack()
+    {
+        Thread currentThread = Thread.currentThread();
+        this.thread = currentThread;
+        // This operation is already synchronized from getInstance()
+        stacks.put( currentThread, this );
+    }
+
+
+    /**
+     * Returns an array of {@link Invocation}s.  0th element is the
+     * latest invocation.
+     */
+    public Invocation[] toArray()
+    {
+        Invocation[] result = new Invocation[stack.size()];
+        result = ( Invocation[] ) stack.toArray( result );
+        return result;
+    }
+
+
+    /**
+     * Returns the latest invocation.
+     */
+    public Invocation peek()
+    {
+        return ( Invocation ) this.stack.get( 0 );
+    }
+
+
+    /**
+     * Returns true if the stack is empty false otherwise.
+     */
+    public boolean isEmpty()
+    {
+        return this.stack.isEmpty();
+    }
+
+
+    /**
+     * Pushes the specified invocation to this stack.
+     */
+    public void push( Invocation invocation )
+    {
+        this.stack.add( 0, invocation );
+    }
+
+
+    /**
+     * Pops the latest invocation from this stack.  This stack is released
+     * automatically if you pop all items from this stack.
+     */
+    public Invocation pop()
+    {
+        Invocation invocation = ( Invocation ) this.stack.remove( 0 );
+        if ( this.stack.size() == 0 )
+        {
+            synchronized ( stacks )
+            {
+                stacks.remove( thread );
+            }
+        }
+
+        return invocation;
+    }
+}

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/invocation/InvocationStack.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/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java Sun Feb 19 19:57:02 2006
@@ -76,7 +76,8 @@
     protected AbstractContextFactory()
     {
     }
-    
+
+
     public final synchronized Context getInitialContext( Hashtable env ) throws NamingException
     {
         Configuration cfg = Configuration.toConfiguration( env );
@@ -89,59 +90,60 @@
         DirectoryService service = DirectoryService.getInstance( cfg.getInstanceId() );
 
         // Execute configuration
-        if( cfg instanceof ShutdownConfiguration )
+        if ( cfg instanceof ShutdownConfiguration )
         {
             service.shutdown();
         }
-        else if( cfg instanceof SyncConfiguration )
+        else if ( cfg instanceof SyncConfiguration )
         {
             service.sync();
         }
-        else if( cfg instanceof StartupConfiguration )
+        else if ( cfg instanceof StartupConfiguration )
         {
             service.startup( this, env );
         }
-        else if( cfg instanceof AddDirectoryPartitionConfiguration )
+        else if ( cfg instanceof AddDirectoryPartitionConfiguration )
         {
-            new DirectoryPartitionNexusProxy(
-                    service.getJndiContext( principal, credential, authentication, "" ),
-                    service).addContextPartition( ( ( AddDirectoryPartitionConfiguration ) cfg ).getDirectoryPartitionConfiguration() );
+            new DirectoryPartitionNexusProxy( service.getJndiContext( principal, credential, authentication, "" ),
+                service ).addContextPartition( ( ( AddDirectoryPartitionConfiguration ) cfg )
+                .getDirectoryPartitionConfiguration() );
         }
-        else if( cfg instanceof RemoveDirectoryPartitionConfiguration )
+        else if ( cfg instanceof RemoveDirectoryPartitionConfiguration )
         {
-            new DirectoryPartitionNexusProxy(
-                    service.getJndiContext( principal, credential, authentication, "" ),
-                    service).removeContextPartition( ( ( RemoveDirectoryPartitionConfiguration ) cfg ).getSuffix() );
+            new DirectoryPartitionNexusProxy( service.getJndiContext( principal, credential, authentication, "" ),
+                service ).removeContextPartition( ( ( RemoveDirectoryPartitionConfiguration ) cfg ).getSuffix() );
         }
-        else if( service == null )
+        else if ( service == null )
         {
             throw new NamingException( "Unknown configuration: " + cfg );
         }
-        
+
         return service.getJndiContext( principal, credential, authentication, providerUrl );
     }
 
+
     public static String getProviderUrl( Hashtable env )
     {
         String providerUrl;
         Object value;
         value = env.get( Context.PROVIDER_URL );
-        if( value == null )
+        if ( value == null )
         {
             value = "";
         }
         providerUrl = value.toString();
-        
+
         env.put( Context.PROVIDER_URL, providerUrl );
-        
+
         return providerUrl;
     }
 
+
     public static String getAuthentication( Hashtable env )
     {
         String authentication;
         Object value = env.get( Context.SECURITY_AUTHENTICATION );
-        if( value == null )
+        if ( value == null )
         {
             authentication = "none";
         }
@@ -149,25 +151,26 @@
         {
             authentication = value.toString();
         }
-        
+
         env.put( Context.SECURITY_AUTHENTICATION, authentication );
-        
+
         return authentication;
     }
 
+
     public static byte[] getCredential( Hashtable env ) throws ConfigurationException
     {
         byte[] credential;
         Object value = env.get( Context.SECURITY_CREDENTIALS );
-        if( value == null )
+        if ( value == null )
         {
             credential = null;
         }
-        else if( value instanceof String )
+        else if ( value instanceof String )
         {
             credential = ( ( String ) value ).getBytes();
         }
-        else if( value instanceof byte[] )
+        else if ( value instanceof byte[] )
         {
             credential = ( byte[] ) value;
         }
@@ -175,8 +178,8 @@
         {
             throw new ConfigurationException( "Can't convert '" + Context.SECURITY_CREDENTIALS + "' to byte[]." );
         }
-        
-        if( credential != null )
+
+        if ( credential != null )
         {
             env.put( Context.SECURITY_CREDENTIALS, credential );
         }
@@ -184,11 +187,12 @@
         return credential;
     }
 
+
     public static String getPrincipal( Hashtable env )
     {
         String principal;
         Object value = env.get( Context.SECURITY_PRINCIPAL );
-        if( value == null )
+        if ( value == null )
         {
             principal = null;
         }
@@ -197,7 +201,7 @@
             principal = value.toString();
             env.put( Context.SECURITY_PRINCIPAL, principal );
         }
-        
+
         return principal;
     }
 }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.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/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.core.jndi;
 
+
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
 
@@ -39,6 +40,7 @@
     {
     }
 
+
     /**
      * Does nothing by default.
      */
@@ -46,33 +48,38 @@
     {
     }
 
+
     /**
      * Does nothing by default.
      */
     public void afterStartup( DirectoryService service ) throws NamingException
     {
     }
-    
+
+
     /**
      * Does nothing by default.
      */
     public void beforeShutdown( DirectoryService service ) throws NamingException
     {
     }
-    
+
+
     /**
      * Does nothing by default.
      */
     public void afterShutdown( DirectoryService service ) throws NamingException
     {
     }
-    
+
+
     /**
      * Does nothing by default.
      */
     public void beforeSync( DirectoryService service ) throws NamingException
     {
     }
+
 
     /**
      * Does nothing by default.

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.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/jndi/DeadContext.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java Sun Feb 19 19:57:02 2006
@@ -52,8 +52,8 @@
  */
 public class DeadContext implements LdapContext, EventDirContext
 {
-    private final String EXCEPTION_MSG = "Context operation unavailable when " +
-            "invoked after Eve provider has been shutdown";
+    private final String EXCEPTION_MSG = "Context operation unavailable when "
+        + "invoked after Eve provider has been shutdown";
 
 
     public Control[] getConnectControls() throws NamingException
@@ -218,13 +218,15 @@
     }
 
 
-    public NamingEnumeration search( String name, Attributes matchingAttributes, String[] attributesToReturn ) throws NamingException
+    public NamingEnumeration search( String name, Attributes matchingAttributes, String[] attributesToReturn )
+        throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }
 
 
-    public NamingEnumeration search( Name name, Attributes matchingAttributes, String[] attributesToReturn ) throws NamingException
+    public NamingEnumeration search( Name name, Attributes matchingAttributes, String[] attributesToReturn )
+        throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }
@@ -242,13 +244,15 @@
     }
 
 
-    public NamingEnumeration search( String name, String filterExpr, Object[] filterArgs, SearchControls cons ) throws NamingException
+    public NamingEnumeration search( String name, String filterExpr, Object[] filterArgs, SearchControls cons )
+        throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }
 
 
-    public NamingEnumeration search( Name name, String filterExpr, Object[] filterArgs, SearchControls cons ) throws NamingException
+    public NamingEnumeration search( Name name, String filterExpr, Object[] filterArgs, SearchControls cons )
+        throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }
@@ -429,25 +433,28 @@
 
 
     public void addNamingListener( Name name, String s, SearchControls searchControls, NamingListener namingListener )
-            throws NamingException
+        throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }
 
 
-    public void addNamingListener( String s, String s1, SearchControls searchControls, NamingListener namingListener ) throws NamingException
+    public void addNamingListener( String s, String s1, SearchControls searchControls, NamingListener namingListener )
+        throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }
 
 
-    public void addNamingListener( Name name, String s, Object[] objects, SearchControls searchControls, NamingListener namingListener ) throws NamingException
+    public void addNamingListener( Name name, String s, Object[] objects, SearchControls searchControls,
+        NamingListener namingListener ) throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }
 
 
-    public void addNamingListener( String s, String s1, Object[] objects, SearchControls searchControls, NamingListener namingListener ) throws NamingException
+    public void addNamingListener( String s, String s1, Object[] objects, SearchControls searchControls,
+        NamingListener namingListener ) throws NamingException
     {
         throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
     }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.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/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Sun Feb 19 19:57:02 2006
@@ -68,7 +68,6 @@
     // Package Friendly & Private Utility Methods 
     // ------------------------------------------------------------------------
 
-
     /**
      * Resusitates an object from a serialized attribute in an entry that 
      * conforms to the specifications for representing Java Objects in an LDAP 
@@ -85,14 +84,14 @@
 
         try
         {
-            byte [] data = ( byte [] ) attributes.get( JSERIALDATA_ATTR ).get();
+            byte[] data = ( byte[] ) attributes.get( JSERIALDATA_ATTR ).get();
             in = new ObjectInputStream( new ByteArrayInputStream( data ) );
             return in.readObject();
         }
         catch ( Exception e )
         {
-            NamingException ne = new NamingException( "De-serialization of '"
-                + className + "' instance failed:\n" + e.getMessage() );
+            NamingException ne = new NamingException( "De-serialization of '" + className + "' instance failed:\n"
+                + e.getMessage() );
             ne.setRootCause( e );
             throw ne;
         }
@@ -109,7 +108,7 @@
         }
     }
 
-    
+
     /**
      * Serializes an object into a byte array.
      *
@@ -117,7 +116,7 @@
      * @return the object's serialized byte array form
      * @throws NamingException of the object cannot be serialized
      */
-    static byte [] serialize( Object obj ) throws NamingException
+    static byte[] serialize( Object obj ) throws NamingException
     {
         ByteArrayOutputStream bytesOut = null;
         ObjectOutputStream out = null;
@@ -131,8 +130,7 @@
         }
         catch ( Exception e )
         {
-            NamingException ne = new NamingException( "Serialization of '"
-                + obj + "' failed:\n" + e.getMessage() );
+            NamingException ne = new NamingException( "Serialization of '" + obj + "' failed:\n" + e.getMessage() );
             ne.setRootCause( e );
             throw ne;
         }
@@ -178,7 +176,7 @@
         entry.put( JSERIALDATA_ATTR, serialize( obj ) );
 
         // Add all the class names this object can be cast to:
-        Class [] classes = obj.getClass().getClasses();
+        Class[] classes = obj.getClass().getClasses();
         Attribute javaClassNames = new LockableAttributeImpl( JCLASSNAMES_ATTR );
 
         for ( int ii = 0; ii < classes.length; ii++ )

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.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/jndi/LdapJndiProperties.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java Sun Feb 19 19:57:02 2006
@@ -36,21 +36,21 @@
  * environment settings.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 374647 $
+ * @version $Rev$
  */
 public class LdapJndiProperties
 {
     private static final String SASL_AUTHID = "java.naming.security.sasl.authorizationId";
-    
+
     private LdapName providerDn;
     private LdapName bindDn;
     private String saslAuthId;
     private AuthenticationLevel level;
     private List mechanisms = new ArrayList();
     private byte[] credentials;
-    
 
-    public static AuthenticationLevel getAuthenticationLevel( Hashtable env ) throws NamingException 
+
+    public static AuthenticationLevel getAuthenticationLevel( Hashtable env ) throws NamingException
     {
         AuthenticationLevel level;
         Object credobj = env.get( Context.SECURITY_CREDENTIALS );
@@ -72,12 +72,12 @@
                 level = AuthenticationLevel.SIMPLE;
             }
         }
-        else if ( ! ( authentication instanceof String ) ) 
+        else if ( !( authentication instanceof String ) )
         {
             throw new LdapConfigurationException( "Don't know how to interpret " + authentication.getClass()
                 + " objects for environment property " + Context.SECURITY_AUTHENTICATION );
         }
-        else 
+        else
         {
             if ( "none".equals( authentication ) )
             {
@@ -92,28 +92,28 @@
                 level = AuthenticationLevel.STRONG;
             }
         }
-        
+
         return level;
     }
-    
-    
+
+
     public static LdapJndiProperties getLdapJndiProperties( Hashtable env ) throws NamingException
     {
         if ( env == null )
         {
             throw new LdapConfigurationException( "environment cannot be null" );
         }
-        
+
         LdapJndiProperties props = new LdapJndiProperties();
         Object principal = env.get( Context.SECURITY_PRINCIPAL );
         Object credobj = env.get( Context.SECURITY_CREDENTIALS );
         Object authentication = env.get( Context.SECURITY_AUTHENTICATION );
-        
+
         // -------------------------------------------------------------------
         // check for the provider URL property 
         // -------------------------------------------------------------------
 
-        if ( ! env.containsKey( Context.PROVIDER_URL ) )
+        if ( !env.containsKey( Context.PROVIDER_URL ) )
         {
             String msg = "Expected property " + Context.PROVIDER_URL;
             msg += " but could not find it in env!";
@@ -155,12 +155,12 @@
                 props.mechanisms.add( "simple" );
             }
         }
-        else if ( ! ( authentication instanceof String ) ) 
+        else if ( !( authentication instanceof String ) )
         {
             throw new LdapConfigurationException( "Don't know how to interpret " + authentication.getClass()
                 + " objects for environment property " + Context.SECURITY_AUTHENTICATION );
         }
-        else 
+        else
         {
             if ( "none".equals( authentication ) )
             {
@@ -178,7 +178,7 @@
                 String[] mechList = ( ( String ) authentication ).trim().split( " " );
                 for ( int ii = 0; ii < mechList.length; ii++ )
                 {
-                    if ( ! mechList[ii].trim().equals( "" ) )
+                    if ( !mechList[ii].trim().equals( "" ) )
                     {
                         props.mechanisms.add( mechList[ii] );
                     }
@@ -195,13 +195,12 @@
             throw new LdapConfigurationException( Context.SECURITY_PRINCIPAL + " cannot be null." );
         }
 
-        if ( ! ( principal instanceof String ) )
+        if ( !( principal instanceof String ) )
         {
             throw new LdapConfigurationException( "Don't know how to interpret " + principal.getClass()
                 + " objects for environment property " + Context.SECURITY_PRINCIPAL );
         }
-        
-        
+
         if ( ( ( String ) principal ).trim().equals( "" ) )
         {
             props.bindDn = LdapName.EMPTY_LDAP_NAME;
@@ -210,7 +209,7 @@
         {
             props.bindDn = new LdapName( ( String ) principal );
         }
-        
+
         if ( env.get( SASL_AUTHID ) != null && props.level == AuthenticationLevel.STRONG )
         {
             Object obj = env.get( SASL_AUTHID );
@@ -218,14 +217,14 @@
             {
                 props.saslAuthId = ( String ) obj;
             }
-            else 
+            else
             {
                 throw new LdapConfigurationException( "Don't know how to interpret " + obj.getClass()
                     + " objects for environment property " + SASL_AUTHID );
             }
             props.saslAuthId = ( String ) principal;
         }
-        
+
         // -------------------------------------------------------------------
         // Figure out the credentials
         // -------------------------------------------------------------------
@@ -250,22 +249,22 @@
                     + " objects for environment property " + Context.SECURITY_CREDENTIALS );
             }
         }
-        
+
         return props;
     }
 
-    
+
     public LdapName getBindDn()
     {
         return bindDn;
     }
 
-    
+
     public LdapName getProviderDn()
     {
         return providerDn;
     }
-    
+
 
     public String getSaslAuthId()
     {
@@ -277,14 +276,14 @@
     {
         return level;
     }
-    
-    
+
+
     public List getAuthenticationMechanisms()
     {
         return Collections.unmodifiableList( mechanisms );
     }
-    
-    
+
+
     public byte[] getCredentials()
     {
         return credentials;

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.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/jndi/ServerContext.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sun Feb 19 19:57:02 2006
@@ -70,7 +70,7 @@
 
     /** The directory service which owns this context **/
     private final DirectoryService service;
-    
+
     /** The interceptor proxy to the backend nexus */
     private final DirectoryPartitionNexus nexusProxy;
 
@@ -86,11 +86,11 @@
     /** The Principal associated with this context */
     private LdapPrincipal principal;
 
+
     // ------------------------------------------------------------------------
     // Constructors
     // ------------------------------------------------------------------------
 
-
     /**
      * Must be called by all subclasses to initialize the nexus proxy and the
      * environment settings to be used by this Context implementation.  This
@@ -105,13 +105,13 @@
      * @throws NamingException if the environment parameters are not set 
      * correctly.
      */
-    protected ServerContext( DirectoryService service, Hashtable env ) throws NamingException
+    protected ServerContext(DirectoryService service, Hashtable env) throws NamingException
     {
         this.service = service;
-        
+
         // set references to cloned env and the proxy
         this.nexusProxy = new DirectoryPartitionNexusProxy( this, service );
-        
+
         DirectoryServiceConfiguration cfg = service.getConfiguration();
         this.env = ( Hashtable ) cfg.getEnvironment().clone();
         this.env.putAll( env );
@@ -119,11 +119,12 @@
         dn = props.getProviderDn();
 
         // need to issue a bind operation here
-        this.nexusProxy.bind( props.getBindDn(), props.getCredentials(), 
-            props.getAuthenticationMechanisms(), props.getSaslAuthId() );
+        this.nexusProxy.bind( props.getBindDn(), props.getCredentials(), props.getAuthenticationMechanisms(), props
+            .getSaslAuthId() );
 
-        if ( dn.size() == 0 ) return;
-        if ( ! nexusProxy.hasEntry( dn ) )
+        if ( dn.size() == 0 )
+            return;
+        if ( !nexusProxy.hasEntry( dn ) )
         {
             throw new NameNotFoundException( dn + " does not exist" );
         }
@@ -140,14 +141,15 @@
      * @param env the environment properties used by this context
      * @param dn the distinguished name of this context
      */
-    protected ServerContext( DirectoryService service, LdapPrincipal principal, Name dn ) throws NamingException
+    protected ServerContext(DirectoryService service, LdapPrincipal principal, Name dn) throws NamingException
     {
         this.service = service;
         this.dn = ( LdapName ) dn.clone();
 
         this.env = ( Hashtable ) service.getConfiguration().getEnvironment().clone();
         this.env.put( PROVIDER_URL, dn.toString() );
-        this.nexusProxy = new DirectoryPartitionNexusProxy( this, service );;
+        this.nexusProxy = new DirectoryPartitionNexusProxy( this, service );
+        ;
         this.principal = principal;
     }
 
@@ -164,6 +166,7 @@
         return service;
     }
 
+
     /**
      * Gets the principal of the authenticated user which also happens to own
      */
@@ -190,7 +193,6 @@
     // Protected Accessor Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * Gets the RootNexus proxy.
      *
@@ -198,7 +200,7 @@
      */
     protected DirectoryPartitionNexus getNexusProxy()
     {
-       return nexusProxy ;
+        return nexusProxy;
     }
 
 
@@ -217,7 +219,6 @@
     // JNDI Context Interface Methods
     // ------------------------------------------------------------------------
 
-
     /**
      * @see javax.naming.Context#close()
      */
@@ -226,8 +227,8 @@
         Iterator list = listeners.iterator();
         while ( list.hasNext() )
         {
-            ( ( DirectoryPartitionNexusProxy ) this.nexusProxy )
-                    .removeNamingListener( this, ( NamingListener ) list.next() );
+            ( ( DirectoryPartitionNexusProxy ) this.nexusProxy ).removeNamingListener( this, ( NamingListener ) list
+                .next() );
         }
     }
 
@@ -293,7 +294,7 @@
         attributes.put( rdnAttribute, rdnValue );
         attributes.put( JavaLdapSupport.OBJECTCLASS_ATTR, JavaLdapSupport.JCONTAINER_ATTR );
         attributes.put( JavaLdapSupport.OBJECTCLASS_ATTR, JavaLdapSupport.TOP_ATTR );
-        
+
         /*
          * Add the new context to the server which as a side effect adds 
          * operational attributes to the attributes refering instance which
@@ -337,7 +338,7 @@
     {
         bind( new LdapName( name ), obj );
     }
-    
+
 
     /**
      * @see javax.naming.Context#bind(javax.naming.Name, java.lang.Object)
@@ -435,7 +436,7 @@
         String newRdn = newName.get( newName.size() - 1 );
         String oldRdn = oldName.get( oldName.size() - 1 );
         boolean delOldRdn = true;
-            
+
         /*
          * Attempt to use the java.naming.ldap.deleteRDN environment property
          * to get an override for the deleteOldRdn option to modifyRdn.  
@@ -443,7 +444,7 @@
         if ( null != env.get( DELETE_OLD_RDN_PROP ) )
         {
             String delOldRdnStr = ( String ) env.get( DELETE_OLD_RDN_PROP );
-            delOldRdn = ! delOldRdnStr.equals( "false" );
+            delOldRdn = !delOldRdnStr.equals( "false" );
             delOldRdn = delOldRdn || delOldRdnStr.equals( "no" );
             delOldRdn = delOldRdn || delOldRdnStr.equals( "0" );
         }
@@ -565,18 +566,18 @@
             // Give back serialized object and not a context
             return JavaLdapSupport.deserialize( attributes );
         }
-        
+
         // Initialize and return a context since the entry is not a java object
         ServerLdapContext ctx = new ServerLdapContext( service, principal, target );
-            
+
         // Need to add controls to propagate extended ldap operational env
-        Control [] controls = ( ( ServerLdapContext ) this ).getRequestControls();
+        Control[] controls = ( ( ServerLdapContext ) this ).getRequestControls();
 
         if ( null != controls )
-        {    
-            ctx.setRequestControls( ( Control [] ) controls.clone() );
+        {
+            ctx.setRequestControls( ( Control[] ) controls.clone() );
         }
-        
+
         return ctx;
     }
 
@@ -664,7 +665,7 @@
         PresenceNode filter = new PresenceNode( "objectClass" );
         SearchControls ctls = new SearchControls();
         ctls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
-        return nexusProxy.search( base , getEnvironment(), filter, ctls );
+        return nexusProxy.search( base, getEnvironment(), filter, ctls );
     }
 
 
@@ -703,11 +704,11 @@
          *          head of the prefix is found.
          *      3). Return the remainder of the fqn or Dn after chewing off some
          */
-         
+
         // 1). Find the Dn for name and walk it from the head to tail
         Name fqn = buildTarget( name );
         String head = prefix.get( 0 );
-        
+
         // 2). Walk the fqn trying to match for the head of the prefix
         while ( fqn.size() > 0 )
         {
@@ -716,7 +717,8 @@
             {
                 return fqn;
             }
-            else // 2). Remove name components from the Dn until a match 
+            else
+            // 2). Remove name components from the Dn until a match 
             {
                 fqn.remove( 0 );
             }
@@ -732,14 +734,13 @@
     // EventContext implementations
     // ------------------------------------------------------------------------
 
-
     public void addNamingListener( Name name, int scope, NamingListener namingListener ) throws NamingException
     {
         ExprNode filter = new PresenceNode( "objectClass" );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( scope );
-        ( ( DirectoryPartitionNexusProxy ) this.nexusProxy )
-                .addNamingListener( this, buildTarget( name ), filter, controls, namingListener );
+        ( ( DirectoryPartitionNexusProxy ) this.nexusProxy ).addNamingListener( this, buildTarget( name ), filter,
+            controls, namingListener );
         listeners.add( namingListener );
     }
 
@@ -777,8 +778,7 @@
     // ------------------------------------------------------------------------
     // Utility Methods to Reduce Code
     // ------------------------------------------------------------------------
-    
-    
+
     /**
      * Clones this context's DN and adds the components of the name relative to 
      * this context to the left hand side of this context's cloned DN. 
@@ -792,7 +792,7 @@
     {
         // Clone our DN or absolute path
         LdapName target = ( LdapName ) dn.clone();
-        
+
         // Add to left hand side of cloned DN the relative name arg
         target.addAll( target.size(), relativeName );
         return target;

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.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/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sun Feb 19 19:57:02 2006
@@ -62,7 +62,7 @@
     // ------------------------------------------------------------------------
     // Constructors
     // ------------------------------------------------------------------------
-    
+
     /**
      * Creates a new ServerDirContext by reading the PROVIDER_URL to resolve the
      * distinguished name for this context.
@@ -71,7 +71,7 @@
      * @param env the environment used for this context
      * @throws NamingException if something goes wrong
      */
-    public ServerDirContext( DirectoryService service, Hashtable env ) throws NamingException
+    public ServerDirContext(DirectoryService service, Hashtable env) throws NamingException
     {
         super( service, env );
     }
@@ -86,7 +86,7 @@
      * @param env the environment properties used by this context
      * @param dn the distinguished name of this context
      */
-    protected ServerDirContext( DirectoryService service, LdapPrincipal principal, Name dn ) throws NamingException
+    protected ServerDirContext(DirectoryService service, LdapPrincipal principal, Name dn) throws NamingException
     {
         super( service, principal, dn );
     }
@@ -96,7 +96,6 @@
     // DirContext Implementations
     // ------------------------------------------------------------------------
 
-
     /**
      * @see javax.naming.directory.DirContext#getAttributes(java.lang.String)
      */
@@ -104,7 +103,7 @@
     {
         return getAttributes( new LdapName( name ) );
     }
-    
+
 
     /**
      * @see javax.naming.directory.DirContext#getAttributes(javax.naming.Name)
@@ -133,7 +132,7 @@
     {
         return getNexusProxy().lookup( buildTarget( name ), attrIds );
     }
-    
+
 
     /**
      * @see javax.naming.directory.DirContext#modifyAttributes(java.lang.String,
@@ -173,7 +172,7 @@
     {
         getNexusProxy().modify( buildTarget( name ), mods );
     }
-    
+
 
     /**
      * @see javax.naming.directory.DirContext#bind(java.lang.String,
@@ -341,7 +340,7 @@
         Attributes attributes = ( Attributes ) attrs.clone();
         boolean doRdnPut = attributes.get( rdnAttribute ) == null;
         doRdnPut = doRdnPut || attributes.get( rdnAttribute ).size() == 0;
-        doRdnPut = doRdnPut || ! attributes.get( rdnAttribute ).contains( rdnValue );
+        doRdnPut = doRdnPut || !attributes.get( rdnAttribute ).contains( rdnValue );
 
         if ( doRdnPut )
         {
@@ -396,13 +395,11 @@
     // Search Operation Implementations
     // ------------------------------------------------------------------------
 
-
     /**
      * @see javax.naming.directory.DirContext#search(java.lang.String,
      *      javax.naming.directory.Attributes)
      */
-    public NamingEnumeration search( String name, Attributes matchingAttributes )
-            throws NamingException
+    public NamingEnumeration search( String name, Attributes matchingAttributes ) throws NamingException
     {
         return search( new LdapName( name ), matchingAttributes, null );
     }
@@ -412,8 +409,7 @@
      * @see javax.naming.directory.DirContext#search(javax.naming.Name,
      *      javax.naming.directory.Attributes)
      */
-    public NamingEnumeration search( Name name, Attributes matchingAttributes )
-            throws NamingException
+    public NamingEnumeration search( Name name, Attributes matchingAttributes ) throws NamingException
     {
         return search( name, matchingAttributes, null );
     }
@@ -423,7 +419,8 @@
      * @see javax.naming.directory.DirContext#search(java.lang.String,
      *      javax.naming.directory.Attributes, java.lang.String[])
      */
-    public NamingEnumeration search( String name, Attributes matchingAttributes, String[] attributesToReturn ) throws NamingException
+    public NamingEnumeration search( String name, Attributes matchingAttributes, String[] attributesToReturn )
+        throws NamingException
     {
         return search( new LdapName( name ), matchingAttributes, attributesToReturn );
     }
@@ -433,7 +430,8 @@
      * @see javax.naming.directory.DirContext#search(javax.naming.Name,
      *      javax.naming.directory.Attributes, java.lang.String[])
      */
-    public NamingEnumeration search( Name name, Attributes matchingAttributes, String[] attributesToReturn ) throws NamingException
+    public NamingEnumeration search( Name name, Attributes matchingAttributes, String[] attributesToReturn )
+        throws NamingException
     {
         SearchControls ctls = new SearchControls();
         Name target = buildTarget( name );
@@ -442,13 +440,13 @@
         if ( null != attributesToReturn )
         {
             ctls.setReturningAttributes( attributesToReturn );
-        } 
+        }
 
         // If matchingAttributes is null/empty use a match for everything filter
         if ( null == matchingAttributes || matchingAttributes.size() <= 0 )
         {
             PresenceNode filter = new PresenceNode( "objectClass" );
-            return getNexusProxy().search( target , getEnvironment(), filter, ctls );
+            return getNexusProxy().search( target, getEnvironment(), filter, ctls );
         }
 
         /*
@@ -464,7 +462,7 @@
         while ( list.hasMore() )
         {
             attr = ( Attribute ) list.next();
-            
+
             /*
              * According to JNDI if an attribute in the matchingAttributes
              * list does not have any values then we match for just the presence
@@ -475,7 +473,7 @@
                 filter.addNode( new PresenceNode( attr.getID() ) );
                 continue;
             }
-            
+
             /*
              * With 1 or more value we build a set of simple nodes and add them
              * to the AND node - each attribute value pair is a simple AVA node.
@@ -483,7 +481,7 @@
             for ( int ii = 0; ii < attr.size(); ii++ )
             {
                 Object val = attr.get( ii );
-                
+
                 // Add simpel AVA node if its value is a String 
                 if ( val instanceof String )
                 {
@@ -493,7 +491,7 @@
             }
         }
 
-        return getNexusProxy().search( target , getEnvironment(), filter, ctls );
+        return getNexusProxy().search( target, getEnvironment(), filter, ctls );
     }
 
 
@@ -501,8 +499,7 @@
      * @see javax.naming.directory.DirContext#search(java.lang.String,
      *      java.lang.String, javax.naming.directory.SearchControls)
      */
-    public NamingEnumeration search( String name, String filter, SearchControls cons )
-            throws NamingException
+    public NamingEnumeration search( String name, String filter, SearchControls cons ) throws NamingException
     {
         return search( new LdapName( name ), filter, cons );
     }
@@ -522,8 +519,8 @@
     public NamingEnumeration search( Name name, ExprNode filter, SearchControls cons ) throws NamingException
     {
         /*Name newName = new LdapDN( name.toString() );
-        newName = LdapDN.oidToName( newName, DnOidContainer.getOids() );
-        Name target = buildTarget( ((LdapDN)newName).toLdapName() );*/
+         newName = LdapDN.oidToName( newName, DnOidContainer.getOids() );
+         Name target = buildTarget( ((LdapDN)newName).toLdapName() );*/
 
         Name target = buildTarget( name );
         return getNexusProxy().search( target, getEnvironment(), filter, cons );
@@ -534,8 +531,7 @@
      * @see javax.naming.directory.DirContext#search(javax.naming.Name,
      *      java.lang.String, javax.naming.directory.SearchControls)
      */
-    public NamingEnumeration search( Name name, String filter, SearchControls cons )
-            throws NamingException
+    public NamingEnumeration search( Name name, String filter, SearchControls cons ) throws NamingException
     {
         ExprNode filterNode;
         Name target = buildTarget( name );
@@ -546,23 +542,19 @@
         }
         catch ( ParseException pe )
         {
-            InvalidSearchFilterException isfe =
-                new InvalidSearchFilterException (
-                "Encountered parse exception while parsing the filter: '"
-                + filter + "'" );
+            InvalidSearchFilterException isfe = new InvalidSearchFilterException(
+                "Encountered parse exception while parsing the filter: '" + filter + "'" );
             isfe.setRootCause( pe );
             throw isfe;
         }
         catch ( IOException ioe )
         {
-            NamingException ne = new NamingException(
-                "Parser failed with IO exception on filter: '"
-                + filter + "'" );
+            NamingException ne = new NamingException( "Parser failed with IO exception on filter: '" + filter + "'" );
             ne.setRootCause( ioe );
             throw ne;
         }
 
-        return getNexusProxy().search( target , getEnvironment(), filterNode, cons );
+        return getNexusProxy().search( target, getEnvironment(), filterNode, cons );
     }
 
 
@@ -571,8 +563,8 @@
      *      java.lang.String, java.lang.Object[],
      *      javax.naming.directory.SearchControls)
      */
-    public NamingEnumeration search( String name, String filterExpr,
-        Object[] filterArgs, SearchControls cons ) throws NamingException
+    public NamingEnumeration search( String name, String filterExpr, Object[] filterArgs, SearchControls cons )
+        throws NamingException
     {
         return search( new LdapName( name ), filterExpr, filterArgs, cons );
     }
@@ -583,13 +575,14 @@
      *      java.lang.String, java.lang.Object[],
      *      javax.naming.directory.SearchControls)
      */
-    public NamingEnumeration search( Name name, String filterExpr, Object[] filterArgs, SearchControls cons ) throws NamingException
+    public NamingEnumeration search( Name name, String filterExpr, Object[] filterArgs, SearchControls cons )
+        throws NamingException
     {
         int start;
         int index;
 
         StringBuffer buf = new StringBuffer( filterExpr );
-        
+
         // Scan until we hit the end of the string buffer 
         for ( int ii = 0; ii < buf.length(); ii++ )
         {
@@ -600,46 +593,44 @@
                 {
                     ii++;
                 }
-                           
+
                 // Record start of variable at '{'
                 start = ii;
-                
+
                 // Advance to the end of a variable at '}'
                 while ( '}' != buf.charAt( ii ) )
                 {
                     ii++;
                 }
             }
-            catch (IndexOutOfBoundsException e)
+            catch ( IndexOutOfBoundsException e )
             {
                 // End of filter so done.
                 break;
             }
-            
+
             // Parse index
-            index = Integer.parseInt(buf.substring(start + 1, ii));
-            
+            index = Integer.parseInt( buf.substring( start + 1, ii ) );
+
             /*
              * Replace the '{ i }' with the string representation of the value
              * held in the filterArgs array at index index.
-             */           
+             */
             buf.replace( start, ii + 1, filterArgs[index].toString() );
         }
-        
+
         return search( name, buf.toString(), cons );
     }
 
-
     // ------------------------------------------------------------------------
     // EventDirContext implementations
     // ------------------------------------------------------------------------
 
-
     FilterParserImpl filterParser = new FilterParserImpl();
 
+
     public void addNamingListener( Name name, String filterStr, SearchControls searchControls,
-                                   NamingListener namingListener )
-            throws NamingException
+        NamingListener namingListener ) throws NamingException
     {
         ExprNode filter;
 
@@ -654,21 +645,21 @@
             throw e2;
         }
 
-        ( ( DirectoryPartitionNexusProxy ) getNexusProxy() )
-                .addNamingListener( this, buildTarget( name ), filter, searchControls, namingListener );
+        ( ( DirectoryPartitionNexusProxy ) getNexusProxy() ).addNamingListener( this, buildTarget( name ), filter,
+            searchControls, namingListener );
         getListeners().add( namingListener );
     }
 
 
-    public void addNamingListener( String name, String filter, SearchControls searchControls, NamingListener namingListener )
-            throws NamingException
+    public void addNamingListener( String name, String filter, SearchControls searchControls,
+        NamingListener namingListener ) throws NamingException
     {
         addNamingListener( new LdapName( name ), filter, searchControls, namingListener );
     }
 
 
     public void addNamingListener( Name name, String filterExpr, Object[] filterArgs, SearchControls searchControls,
-                                   NamingListener namingListener ) throws NamingException
+        NamingListener namingListener ) throws NamingException
     {
         int start;
         StringBuffer buf = new StringBuffer( filterExpr );
@@ -690,7 +681,7 @@
             {
                 ii++;
             }
-            
+
             /*
              * Replace the '{ i }' with the string representation of the value
              * held in the filterArgs array at index index.
@@ -703,7 +694,7 @@
 
 
     public void addNamingListener( String name, String filter, Object[] objects, SearchControls searchControls,
-                                   NamingListener namingListener ) throws NamingException
+        NamingListener namingListener ) throws NamingException
     {
         addNamingListener( new LdapName( name ), filter, objects, searchControls, namingListener );
     }

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.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/jndi/ServerDirObjectFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.java Sun Feb 19 19:57:02 2006
@@ -58,6 +58,7 @@
      */
     String getObjectClassId();
 
+
     /**
      * Gets the Class instance associated with this ObjectFactory.  Objects to
      * be created by this ObjectFactory will be of this type, a subclass of

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

Propchange: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirObjectFactory.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/jndi/ServerDirStateFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirStateFactory.java Sun Feb 19 19:57:02 2006
@@ -52,6 +52,7 @@
      */
     String getObjectClassId();
 
+
     /**
      * Gets the Class instance associated with this StateFactory.  Objects to
      * be persisted by this StateFactory must be of this type, a subclass of

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

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