directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r815851 - in /directory/apacheds/branches/apacheds-schema: core-api/src/main/java/org/apache/directory/server/core/interceptor/ core/src/main/java/org/apache/directory/server/core/collective/
Date Wed, 16 Sep 2009 15:57:26 GMT
Author: elecharny
Date: Wed Sep 16 15:57:26 2009
New Revision: 815851

URL: http://svn.apache.org/viewvc?rev=815851&view=rev
Log:
Declared the Rename operation in the BaseInterceptor, removed it from the CollectiveAttributeInterceptor

Modified:
    directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java

Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=815851&r1=815850&r2=815851&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
Wed Sep 16 15:57:26 2009
@@ -20,6 +20,10 @@
 package org.apache.directory.server.core.interceptor;
 
 
+import java.util.Set;
+
+import javax.naming.Context;
+
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
@@ -47,9 +51,6 @@
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
-import javax.naming.Context;
-import java.util.Set;
-
 
 /**
  * A easy-to-use implementation of {@link Interceptor}.  All methods are
@@ -185,16 +186,17 @@
     }
 
 
-    public void rename( NextInterceptor next, RenameOperationContext opContext ) throws Exception
+    public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext
)
+        throws Exception
     {
-        next.rename( opContext );
+        next.moveAndRename( opContext );
     }
 
 
-    public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext
)
+    public void rename( NextInterceptor next, RenameOperationContext opContext )
         throws Exception
     {
-        next.moveAndRename( opContext );
+        next.rename( opContext );
     }
 
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=815851&r1=815850&r2=815851&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
Wed Sep 16 15:57:26 2009
@@ -20,6 +20,11 @@
 package org.apache.directory.server.core.collective;
 
 
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.NamingException;
+
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
@@ -44,9 +49,6 @@
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
 
-import java.util.HashSet;
-import java.util.Set;
-
 
 /**
  * An interceptor based service dealing with collective attribute



Mime
View raw message