You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/05/25 05:37:31 UTC
svn commit: r659905 [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...
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=659905&r1=659904&r2=659905&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:37:28 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.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
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
{
- BaseEntryFilteringCursor cursor = nexus.list( new ListOperationContext( registries, normalizedName ) );
+ EntryFilteringCursor 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=659905&r1=659904&r2=659905&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:37:28 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.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
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 );
- BaseEntryFilteringCursor cursor = nexus.search(
+ EntryFilteringCursor 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=659905&r1=659904&r2=659905&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:37:28 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.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
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" } );
- BaseEntryFilteringCursor cursor = nexus.search(
+ EntryFilteringCursor cursor = nexus.search(
new SearchOperationContext( registries, contextName, AliasDerefMode.DEREF_ALWAYS, filter, ctrl ) );
List<LdapDN> names = new ArrayList<LdapDN>();
@@ -493,9 +493,9 @@
@Override
- public BaseEntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
+ public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception
{
- BaseEntryFilteringCursor cursor = nextInterceptor.search(
+ EntryFilteringCursor cursor = nextInterceptor.search(
new SearchOperationContext(
registries, opContext.getDn(), opContext.getAliasDerefMode(),
new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ),
@@ -507,7 +507,7 @@
@Override
- public BaseEntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
+ public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
throws Exception
{
SearchControls searchControls = opContext.getSearchControls();
@@ -521,7 +521,7 @@
searchControls.setReturningAttributes( newAttrIds );
}
- BaseEntryFilteringCursor cursor = nextInterceptor.search( new SearchOperationContext( registries,
+ EntryFilteringCursor 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=659905&r1=659904&r2=659905&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:37:28 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.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.filtering.EntryFilteringCursor;
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 );
- BaseEntryFilteringCursor cursor = ctx.getDirectoryService().getPartitionNexus().search(
+ EntryFilteringCursor cursor = ctx.getDirectoryService().getPartitionNexus().search(
new SearchOperationContext( ctx.getDirectoryService().getRegistries(), contextName,
AliasDerefMode.DEREF_ALWAYS, new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), ctrl ) );