Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 19417 invoked from network); 25 May 2008 03:07:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 May 2008 03:07:14 -0000 Received: (qmail 58257 invoked by uid 500); 25 May 2008 03:07:15 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 58216 invoked by uid 500); 25 May 2008 03:07:15 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 58207 invoked by uid 99); 25 May 2008 03:07:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 May 2008 20:07:15 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 May 2008 03:06:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 85C4F2388A12; Sat, 24 May 2008 20:06:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r659898 [2/2] - in /directory/apacheds/branches/bigbang: core/src/main/java/org/apache/directory/server/core/authn/ core/src/main/java/org/apache/directory/server/core/authz/ core/src/main/java/org/apache/directory/server/core/authz/support... Date: Sun, 25 May 2008 03:06:45 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080525030650.85C4F2388A12@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=659898&r1=659897&r2=659898&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original) +++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Sat May 24 20:06:44 2008 @@ -28,7 +28,7 @@ import org.apache.directory.server.core.cursor.CursorIterator; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.filtering.EntryFilteringCursor; +import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor; import org.apache.directory.server.core.interceptor.Interceptor; import org.apache.directory.server.core.interceptor.InterceptorChain; import org.apache.directory.server.core.interceptor.context.SearchOperationContext; @@ -180,16 +180,16 @@ } - public EntryFilteringCursor search( SearchOperationContext opContext ) + public BaseEntryFilteringCursor search( SearchOperationContext opContext ) throws NamingException { - return new EntryFilteringCursor( new BogusCursor( count ), opContext ); + return new BaseEntryFilteringCursor( new BogusCursor( count ), opContext ); } - public EntryFilteringCursor search( SearchOperationContext opContext, Collection bypass ) throws NamingException + public BaseEntryFilteringCursor search( SearchOperationContext opContext, Collection bypass ) throws NamingException { - return new EntryFilteringCursor( new BogusCursor( count ), opContext ); + return new BaseEntryFilteringCursor( new BogusCursor( count ), opContext ); } } Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java?rev=659898&r1=659897&r2=659898&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java Sat May 24 20:06:44 2008 @@ -22,7 +22,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.ClonedServerEntry; -import org.apache.directory.server.core.filtering.EntryFilteringCursor; +import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor; import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext; import org.apache.directory.server.core.interceptor.context.AddOperationContext; import org.apache.directory.server.core.interceptor.context.BindOperationContext; @@ -155,14 +155,14 @@ } - public EntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception + public BaseEntryFilteringCursor list( NextInterceptor next, ListOperationContext opContext ) throws Exception { test.interceptors.add( this ); return next.list( opContext ); } - public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception + public BaseEntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception { test.interceptors.add( this ); return next.search( opContext ); Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java?rev=659898&r1=659897&r2=659898&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java (original) +++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java Sat May 24 20:06:44 2008 @@ -28,7 +28,7 @@ import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerEntryUtils; -import org.apache.directory.server.core.filtering.EntryFilteringCursor; +import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor; import org.apache.directory.server.core.interceptor.context.AddOperationContext; import org.apache.directory.server.core.interceptor.context.DeleteOperationContext; import org.apache.directory.server.core.interceptor.context.ListOperationContext; @@ -94,7 +94,7 @@ private void recursiveDelete( PartitionNexus nexus, LdapDN normalizedName, Registries registries ) throws Exception { - EntryFilteringCursor cursor = nexus.list( new ListOperationContext( registries, normalizedName ) ); + BaseEntryFilteringCursor cursor = nexus.list( new ListOperationContext( registries, normalizedName ) ); if ( !cursor.available() ) { Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java?rev=659898&r1=659897&r2=659898&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java (original) +++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java Sat May 24 20:06:44 2008 @@ -30,7 +30,7 @@ import org.apache.directory.server.core.entry.DefaultServerAttribute; import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.filtering.EntryFilteringCursor; +import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor; import org.apache.directory.server.core.interceptor.context.EntryOperationContext; import org.apache.directory.server.core.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; @@ -271,7 +271,7 @@ SearchControls ctrl = new SearchControls(); ctrl.setSearchScope( SearchControls.SUBTREE_SCOPE ); - EntryFilteringCursor cursor = nexus.search( + BaseEntryFilteringCursor cursor = nexus.search( new SearchOperationContext( registries, oldName, AliasDerefMode.DEREF_ALWAYS, new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), ctrl ) ); Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java?rev=659898&r1=659897&r2=659898&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java (original) +++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java Sat May 24 20:06:44 2008 @@ -35,7 +35,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.filtering.EntryFilteringCursor; +import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor; import org.apache.directory.server.core.interceptor.BaseInterceptor; import org.apache.directory.server.core.interceptor.Interceptor; import org.apache.directory.server.core.interceptor.NextInterceptor; @@ -345,7 +345,7 @@ ctrl.setSearchScope( SearchControls.SUBTREE_SCOPE ); ctrl.setReturningAttributes( new String[] { "entryCSN", "entryDeleted" } ); - EntryFilteringCursor cursor = nexus.search( + BaseEntryFilteringCursor cursor = nexus.search( new SearchOperationContext( registries, contextName, AliasDerefMode.DEREF_ALWAYS, filter, ctrl ) ); List names = new ArrayList(); @@ -493,9 +493,9 @@ @Override - public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception + public BaseEntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception { - EntryFilteringCursor cursor = nextInterceptor.search( + BaseEntryFilteringCursor cursor = nextInterceptor.search( new SearchOperationContext( registries, opContext.getDn(), opContext.getAliasDerefMode(), new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), @@ -507,7 +507,7 @@ @Override - public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) + public BaseEntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception { SearchControls searchControls = opContext.getSearchControls(); @@ -521,7 +521,7 @@ searchControls.setReturningAttributes( newAttrIds ); } - EntryFilteringCursor cursor = nextInterceptor.search( new SearchOperationContext( registries, + BaseEntryFilteringCursor cursor = nextInterceptor.search( new SearchOperationContext( registries, opContext.getDn(), opContext.getAliasDerefMode(), opContext.getFilter(), searchControls ) ); cursor.addEntryFilter( Constants.DELETED_ENTRIES_FILTER ); return cursor; Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java?rev=659898&r1=659897&r2=659898&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java (original) +++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java Sat May 24 20:06:44 2008 @@ -43,7 +43,7 @@ import org.apache.directory.mitosis.store.ReplicationLogIterator; import org.apache.directory.mitosis.store.ReplicationStore; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.filtering.EntryFilteringCursor; +import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor; import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.EntryAttribute; @@ -378,7 +378,7 @@ // Retrieve all subtree including the base entry SearchControls ctrl = new SearchControls(); ctrl.setSearchScope( SearchControls.SUBTREE_SCOPE ); - EntryFilteringCursor cursor = ctx.getDirectoryService().getPartitionNexus().search( + BaseEntryFilteringCursor cursor = ctx.getDirectoryService().getPartitionNexus().search( new SearchOperationContext( ctx.getDirectoryService().getRegistries(), contextName, AliasDerefMode.DEREF_ALWAYS, new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), ctrl ) );