directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r158889 [1/2] - in directory/apacheds/trunk: core/ core/src/main/aspects/org/apache/ldap/server/jndi/ core/src/main/java/org/apache/ldap/server/ core/src/main/java/org/apache/ldap/server/auth/ core/src/main/java/org/apache/ldap/server/db/ core/src/main/java/org/apache/ldap/server/db/gui/ core/src/main/java/org/apache/ldap/server/db/jdbm/ core/src/main/java/org/apache/ldap/server/exception/ core/src/main/java/org/apache/ldap/server/jndi/ core/src/main/java/org/apache/ldap/server/jndi/ibs/ core/src/main/java/org/apache/ldap/server/jndi/invocation/ core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/ core/src/test/org/apache/ldap/server/jndi/ core/src/test/org/apache/ldap/server/jndi/invocation/ core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/ shared/src/main/java/org/apache/ldap/server/schema/bootstrap/
Date Thu, 24 Mar 2005 06:53:48 GMT
Author: akarasulu
Date: Wed Mar 23 22:53:39 2005
New Revision: 158889

URL: http://svn.apache.org/viewcvs?view=rev&rev=158889
Log:
Commiting changes from Trustin's interceptor_revamp branch.  Used the following
svn command to merge changes back into the trunk.  svn merge -r 158014:HEAD 
https://svn.apache.org/repos/asf/directory/apacheds/branches/interceptor_revamp
 .

Added:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/
      - copied from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Add.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Add.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Delete.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Delete.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetMatchedDN.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetMatchedDN.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetSuffix.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetSuffix.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/HasEntry.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/HasEntry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/IsSuffix.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/IsSuffix.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/List.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/List.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ListSuffixes.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/ListSuffixes.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Lookup.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Lookup.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/LookupWithAttrIds.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/LookupWithAttrIds.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Modify.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Modify.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyMany.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyMany.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyRN.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyRN.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Move.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Move.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/MoveAndModifyRN.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/MoveAndModifyRN.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Search.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Search.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/
      - copied from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/BaseInterceptor.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorChain.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorConfigBuilder.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorConfigBuilder.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorContext.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorException.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorException.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/NextInterceptor.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/NextInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Validator.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Validator.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/invocation/
      - copied from r158886, directory/apacheds/branches/interceptor_revamp/core/src/test/org/apache/ldap/server/jndi/invocation/
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/
      - copied from r158886, directory/apacheds/branches/interceptor_revamp/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java   (props changed)
      - copied unchanged from r158886, directory/apacheds/branches/interceptor_revamp/core/src/test/org/apache/ldap/server/jndi/invocation/interceptor/ConfigurationTest.java
Removed:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Interceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InterceptorPipeline.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationStateEnum.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/OnErrorPipeline.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/
Modified:
    directory/apacheds/trunk/core/project.properties
    directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/AuthenticatorContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/SimpleAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/CreateContextTest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java
    directory/apacheds/trunk/shared/src/main/java/org/apache/ldap/server/schema/bootstrap/ProducerTypeEnum.java

Modified: directory/apacheds/trunk/core/project.properties
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/project.properties?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/project.properties (original)
+++ directory/apacheds/trunk/core/project.properties Wed Mar 23 22:53:39 2005
@@ -4,7 +4,7 @@
 maven.compile.optimize=on
 maven.compile.deprecation=on
 
-maven.junit.fork=yes
+#maven.junit.fork=yes
 maven.xdoc.includeProjectDocumentation=yes
 
 #maven.javadoc.private=true
@@ -41,4 +41,5 @@
 java.util.prefs.PreferencesFactory=org.apache.ldap.server.prefs.ServerPreferencesFactory
 
 maven.eclipse.classpath.include=${basedir}/target/schema,${basedir}/src/main/aspects
-
+maven.eclipse.buildcommands=org.eclipse.ajdt.core.ajbuilder
+maven.eclipse.projectnatures=org.eclipse.ajdt.ui.ajnature

Modified: directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj (original)
+++ directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj Wed Mar 23 22:53:39 2005
@@ -18,6 +18,7 @@
 import org.apache.ldap.server.PartitionNexus;
 import org.apache.ldap.server.db.Database;
 import org.apache.ldap.server.ContextPartition;
+import org.apache.ldap.server.jndi.invocation.Invocation;
 
 
 /**
@@ -180,7 +181,7 @@
      */
     pointcut newInvocation( Invocation invocation ):
         target( invocation ) &&
-        execution( public Invocation.new() );
+        execution( Invocation.new(..) );
       
         
     // ------------------------------------------------------------------------
@@ -192,7 +193,7 @@
         jndiNexusCalls( caller )
         {
     		JndiProvider.push( ( LdapContext ) caller );
-            //System.out.println( "\npushed " + a_caller + " for join point "
+            //System.out.println( "\npushed " + caller + " for join point "
             //    + thisJoinPoint );
         }
         
@@ -201,7 +202,7 @@
         jndiNexusCalls( caller ) 
         {
             LdapContext head = JndiProvider.pop();
-            //System.out.println( "\npopped " + a_caller + " for join point "
+            //System.out.println( "\npopped " + caller + " for join point "
             //    + thisJoinPoint );
         }
       
@@ -215,4 +216,3 @@
             //    + thisJoinPoint );
         }
 }
-

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractServerTest.java Wed Mar 23 22:53:39 2005
@@ -94,21 +94,18 @@
     /**
      * Deletes the Eve working directory.
      */
-    protected void doDelete( File wkdir )
+    protected void doDelete( File wkdir ) throws IOException
     {
-        try 
+        if ( doDelete )
         {
-            if ( doDelete )
+            if ( wkdir.exists() )
             {
-                if ( wkdir.exists() )
-                {
-                    FileUtils.deleteDirectory( wkdir );
-                }
+                FileUtils.deleteDirectory( wkdir );
+            }
+            if ( wkdir.exists() )
+            {
+                throw new IOException( "Failed to delete: " + wkdir );
             }
-        }
-        catch( IOException ioe )
-        {
-            ioe.printStackTrace();
         }
     }
 
@@ -173,7 +170,6 @@
     protected void tearDown() throws Exception
     {
         super.tearDown();
-
         Hashtable env = new Hashtable();
 
         env.put( Context.PROVIDER_URL, "ou=system" );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/PartitionNexus.java Wed Mar 23 22:53:39 2005
@@ -100,7 +100,7 @@
      * ContextPartition's naming context online.
      *
      * Operations against the naming context should result in an LDAP BUSY
-     * result code in the response if the naming context is not online.
+     * result code in the returnValue if the naming context is not online.
      *
      * @param partition ContextPartition component to register with this
      * BackendNexus.
@@ -114,7 +114,7 @@
      * the ContextPartition's naming context offline.
      *
      * Operations against the naming context should result in an LDAP BUSY
-     * result code in the response if the naming context is not online.
+     * result code in the returnValue if the naming context is not online.
      *
      * @param partition ContextPartition component to unregister with this
      * BackendNexus.

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/SystemPartition.java Wed Mar 23 22:53:39 2005
@@ -174,7 +174,7 @@
         }
         catch ( InvalidNameException e ) 
         {
-            ; // Never thrown - name will always be valid!
+            // Never thrown - name will always be valid!
         }
 
         // add the root entry for the system root context if it does not exist

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/AuthenticatorContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/AuthenticatorContext.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/AuthenticatorContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/AuthenticatorContext.java Wed Mar 23 22:53:39 2005
@@ -17,7 +17,7 @@
 package org.apache.ldap.server.auth;
 
 
-import org.apache.ldap.server.RootNexus;
+import org.apache.ldap.server.PartitionNexus;
 
 
 /**
@@ -30,7 +30,7 @@
 {
 
     /** the root nexus to all database partitions */
-    private RootNexus rootNexus;
+    private PartitionNexus partitionNexus;
     /** whether or not to allow anonymous users */
     private boolean allowAnonymous = false;
 
@@ -41,13 +41,13 @@
     {
     }
 
-    public RootNexus getRootNexus()
+    public PartitionNexus getPartitionNexus()
     {
-        return rootNexus;
+        return partitionNexus;
     }
-    public void setRootNexus( RootNexus rootNexus )
+    public void setPartitionNexus( PartitionNexus rootNexus )
     {
-        this.rootNexus = rootNexus;
+        this.partitionNexus = rootNexus;
     }
 
     public boolean getAllowAnonymous()

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/SimpleAuthenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/SimpleAuthenticator.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/SimpleAuthenticator.java Wed Mar 23 22:53:39 2005
@@ -17,17 +17,17 @@
 package org.apache.ldap.server.auth;
 
 
-import org.apache.ldap.server.RootNexus;
-import org.apache.ldap.server.jndi.ServerContext;
-import org.apache.ldap.common.exception.LdapNameNotFoundException;
-import org.apache.ldap.common.exception.LdapAuthenticationException;
-import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.common.name.LdapName;
-
 import javax.naming.Context;
 import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
 import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+
+import org.apache.ldap.common.exception.LdapAuthenticationException;
+import org.apache.ldap.common.exception.LdapNameNotFoundException;
+import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.common.util.ArrayUtils;
+import org.apache.ldap.server.PartitionNexus;
+import org.apache.ldap.server.jndi.ServerContext;
 
 
 /**
@@ -100,7 +100,7 @@
 
         LdapName principalDn = new LdapName( principal );
 
-        RootNexus rootNexus = getAuthenticatorContext().getRootNexus();
+        PartitionNexus rootNexus = getAuthenticatorContext().getPartitionNexus();
 
         Attributes userEntry = rootNexus.lookup( principalDn );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DefaultOptimizer.java Wed Mar 23 22:53:39 2005
@@ -87,7 +87,6 @@
              * will cost us.  Anyway it defaults to a maximum scan count if a
              * scan count is not specified by the implementation.
              */
-          ;
         }
         else if ( node.isLeaf() ) 
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java Wed Mar 23 22:53:39 2005
@@ -336,7 +336,7 @@
                 l_row[1] = l_rec.getEntryId() ;
                 l_model.addRow( l_row ) ;
                 l_count++ ;
-            } ;
+            }
 
             m_resultsTbl.setModel( l_model ) ;
             m_resultsPnl.setBorder(

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java Wed Mar 23 22:53:39 2005
@@ -864,6 +864,7 @@
             } 
             catch ( Throwable t ) 
             {
+                t.printStackTrace();
                 if ( null == rootCause ) 
                 {
                     rootCause = new MultiException();
@@ -880,6 +881,7 @@
         }
         catch ( Throwable t ) 
         {
+            t.printStackTrace();
             if ( null == rootCause ) 
             {
                 rootCause = new MultiException();
@@ -887,7 +889,6 @@
                 
             rootCause.addThrowable( t );
         }
-
 
         if ( null != rootCause )
         {

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Authenticator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticatorConfigBuilder.java Wed Mar 23 22:53:39 2005
@@ -17,14 +17,14 @@
 package org.apache.ldap.server.jndi;
 
 
+import java.io.FileInputStream;
 import java.util.Hashtable;
 import java.util.Properties;
-import java.io.FileInputStream;
+
+import javax.naming.NamingException;
 
 import org.apache.ldap.common.util.StringTools;
 import org.apache.ldap.server.auth.AuthenticatorConfig;
-
-import javax.naming.NamingException;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java Wed Mar 23 22:53:39 2005
@@ -39,22 +39,21 @@
 import org.apache.ldap.common.schema.Normalizer;
 import org.apache.ldap.common.util.DateUtils;
 import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.server.*;
-import org.apache.ldap.server.auth.*;
+import org.apache.ldap.server.ApplicationPartition;
+import org.apache.ldap.server.ContextPartition;
+import org.apache.ldap.server.ContextPartitionConfig;
+import org.apache.ldap.server.RootNexus;
+import org.apache.ldap.server.SystemPartition;
 import org.apache.ldap.server.db.Database;
 import org.apache.ldap.server.db.DefaultSearchEngine;
 import org.apache.ldap.server.db.ExpressionEnumerator;
 import org.apache.ldap.server.db.ExpressionEvaluator;
 import org.apache.ldap.server.db.SearchEngine;
 import org.apache.ldap.server.db.jdbm.JdbmDatabase;
-import org.apache.ldap.server.jndi.ibs.AuthorizationService;
-import org.apache.ldap.server.jndi.ibs.FilterService;
-import org.apache.ldap.server.jndi.ibs.FilterServiceImpl;
-import org.apache.ldap.server.jndi.ibs.OperationalAttributeService;
-import org.apache.ldap.server.jndi.ibs.SchemaService;
-import org.apache.ldap.server.jndi.ibs.ServerExceptionService;
+import org.apache.ldap.server.jndi.invocation.interceptor.InterceptorChain;
+import org.apache.ldap.server.jndi.invocation.interceptor.InterceptorConfigBuilder;
+import org.apache.ldap.server.jndi.invocation.interceptor.InterceptorContext;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
 import org.apache.ldap.server.schema.GlobalRegistries;
 import org.apache.ldap.server.schema.MatchingRuleRegistry;
 import org.apache.ldap.server.schema.OidRegistry;
@@ -491,151 +490,16 @@
         // --------------------------------------------------------------------
         // Adding interceptors
         // --------------------------------------------------------------------
-
-        /*
-         * Create and add the Authentication service interceptor to before
-         * interceptor chain.
-         */
-        InvocationStateEnum[] state = new InvocationStateEnum[]{InvocationStateEnum.PREINVOCATION};
-
-        boolean allowAnonymous = !initialEnv.containsKey( EnvKeys.DISABLE_ANONYMOUS );
-
-        AuthenticationService authenticationService = new AuthenticationService();
-
-        // create authenticator context
-        AuthenticatorContext authenticatorContext = new AuthenticatorContext();
-
-        authenticatorContext.setRootNexus( nexus );
-
-        authenticatorContext.setAllowAnonymous( allowAnonymous );
-
-        try // initialize default authenticators
-        {
-            // create anonymous authenticator
-            AuthenticatorConfig authenticatorConfig = new AuthenticatorConfig();
-
-            authenticatorConfig.setAuthenticatorName( "none" );
-
-            authenticatorConfig.setAuthenticatorContext( authenticatorContext );
-
-            AbstractAuthenticator authenticator = new AnonymousAuthenticator();
-
-            authenticator.init( authenticatorConfig );
-
-            authenticationService.register( authenticator );
-
-            // create simple authenticator
-            authenticatorConfig = new AuthenticatorConfig();
-
-            authenticatorConfig.setAuthenticatorName( "simple" );
-
-            authenticatorConfig.setAuthenticatorContext( authenticatorContext );
-
-            authenticator = new SimpleAuthenticator();
-
-            authenticator.init( authenticatorConfig );
-
-            authenticationService.register( authenticator );
-        }
-        catch ( Exception e )
-        {
-            throw new NamingException( e.getMessage() );
-        }
-
-        AuthenticatorConfig[] configs = null;
-
-        configs = AuthenticatorConfigBuilder.getAuthenticatorConfigs( initialEnv );
-
-        for ( int ii = 0; ii < configs.length; ii++ )
-        {
-            try
-            {
-                configs[ii].setAuthenticatorContext( authenticatorContext );
-
-                String authenticatorClass = configs[ii].getAuthenticatorClass();
-
-                Class clazz = Class.forName( authenticatorClass );
-
-                Constructor constructor = clazz.getConstructor( new Class[] { } );
-
-                AbstractAuthenticator authenticator = ( AbstractAuthenticator ) constructor.newInstance( new Object[] { } );
-
-                authenticator.init( configs[ii] );
-
-                authenticationService.register( authenticator );
-            }
-            catch ( Exception e )
-            {
-                e.printStackTrace();
-            }
+        InterceptorChain interceptor = (InterceptorChain) initialEnv.get( EnvKeys.INTERCEPTORS );
+        if( interceptor == null ) {
+            // If custom interceptor is not specified, use defaule one.
+            interceptor = InterceptorChain.newDefaultChain();
         }
 
-        provider.addInterceptor( authenticationService, state );
-
-        /*
-         * Create and add the Eve Exception service interceptor to both the
-         * before and onError interceptor chains.
-         */
-        state = new InvocationStateEnum[]{InvocationStateEnum.POSTINVOCATION};
-
-        FilterService filterService = new FilterServiceImpl();
-
-        Interceptor interceptor = ( Interceptor ) filterService;
-
-        provider.addInterceptor( interceptor, state );
-
-        /*
-         * Create and add the Authorization service interceptor to before
-         * interceptor chain.
-         */
-        state = new InvocationStateEnum[] {InvocationStateEnum.PREINVOCATION};
-
-        ConcreteNameComponentNormalizer normalizer;
-
-        AttributeTypeRegistry atr = globalRegistries.getAttributeTypeRegistry();
-
-        normalizer = new ConcreteNameComponentNormalizer( atr );
-
-        interceptor = new AuthorizationService( normalizer, filterService );
-
-        provider.addInterceptor( interceptor, state );
-
-        /*
-         * Create and add the Eve Exception service interceptor to both the
-         * before and onError interceptor chains.
-         */
-        state = new InvocationStateEnum[]
-        {
-            InvocationStateEnum.PREINVOCATION,
-            InvocationStateEnum.FAILUREHANDLING
-        };
-
-        interceptor = new ServerExceptionService( nexus );
-
-        provider.addInterceptor( interceptor, state );
-
-        /*
-         * Create and add the Eve schema service interceptor to before chain.
-         */
-        state = new InvocationStateEnum[] {InvocationStateEnum.PREINVOCATION};
-
-        interceptor = new SchemaService( nexus, globalRegistries, filterService );
-
-        provider.addInterceptor( interceptor, state );
-
-        /*
-         * Create and add the Eve operational attribute managment service
-         * interceptor to both the before and after interceptor chains.
-         */
-        state = new InvocationStateEnum[]
-        {
-            InvocationStateEnum.PREINVOCATION,
-            InvocationStateEnum.POSTINVOCATION
-        };
-
-        interceptor = new OperationalAttributeService( nexus, globalRegistries, filterService );
-
-        provider.addInterceptor( interceptor, state );
+        interceptor.init( new InterceptorContext(
+                initialEnv, system, globalRegistries, nexus,
+                InterceptorConfigBuilder.build( initialEnv, EnvKeys.INTERCEPTORS ) ) );
+        provider.setInterceptor( interceptor );
 
         // fire up the app partitions now!
         if ( initialEnv.get( EnvKeys.PARTITIONS ) != null )
@@ -644,7 +508,6 @@
         }
     }
 
-
     /**
      * Starts up all the application partitions that will be attached to naming contexts in the system.  Partition
      * database files are created within a subdirectory immediately under the Eve working directory base.
@@ -664,7 +527,6 @@
         MatchingRuleRegistry reg = globalRegistries.getMatchingRuleRegistry();
 
         // start getting all the parameters from the initial environment
-
         ContextPartitionConfig[] configs = null;
 
         configs = PartitionConfigBuilder.getContextPartitionConfigs( initialEnv );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java Wed Mar 23 22:53:39 2005
@@ -52,6 +52,27 @@
     /** the envprop key base to the properties of an authenticator */
     public static final String AUTHENTICATOR_PROPERTIES = "server.authenticator.properties.";
 
+    /**
+     * bootstrap property: {@link Interceptor} or {@link InterceptorChain}
+     * that will intercept directory operations when they are invoked.  You
+     * don't need to specify this property if you want to use the default
+     * interceptor chain.  If you specify this property, you might have to
+     * add some default interceptors in <tt>org.apache.ldap.server.jndi.invocation.interceptor</tt>
+     * package in your custom interceptor chain.
+     * <p>
+     * Here is an example of how to pass configuration values to interceptor:
+     * <pre>
+     * # Passes property 'propA=3' to the root interceptor chain.
+     * server.interceptors#propA=3
+     * # Passes property 'propB=7' to the interceptor whose name is 'myinterceptor'.
+     * server.interceptors.myinterceptor#propB=7
+     * # Passes property 'propC=9' to an interceptor 'yourinterceptor' whose
+     * # parent is an interceptor chain 'childChain' which is a child of the
+     * # root interceptor chain. 
+     * server.interceptors.childChain.yourinterceptor#propC=9
+     * </pre>
+     */
+    public static final String INTERCEPTORS = "server.interceptor";
 
     // ------------------------------------------------------------------------
     // Properties for protocol/network settings

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java Wed Mar 23 22:53:39 2005
@@ -16,21 +16,43 @@
  */
 package org.apache.ldap.server.jndi;
 
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+
 import javax.naming.Context;
+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 javax.naming.ldap.LdapContext;
 
-import org.apache.ldap.common.exception.LdapNamingException;
-import org.apache.ldap.common.message.ResultCodeEnum;
+import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.server.BackendSubsystem;
+import org.apache.ldap.server.ContextPartition;
 import org.apache.ldap.server.PartitionNexus;
 import org.apache.ldap.server.RootNexus;
+import org.apache.ldap.server.jndi.invocation.Add;
+import org.apache.ldap.server.jndi.invocation.Delete;
+import org.apache.ldap.server.jndi.invocation.GetMatchedDN;
+import org.apache.ldap.server.jndi.invocation.GetSuffix;
+import org.apache.ldap.server.jndi.invocation.HasEntry;
+import org.apache.ldap.server.jndi.invocation.Invocation;
+import org.apache.ldap.server.jndi.invocation.IsSuffix;
+import org.apache.ldap.server.jndi.invocation.List;
+import org.apache.ldap.server.jndi.invocation.ListSuffixes;
+import org.apache.ldap.server.jndi.invocation.Lookup;
+import org.apache.ldap.server.jndi.invocation.LookupWithAttrIds;
+import org.apache.ldap.server.jndi.invocation.Modify;
+import org.apache.ldap.server.jndi.invocation.ModifyMany;
+import org.apache.ldap.server.jndi.invocation.ModifyRN;
+import org.apache.ldap.server.jndi.invocation.Move;
+import org.apache.ldap.server.jndi.invocation.MoveAndModifyRN;
+import org.apache.ldap.server.jndi.invocation.Search;
+import org.apache.ldap.server.jndi.invocation.interceptor.Interceptor;
+import org.apache.ldap.server.jndi.invocation.interceptor.InterceptorChain;
 
 
 /**
@@ -39,21 +61,17 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class JndiProvider implements BackendSubsystem, InvocationHandler
+public class JndiProvider implements BackendSubsystem
 {
     /** Singleton instance of this class */
-    private static JndiProvider s_singleton = null;
+    private static JndiProvider s_singleton;
     
-    /** Interceptor of interceptors in post-invocation pipeline */
-    private InterceptorPipeline after = new FailFastPipeline();
-    /** Interceptor of interceptors in pre-invocation pipeline */
-    private InterceptorPipeline before = new FailFastPipeline();
-    /** Interceptor of interceptors in post-invocation pipeline failure */
-    private InterceptorPipeline afterFailure = new OnErrorPipeline();
+    /** The interceptor (or interceptor chain) for this provider */
+    private Interceptor interceptor;
     /** RootNexus as it was given to us by the ServiceManager */
-    private RootNexus nexus = null;
+    private RootNexus nexus;
     /** PartitionNexus proxy wrapping nexus to inject services */
-    private PartitionNexus proxy = null;
+    private PartitionNexus proxy;
 
     /** whether or not this instance has been shutdown */
     private boolean isShutdown = false;
@@ -81,10 +99,8 @@
 
         s_singleton = this;
         this.nexus = nexus;
-        this.proxy = ( PartitionNexus ) Proxy.newProxyInstance(
-            nexus.getClass().getClassLoader(),
-            nexus.getClass().getInterfaces(), this );
-
+        this.interceptor = new InterceptorChain();
+        this.proxy = new PartitionNexusImpl();
     }
 
 
@@ -146,219 +162,135 @@
         this.nexus.close();
         this.nexus = null;
         this.proxy = null;
-        this.before = null;
-        this.after = null;
-        this.afterFailure = null;
+        this.interceptor.destroy();
+        this.interceptor = null;
         this.isShutdown = true;
         s_singleton = null;
     }
+    
+    public Interceptor getInterceptor()
+    {
+        return interceptor;
+    }
 
+    public void setInterceptor( Interceptor interceptor )
+    {
+        if( interceptor == null )
+        {
+            throw new NullPointerException( "interceptor" );
+        }
+        this.interceptor = interceptor;
+    }
 
-    // ------------------------------------------------------------------------
-    // Invokation Handler Implementation
-    // ------------------------------------------------------------------------
 
+    public Object invoke( Invocation call ) throws NamingException
+    {
+        interceptor.process( null, call );
+        return call.getReturnValue();
+    }
 
     /**
-     * @see java.lang.reflect.InvocationHandler#invoke(Object,Method,Object[])
+     * A dead context is requested and returned when we shutdown the system. It
+     * prevents a {@link javax.naming.NoInitialContextException} from being
+     * thrown by InitialContext or one of its subclasses.
+     *
+     * @return a unusable dead context
      */
-    public Object invoke( Object proxy, Method method, Object[] args ) throws Throwable
+    public Context getDeadContext()
+    {
+        return new DeadContext();
+    }
+    
+    private class PartitionNexusImpl implements PartitionNexus
     {
-        // Setup the invocation and populate: remember aspect sets context stack
-        Invocation invocation = new Invocation();
-        invocation.setMethod( method );
-        invocation.setProxy( proxy );
-        invocation.setParameters( args );
 
-        // used for an optimization
-        BaseInterceptor.setInvocation( invocation );
+        public LdapContext getLdapContext() {
+            return nexus.getLdapContext();
+        }
 
-        try
-        {
-            before.invoke( invocation );
+        public Name getMatchedDn(Name dn, boolean normalized) throws NamingException {
+            return ( Name ) JndiProvider.this.invoke( new GetMatchedDN( dn, normalized ) );
         }
-        catch ( Throwable throwable )
-        {
-            /*
-             * On errors we need to continue into the failure handling state
-             * of Invocation processing and not throw anything just record it.
-             */
-            if ( invocation.getBeforeFailure() == null )
-            {
-                invocation.setBeforeFailure( throwable );
-            }
 
-            invocation.setState( InvocationStateEnum.FAILUREHANDLING );
+        public Name getSuffix(Name dn, boolean normalized) throws NamingException {
+            return ( Name ) JndiProvider.this.invoke( new GetSuffix( dn, normalized ) );
         }
 
-        
-        /*
-         * If before pipeline succeeds invoke the target and change state to 
-         * POSTINVOCATION on success but on failure record exception and set 
-         * state to FAILUREHANDLING.
-         * 
-         * If before pipeline failed then we invoke the after failure pipeline
-         * and throw the before failure exception.
-         */
-        if ( invocation.getState() == InvocationStateEnum.PREINVOCATION )
-        {
-            NamingException target = null;
+        public Iterator listSuffixes(boolean normalized) throws NamingException {
+            return ( Iterator ) JndiProvider.this.invoke( new ListSuffixes( normalized ) );
+        }
 
-            try
-            {
-                /*
-                 * If the invocation is not bypassed, we invoke on the proxied
-                 * object and set the return value on invocation.  If we do
-                 * bypass, its because a before chain service set the bypass
-                 * flag.  If the invoked method has a return value it's the
-                 * responsibility of the bypass triggering interceptor to set
-                 * the value to return.
-                 */
-
-                if ( ! invocation.doBypass() )
-                {
-                    Object retVal = method.invoke( nexus, invocation.getParameters() );
-                    invocation.setReturnValue( retVal );
-                }
-
-                // even if invocation is bypassed state is now post invocation 
-                invocation.setState( InvocationStateEnum.POSTINVOCATION );
-            }
-            catch ( InvocationTargetException ite )
-            {
-                if ( ite.getTargetException() != null )
-                {
-                    if ( ite.getTargetException() instanceof NamingException )
-                    {
-                        target = ( NamingException ) ite.getTargetException();
-                    }
-                    else
-                    {
-                        target = new NamingException();
-                        target.setRootCause( ite.getTargetException() );
-                    }
-                }
-                else
-                {
-                    target = new NamingException();
-                    target.setRootCause( ite );
-                }
-
-                invocation.setThrowable( target );
-                invocation.setState( InvocationStateEnum.FAILUREHANDLING );
-            }
-            catch ( Throwable t )
-            {
-                target = new NamingException();
-                target.setRootCause( t );
-                invocation.setThrowable( target );
-                invocation.setState( InvocationStateEnum.FAILUREHANDLING );
-            }
+        public void register(ContextPartition partition) {
+            nexus.register( partition );
+        }
 
-            invocation.setComplete( true );
+        public void unregister(ContextPartition partition) {
+            nexus.unregister( partition );
         }
-        else if ( invocation.getState() == InvocationStateEnum.FAILUREHANDLING )
-        {
-            afterFailure.invoke( invocation );
-            BaseInterceptor.setInvocation( null );
-            throw invocation.getBeforeFailure();
+
+        public void delete(Name name) throws NamingException {
+            JndiProvider.this.invoke( new Delete( name ) );
         }
 
+        public void add(String upName, Name normName, Attributes entry) throws NamingException {
+            JndiProvider.this.invoke( new Add( upName, normName, entry ) );
+        }
 
-        /*
-         * If we have gotten this far then the before pipeline succeeded.  If
-         * the target invocation succeeded then we should be in the
-         * POSTINVOCATION state in which case we invoke the after pipeline.
-         *
-         * If the target invocation failed then we should run the after failure
-         * pipeline since we will be in the FAILUREHANDLINE state and after
-         * doing so we throw the original throwable raised by the target.
-         */
-        if ( invocation.getState() == InvocationStateEnum.POSTINVOCATION )
-        {
-            try
-            {
-                after.invoke( invocation );
-                BaseInterceptor.setInvocation( null );
-                return invocation.getReturnValue();
-            }
-            catch ( Throwable throwable )
-            {
-                invocation.setState( InvocationStateEnum.FAILUREHANDLING );
-                
-                if ( invocation.getAfterFailure() == null )
-                {
-                    invocation.setAfterFailure( throwable );
-                }
-
-                afterFailure.invoke( invocation );
-                BaseInterceptor.setInvocation( null );
-                throw invocation.getAfterFailure();
-            }
+        public void modify(Name name, int modOp, Attributes mods) throws NamingException {
+            JndiProvider.this.invoke( new Modify( name, modOp, mods ) );
         }
-        else if ( invocation.getState() == InvocationStateEnum.FAILUREHANDLING )
-        {
-            afterFailure.invoke( invocation );
 
-            if ( invocation.getThrowable() == null )
-            {
-                throw new LdapNamingException( "Interceptor Framework Failure: "
-                        + "failures on the proxied call should have a non null "
-                        + "throwable associated with the Invocation object.",
-                        ResultCodeEnum.OTHER );
-            }
-
-            BaseInterceptor.setInvocation( null );
-            throw invocation.getThrowable();
-        }
-
-        // used for an optimization
-        BaseInterceptor.setInvocation( null );
-        throw new LdapNamingException( "Interceptor Framework Failure: "
-                + "invocation handling should never have reached this line",
-                ResultCodeEnum.OTHER );
-    }
+        public void modify(Name name, ModificationItem[] mods) throws NamingException {
+            JndiProvider.this.invoke( new ModifyMany( name, mods ) );
+        }
 
+        public NamingEnumeration list(Name base) throws NamingException {
+            return ( NamingEnumeration ) JndiProvider.this.invoke( new List( base ) );
+        }
 
-    /**
-     * Allows the addition of an interceptor to pipelines based on invocation
-     * processing states.
-     *
-     * @param interceptor the interceptor to add to pipelines
-     * @param states the states (pipelines) where the interceptor should be applied
-     */
-    public void addInterceptor( Interceptor interceptor, InvocationStateEnum states[] )
-    {
-        for ( int ii = 0; ii < states.length; ii++ )
-        {
-            switch( states[ii].getValue() )
-            {
-                case( InvocationStateEnum.PREINVOCATION_VAL ):
-                    before.add( interceptor );
-                    break;
-                case( InvocationStateEnum.POSTINVOCATION_VAL ):
-                    after.add( interceptor );
-                    break;
-                case( InvocationStateEnum.FAILUREHANDLING_VAL ):
-                    afterFailure.add( interceptor );
-                    break;
-                default:
-                    throw new IllegalStateException( "unexpected invocation state: "
-                            + states[ii].getName() );
-            }
+        public NamingEnumeration search(Name base, Map env, ExprNode filter, SearchControls searchCtls) throws NamingException {
+            return ( NamingEnumeration ) JndiProvider.this.invoke( new Search( base, env, filter, searchCtls ) );
         }
-    }
 
+        public Attributes lookup(Name name) throws NamingException {
+            return ( Attributes ) JndiProvider.this.invoke( new Lookup( name ) );
+        }
 
-    /**
-     * A dead context is requested and returned when we shutdown the system. It
-     * prevents a {@link javax.naming.NoInitialContextException} from being
-     * thrown by InitialContext or one of its subclasses.
-     *
-     * @return a unusable dead context
-     */
-    public Context getDeadContext()
-    {
-        return new DeadContext();
+        public Attributes lookup(Name dn, String[] attrIds) throws NamingException {
+            return ( Attributes ) JndiProvider.this.invoke( new LookupWithAttrIds( dn, attrIds ) );
+        }
+
+        public boolean hasEntry(Name name) throws NamingException {
+            return Boolean.TRUE.equals( JndiProvider.this.invoke( new HasEntry( name ) ) );
+        }
+
+        public boolean isSuffix(Name name) throws NamingException {
+            return Boolean.TRUE.equals( JndiProvider.this.invoke( new IsSuffix( name ) ) );
+        }
+
+        public void modifyRn(Name name, String newRn, boolean deleteOldRn) throws NamingException {
+            JndiProvider.this.invoke( new ModifyRN( name, newRn, deleteOldRn ) );
+        }
+
+        public void move(Name oriChildName, Name newParentName) throws NamingException {
+            JndiProvider.this.invoke( new Move( oriChildName, newParentName ) );
+        }
+
+        public void move(Name oriChildName, Name newParentName, String newRn, boolean deleteOldRn) throws NamingException {
+            JndiProvider.this.invoke( new MoveAndModifyRN( oriChildName, newParentName, newRn, deleteOldRn ) );
+        }
+
+        public void sync() throws NamingException {
+            nexus.sync();
+        }
+
+        public void close() throws NamingException {
+            nexus.close();
+        }
+
+        public boolean isClosed() {
+            return nexus.isClosed();
+        }
+        
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java Wed Mar 23 22:53:39 2005
@@ -60,7 +60,6 @@
     /** The Principal associated with this context */
     private LdapPrincipal principal;
 
-
     // ------------------------------------------------------------------------
     // Constructors
     // ------------------------------------------------------------------------
@@ -161,10 +160,8 @@
 
 
     /**
-     * Package friendly setter to alter the principal.  It is very important
-     * for security's sake to keep this package friendly and not public.
-     *
-     * @param principal the directory user principal
+     * Sets the principal of the authenticated user which also happens to own.
+     * This method can be invoked only once to keep this property safe.
      */
     void setPrincipal( LdapPrincipal principal )
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java?view=diff&r1=158888&r2=158889
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java Wed Mar 23 22:53:39 2005
@@ -22,18 +22,18 @@
 import java.util.Hashtable;
 
 import javax.naming.Context;
-import javax.naming.NamingException;
 import javax.naming.Name;
+import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapContext;
 
 import org.apache.ldap.common.exception.LdapConfigurationException;
-import org.apache.ldap.common.util.PropertiesUtils;
+import org.apache.ldap.common.ldif.LdifIterator;
 import org.apache.ldap.common.ldif.LdifParser;
 import org.apache.ldap.common.ldif.LdifParserImpl;
-import org.apache.ldap.common.ldif.LdifIterator;
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.common.util.PropertiesUtils;
 import org.apache.ldap.server.protocol.LdapProtocolProvider;
 import org.apache.mina.common.TransportType;
 import org.apache.mina.registry.Service;
@@ -53,22 +53,38 @@
 {
     /** the default LDAP port to use */
     private static final int LDAP_PORT = 389;
+    
+    private static final ServiceRegistry DEFAULT_MINA_REGISTRY;
+    
+    private static Service minaService;
+
+    private static ServiceRegistry minaRegistry;
+
+    static
+    {
+        ServiceRegistry tmp = null;
+        try
+        {
+            tmp = new SimpleServiceRegistry();
+        }
+        catch( IOException e )
+        {
+            e.printStackTrace();
+        }
+        
+        DEFAULT_MINA_REGISTRY = tmp;
+    }
 
     // ------------------------------------------------------------------------
     // Members
     // ------------------------------------------------------------------------
 
-    private static Service minaService;
-
-    private static ServiceRegistry minaRegistry;
-
 
     /**
      * Default constructor that sets the provider of this ServerContextFactory.
      */
     public ServerContextFactory()
     {
-        super();
     }
 
 
@@ -87,14 +103,20 @@
             {
                 this.provider.shutdown();
 
-                if ( minaRegistry != null )
+                if ( this.minaRegistry != null )
                 {
-                    minaRegistry.unbind( minaService );
+                    this.minaRegistry.unbind( minaService );
                 }
             }
-            catch ( Throwable t )
+            catch( NamingException ne )
+            {
+                throw ne;
+            }
+            catch( Throwable t )
             {
-                t.printStackTrace();
+                NamingException ne = new NamingException( "Failed to shutdown." );
+                ne.setRootCause( t );
+                throw ne;
             }
             finally
             {
@@ -145,26 +167,28 @@
 
         try
         {
+            if( DEFAULT_MINA_REGISTRY == null )
+            {
+                throw new NamingException( "Default MINA service registry is not available." );
+            }
+
             if( registry == null )
             {
-                registry = new SimpleServiceRegistry();
+                registry = DEFAULT_MINA_REGISTRY;
             }
 
             registry.bind( service, new LdapProtocolProvider( ( Hashtable ) initialEnv.clone() ) );
             
             minaService = service;
-
             minaRegistry = registry;
         }
         catch ( IOException e )
         {
-            e.printStackTrace();
-
             String msg = "Failed to bind the service to the service registry: " + service;
 
-            LdapConfigurationException e2 = new LdapConfigurationException( msg );
-
-            e2.setRootCause( e );
+            LdapConfigurationException lce = new LdapConfigurationException( msg );
+            lce.setRootCause( e );
+            throw lce;
         }
     }
 

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Add.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Add.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Add.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Add.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Add.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Add.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Delete.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Delete.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Delete.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Delete.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Delete.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Delete.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetMatchedDN.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetMatchedDN.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetMatchedDN.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetMatchedDN.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetMatchedDN.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetMatchedDN.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetSuffix.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetSuffix.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetSuffix.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetSuffix.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetSuffix.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/GetSuffix.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/HasEntry.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/HasEntry.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/HasEntry.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/HasEntry.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/HasEntry.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/HasEntry.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Invocation.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/IsSuffix.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/IsSuffix.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/IsSuffix.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/IsSuffix.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/IsSuffix.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/IsSuffix.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/List.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/List.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/List.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/List.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/List.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/List.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ListSuffixes.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/ListSuffixes.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ListSuffixes.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/ListSuffixes.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ListSuffixes.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ListSuffixes.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Lookup.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Lookup.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Lookup.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Lookup.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Lookup.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Lookup.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/LookupWithAttrIds.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/LookupWithAttrIds.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/LookupWithAttrIds.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/LookupWithAttrIds.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/LookupWithAttrIds.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/LookupWithAttrIds.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Modify.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Modify.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Modify.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Modify.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Modify.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Modify.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyMany.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyMany.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyMany.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyMany.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyMany.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyMany.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyRN.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyRN.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyRN.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyRN.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyRN.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/ModifyRN.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Move.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Move.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Move.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Move.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Move.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Move.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/MoveAndModifyRN.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/MoveAndModifyRN.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/MoveAndModifyRN.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/MoveAndModifyRN.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/MoveAndModifyRN.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/MoveAndModifyRN.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Search.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Search.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Search.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/Search.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Search.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/Search.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Authorizer.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/BaseInterceptor.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/BaseInterceptor.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/BaseInterceptor.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/BaseInterceptor.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/BaseInterceptor.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/BaseInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/Interceptor.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorChain.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorChain.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorChain.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorChain.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorChain.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorChain.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorConfigBuilder.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorConfigBuilder.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorConfigBuilder.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorConfigBuilder.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorConfigBuilder.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorConfigBuilder.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorContext.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorContext.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorContext.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorContext.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorContext.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorContext.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorException.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorException.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorException.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorException.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorException.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/InterceptorException.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/NextInterceptor.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/NextInterceptor.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/NextInterceptor.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/NextInterceptor.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/NextInterceptor.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/NextInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/OperationalAttributeInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java (from r158886, directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java?view=diff&rev=158889&p1=directory/apacheds/branches/interceptor_revamp/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java&r1=158886&p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java&r2=158889
==============================================================================
    (empty)

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/invocation/interceptor/SchemaManager.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision



Mime
View raw message