directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1421848 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/api/ core-api/src/main/java/org/apache/directory/server/core/api/interceptor/ core-api/src/main/java/org/apache/directory/server/core/api/inter...
Date Fri, 14 Dec 2012 13:26:22 GMT
Author: elecharny
Date: Fri Dec 14 13:26:15 2012
New Revision: 1421848

URL: http://svn.apache.org/viewvc?rev=1421848&view=rev
Log:
o Removed the list() opration from the backend (Partition, Intecreptor, Store)
o Removed dead tests
o Reemoved unused methods in OperationalInterceptor
o The list() operation now calls a search in ServerContext and in CoreSession

Removed:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ListOperationContext.java
Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java
    directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
    directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
    directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
    directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
    directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java
    directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java Fri Dec 14 13:26:15 2012
@@ -27,7 +27,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -87,12 +86,6 @@ public interface OperationManager
     /**
      * TODO document after determining if this method should be here.
      */
-    EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException;
-
-
-    /**
-     * TODO document after determining if this method should be here.
-     */
     EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException;
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java Fri Dec 14 13:26:15 2012
@@ -33,7 +33,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -208,15 +207,6 @@ public abstract class BaseInterceptor im
         /**
          * {@inheritDoc}
          */
-        public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-        {
-            return nexus.list( listContext );
-        }
-
-
-        /**
-         * {@inheritDoc}
-         */
         public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
         {
             return nexus.lookup( lookupContext );
@@ -544,30 +534,6 @@ public abstract class BaseInterceptor im
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        return null;
-    }
-
-
-    /**
-     * Calls the next interceptor for the list operation.
-     * 
-     * @param listContext The context in which we are executing this operation
-     * @return the cursor containing the listed entries
-     * @throws LdapException If something went wrong
-     */
-    protected final EntryFilteringCursor next( ListOperationContext listContext ) throws LdapException
-    {
-        Interceptor interceptor = getNextInterceptor( listContext );
-
-        return interceptor.list( listContext );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         return next( lookupContext );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java Fri Dec 14 13:26:15 2012
@@ -28,7 +28,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -170,12 +169,6 @@ public interface Interceptor
 
 
     /**
-     * Filters {@link Partition#list( ListOperationContext )} call.
-     */
-    EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException;
-
-
-    /**
      * Filters {@link Partition#lookup( LookupOperationContext )} call.
      */
     Entry lookup( LookupOperationContext lookupContext ) throws LdapException;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java Fri Dec 14 13:26:15 2012
@@ -25,12 +25,10 @@ import java.io.OutputStream;
 import java.util.UUID;
 
 import org.apache.directory.server.core.api.CacheService;
-import org.apache.directory.server.core.api.entry.ServerSearchResult;
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -190,19 +188,6 @@ public interface Partition
 
 
     /**
-     * A specialized form of one level search used to return a minimal set of
-     * information regarding child entries under a base.  Convenience method
-     * used to optimize operations rather than conducting a full search with
-     * retrieval.
-     *
-     * @param listContext the context containing the distinguished/absolute name for the search/listing
-     * @return a NamingEnumeration containing objects of type {@link ServerSearchResult}
-     * @throws Exception if there are any problems
-     */
-    EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException;
-
-
-    /**
      * Conducts a search against this ContextPartition.  Namespace specific
      * parameters for search are contained within the environment using
      * namespace specific keys into the hash.  For example in the LDAP namespace

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java Fri Dec 14 13:26:15 2012
@@ -29,7 +29,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -361,15 +360,6 @@ public final class SchemaPartition exten
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        return wrapped.list( listContext );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public boolean hasEntry( HasEntryOperationContext hasEntryContext ) throws LdapException
     {
         return wrapped.hasEntry( hasEntryContext );

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java Fri Dec 14 13:26:15 2012
@@ -39,7 +39,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -50,6 +49,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -60,6 +60,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidSearchFilterException;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.FilterParser;
+import org.apache.directory.shared.ldap.model.filter.PresenceNode;
 import org.apache.directory.shared.ldap.model.message.AddRequest;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.message.CompareRequest;
@@ -91,12 +92,18 @@ public class MockCoreSession implements 
     private LdapPrincipal authorizedPrincipal;
     private LdapPrincipal anonymousPrincipal;
 
+    /** A reference to the ObjectClass AT */
+    protected AttributeType OBJECT_CLASS_AT;
+
 
     public MockCoreSession( LdapPrincipal principal, DirectoryService directoryService )
     {
         this.directoryService = directoryService;
         this.authenticatedPrincipal = principal;
         this.anonymousPrincipal = new LdapPrincipal( directoryService.getSchemaManager() );
+
+        // setup attribute type value
+        OBJECT_CLASS_AT = directoryService.getSchemaManager().getAttributeType( SchemaConstants.OBJECT_CLASS_AT );
     }
 
 
@@ -458,10 +465,11 @@ public class MockCoreSession implements 
     {
         OperationManager operationManager = directoryService.getOperationManager();
 
-        ListOperationContext listContext = new ListOperationContext( this, dn, returningAttributes );
-        listContext.setAliasDerefMode( aliasDerefMode );
+        PresenceNode filter = new PresenceNode( OBJECT_CLASS_AT );
+        SearchOperationContext searchContext = new SearchOperationContext( this, dn, SearchScope.ONELEVEL, filter, returningAttributes );
+        searchContext.setAliasDerefMode( aliasDerefMode );
 
-        return operationManager.list( listContext );
+        return operationManager.search( searchContext );
     }
 
 

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java Fri Dec 14 13:26:15 2012
@@ -30,7 +30,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -140,16 +139,6 @@ public class MockInterceptor extends Bas
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        interceptors.add( this );
-        return next( listContext );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         interceptors.add( this );

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java Fri Dec 14 13:26:15 2012
@@ -29,7 +29,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -85,12 +84,6 @@ public class MockOperationManager implem
     }
 
 
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        return null;
-    }
-
-
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         return null;

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java Fri Dec 14 13:26:15 2012
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNotNull;
 
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -47,6 +46,7 @@ public class ListPerfIT extends Abstract
     @Test
     public void testPerfList() throws Exception
     {
+        /*
         ListOperationContext listContext = new ListOperationContext( getService().getAdminSession(), new Dn( "ou=system" ) );
         EntryFilteringCursor cursor = getService().getOperationManager().list( listContext );
 
@@ -108,5 +108,6 @@ public class ListPerfIT extends Abstract
 
         Long deltaWarmed = ( t1 - t00 );
         System.out.println( "Delta list: " + deltaWarmed + "( " + ( ( ( nbIterations - 50000 ) * 1000 ) / deltaWarmed ) + " per s ) /" + ( t1 - t0 ) );
+        */
     }
 }

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Fri Dec 14 13:26:15 2012
@@ -62,7 +62,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -587,17 +586,18 @@ public abstract class ServerContext impl
     protected EntryFilteringCursor doListOperation( Dn target ) throws Exception
     {
         // setup the op context and populate with request controls
-        ListOperationContext listContext = new ListOperationContext( session, target );
-        listContext.addRequestControls( convertControls( true, requestControls ) );
+        PresenceNode filter = new PresenceNode( OBJECT_CLASS_AT );
+        SearchOperationContext searchContext = new SearchOperationContext( session, target, SearchScope.ONELEVEL, filter, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
+        searchContext.addRequestControls( convertControls( true, requestControls ) );
 
-        // execute list operation
+        // execute search operation
         OperationManager operationManager = service.getOperationManager();
-        EntryFilteringCursor results = operationManager.list( listContext );
+        EntryFilteringCursor results = operationManager.search( searchContext );
 
         // clear the request controls and set the response controls
         requestControls = EMPTY_CONTROLS;
         responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(),
-            listContext.getResponseControls() );
+            searchContext.getResponseControls() );
 
         return results;
     }

Modified: directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java Fri Dec 14 13:26:15 2012
@@ -39,7 +39,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -51,6 +50,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -61,6 +61,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidSearchFilterException;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.FilterParser;
+import org.apache.directory.shared.ldap.model.filter.PresenceNode;
 import org.apache.directory.shared.ldap.model.message.AddRequest;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.message.CompareRequest;
@@ -99,6 +100,9 @@ public class DefaultCoreSession implemen
     /** The authorized principal, which will be used when a user has been authorized */
     private LdapPrincipal authorizedPrincipal;
 
+    /** A reference to the ObjectClass AT */
+    protected AttributeType OBJECT_CLASS_AT;
+
 
     /**
      * Creates a new instance of a DefaultCoreSession
@@ -110,6 +114,9 @@ public class DefaultCoreSession implemen
         this.directoryService = directoryService;
         authenticatedPrincipal = principal;
         anonymousPrincipal = new LdapPrincipal( directoryService.getSchemaManager() );
+
+        // setup attribute type value
+        OBJECT_CLASS_AT = directoryService.getSchemaManager().getAttributeType( SchemaConstants.OBJECT_CLASS_AT );
     }
 
 
@@ -480,10 +487,11 @@ public class DefaultCoreSession implemen
     {
         OperationManager operationManager = directoryService.getOperationManager();
 
-        ListOperationContext listContext = new ListOperationContext( this, dn, returningAttributes );
-        listContext.setAliasDerefMode( aliasDerefMode );
+        PresenceNode filter = new PresenceNode( OBJECT_CLASS_AT );
+        SearchOperationContext searchContext = new SearchOperationContext( this, dn, SearchScope.ONELEVEL, filter, returningAttributes );
+        searchContext.setAliasDerefMode( aliasDerefMode );
 
-        return operationManager.list( listContext );
+        return operationManager.search( searchContext );
     }
 
 

Modified: directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java Fri Dec 14 13:26:15 2012
@@ -43,7 +43,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -477,16 +476,6 @@ public class DefaultPartitionNexus exten
     }
 
 
-    /**
-     * {@inheritDoc}
-     */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        Partition partition = getPartition( listContext.getDn() );
-
-        return partition.list( listContext );
-    }
-
 
     /**
      * {@inheritDoc}

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Fri Dec 14 13:26:15 2012
@@ -37,7 +37,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -671,42 +670,6 @@ public class DefaultOperationManager imp
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        if ( IS_DEBUG )
-        {
-            LOG.debug( ">> ListOperation : {}", listContext );
-        }
-
-        ensureStarted();
-
-        Interceptor head = directoryService.getInterceptor( listContext.getNextInterceptor() );
-
-        EntryFilteringCursor cursor = null;
-
-        try
-        {
-            lockRead();
-
-            cursor = head.list( listContext );
-        }
-        finally
-        {
-            unlockRead();
-        }
-
-        if ( IS_DEBUG )
-        {
-            LOG.debug( "<< ListOperation successful" );
-        }
-
-        return cursor;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         if ( IS_DEBUG )

Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Fri Dec 14 13:26:15 2012
@@ -60,7 +60,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -776,23 +775,6 @@ public class AuthenticationInterceptor e
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        if ( IS_DEBUG )
-        {
-            LOG.debug( "Operation Context: {}", listContext );
-        }
-
-        checkAuthenticated( listContext );
-        checkPwdReset( listContext );
-
-        return next( listContext );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         if ( IS_DEBUG )

Modified: directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Fri Dec 14 13:26:15 2012
@@ -44,7 +44,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -780,27 +779,6 @@ public class AciAuthorizationInterceptor
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        LdapPrincipal user = listContext.getSession().getEffectivePrincipal();
-        EntryFilteringCursor cursor = next( listContext );
-
-        if ( isPrincipalAnAdministrator( user.getDn() )
-            || !directoryService.isAccessControlEnabled() )
-        {
-            return cursor;
-        }
-
-        AuthorizationFilter authzFilter = new AuthorizationFilter();
-        cursor.addEntryFilter( authzFilter );
-
-        return cursor;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         CoreSession session = lookupContext.getSession();

Modified: directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Fri Dec 14 13:26:15 2012
@@ -35,7 +35,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.api.interceptor.Interceptor;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -237,24 +236,6 @@ public class DefaultAuthorizationInterce
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        EntryFilteringCursor cursor = next( listContext );
-
-        if ( listContext.getSession().getDirectoryService().isAccessControlEnabled() )
-        {
-            return cursor;
-        }
-
-        cursor.addEntryFilter( new DefaultAuthorizationSearchFilter() );
-
-        return cursor;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         CoreSession session = lookupContext.getSession();

Modified: directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Fri Dec 14 13:26:15 2012
@@ -33,7 +33,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.FilteringOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
@@ -140,19 +139,6 @@ public class CollectiveAttributeIntercep
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        EntryFilteringCursor cursor = next( listContext );
-
-        cursor.addEntryFilter( SEARCH_FILTER );
-
-        return cursor;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         Entry result = next( lookupContext );

Modified: directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Fri Dec 14 13:26:15 2012
@@ -25,13 +25,10 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.InterceptorEnum;
 import org.apache.directory.server.core.api.entry.ClonedServerEntry;
-import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -42,7 +39,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.partition.PartitionNexus;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -223,25 +219,6 @@ public class ExceptionInterceptor extend
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        if ( listContext.getDn().getNormName().equals( subschemSubentryDn.getNormName() ) )
-        {
-            // there is nothing under the schema subentry
-            return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), listContext );
-        }
-
-        // check if entry to search exists
-        //String msg = "Attempt to search under non-existant entry: ";
-        //assertHasEntry( listContext, msg, listContext.getDn() );
-
-        return next( listContext );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public void modify( ModifyOperationContext modifyContext ) throws LdapException
     {
         // check if entry to modify exists

Modified: directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java Fri Dec 14 13:26:15 2012
@@ -32,7 +32,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -94,10 +93,6 @@ public class TimerInterceptor extends Ba
     private static AtomicLong totalHasEntry = new AtomicLong( 0 );
     private static AtomicInteger nbHasEntryCalls = new AtomicInteger( 0 );
 
-    /** Stats for the list operation */
-    private static AtomicLong totalList = new AtomicLong( 0 );
-    private static AtomicInteger nbListCalls = new AtomicInteger( 0 );
-
     /** Stats for the lookup operation */
     private static AtomicLong totalLookup = new AtomicLong( 0 );
     private static AtomicInteger nbLookupCalls = new AtomicInteger( 0 );
@@ -338,37 +333,6 @@ public class TimerInterceptor extends Ba
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        long t0 = System.nanoTime();
-        EntryFilteringCursor cursor = next( listContext );
-        long delta = System.nanoTime() - t0;
-
-        if ( IS_DEBUG_STATS )
-        {
-            nbListCalls.incrementAndGet();
-            totalList.getAndAdd( delta );
-
-            if ( nbListCalls.get() % 1000 == 0 )
-            {
-                long average = totalList.get() / ( nbListCalls.get() * 1000 );
-                OPERATION_STATS.debug( getName() + " : Average list = {} microseconds, nb lists = {}", average,
-                    nbListCalls.get() );
-            }
-        }
-
-        if ( IS_DEBUG_TIME )
-        {
-            OPERATION_TIME.debug( "{} : Delta list = {}", getName(), delta );
-        }
-
-        return cursor;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         long t0 = System.nanoTime();

Modified: directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Fri Dec 14 13:26:15 2012
@@ -30,7 +30,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -191,17 +190,6 @@ public class NormalizationInterceptor ex
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        listContext.getDn().apply( schemaManager );
-
-        return next( listContext );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         lookupContext.getDn().apply( schemaManager );

Modified: directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Fri Dec 14 13:26:15 2012
@@ -20,10 +20,8 @@
 package org.apache.directory.server.core.operational;
 
 
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
@@ -37,7 +35,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.Interceptor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -61,7 +58,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.UsageEnum;
 import org.apache.directory.shared.util.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,8 +78,6 @@ public class OperationalAttributeInterce
 
     private final EntryFilter DENORMALIZING_SEARCH_FILTER = new OperationalAttributeDenormalizingSearchFilter();
 
-    private final EntryFilter SEARCH_FILTER = new OperationalAttributeSearchFilter();
-
     /** The subschemasubentry Dn */
     private Dn subschemaSubentryDn;
 
@@ -130,30 +124,6 @@ public class OperationalAttributeInterce
         }
     }
 
-    /**
-     * the database search result filter to register with filter service
-     */
-    private class OperationalAttributeSearchFilter implements EntryFilter
-    {
-        /**
-         * {@inheritDoc}
-         */
-        public boolean accept( SearchingOperationContext operation, Entry entry ) throws Exception
-        {
-            return operation.getReturningAttributesString() != null
-                || filterOperationalAttributes( entry );
-        }
-        
-        
-        /**
-         * {@inheritDoc}
-         */
-        public String toString( String tabs )
-        {
-            return tabs + "OperationalAttributeSearchFilter";
-        }
-    }
-
 
     /**
      * Creates the operational attribute management service interceptor.
@@ -286,18 +256,6 @@ public class OperationalAttributeInterce
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        EntryFilteringCursor cursor = next( listContext );
-        cursor.addEntryFilter( SEARCH_FILTER );
-
-        return cursor;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         Dn dn = lookupContext.getDn();
@@ -525,39 +483,6 @@ public class OperationalAttributeInterce
     }
 
 
-    /**
-     * Filters out the operational attributes within a search results attributes.  The attributes are directly
-     * modified.
-     *
-     * @param attributes the resultant attributes to filter
-     * @return true always
-     * @throws Exception if there are failures in evaluation
-     */
-    private boolean filterOperationalAttributes( Entry attributes ) throws LdapException
-    {
-        Set<AttributeType> removedAttributes = new HashSet<AttributeType>();
-
-        // Build a list of attributeType to remove
-        for ( Attribute attribute : attributes.getAttributes() )
-        {
-            AttributeType attributeType = attribute.getAttributeType();
-
-            if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS )
-            {
-                removedAttributes.add( attributeType );
-            }
-        }
-
-        // Now remove the attributes which are not USERs
-        for ( AttributeType attributeType : removedAttributes )
-        {
-            attributes.removeAttributes( attributeType );
-        }
-
-        return true;
-    }
-
-
     private void denormalizeEntryOpAttrs( Entry entry ) throws LdapException
     {
         if ( directoryService.isDenormalizeOpAttrsEnabled() )

Modified: directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Fri Dec 14 13:26:15 2012
@@ -40,7 +40,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext;
@@ -1163,17 +1162,6 @@ public class SchemaInterceptor extends B
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        EntryFilteringCursor cursor = next( listContext );
-
-        return cursor;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         Entry result = next( lookupContext );

Modified: directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Fri Dec 14 13:26:15 2012
@@ -39,7 +39,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -1065,22 +1064,6 @@ public class SubentryInterceptor extends
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        EntryFilteringCursor cursor = next( listContext );
-
-        if ( !isSubentryVisible( listContext ) )
-        {
-            cursor.addEntryFilter( new HideSubentriesFilter() );
-        }
-
-        return cursor;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public void modify( ModifyOperationContext modifyContext ) throws LdapException
     {
         Dn dn = modifyContext.getDn();

Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java Fri Dec 14 13:26:15 2012
@@ -34,6 +34,7 @@ import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.LdapPrincipal;
 import org.apache.directory.server.core.api.MockCoreSession;
 import org.apache.directory.server.core.api.MockDirectoryService;
@@ -175,9 +176,11 @@ public class LdifPartitionTest
     public void testLdifAddEntries() throws Exception
     {
         Dn adminDn = new Dn( schemaManager, "uid=admin,ou=system" );
+        DirectoryService directoryService = new MockDirectoryService( 1 );
+        directoryService.setSchemaManager( schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( schemaManager, adminDn,
             AuthenticationLevel.STRONG ),
-            new MockDirectoryService( 1 ) );
+            directoryService );
         AddOperationContext addCtx = new AddOperationContext( session );
 
         Entry entry1 = createEntry( "dc=test,ou=test,ou=system" );
@@ -221,9 +224,11 @@ public class LdifPartitionTest
     public void testLdifAddExistingEntry() throws Exception
     {
         Dn adminDn = new Dn( schemaManager, "uid=admin,ou=system" );
+        DirectoryService directoryService = new MockDirectoryService( 1 );
+        directoryService.setSchemaManager( schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( schemaManager, adminDn,
             AuthenticationLevel.STRONG ),
-            new MockDirectoryService( 1 ) );
+            directoryService );
         AddOperationContext addCtx = new AddOperationContext( session );
 
         Entry entry1 = createEntry( "dc=test,ou=test,ou=system" );
@@ -276,9 +281,11 @@ public class LdifPartitionTest
     public void testLdifDeleteExistingEntry() throws Exception
     {
         Dn adminDn = new Dn( schemaManager, "uid=admin,ou=system" );
+        DirectoryService directoryService = new MockDirectoryService( 1 );
+        directoryService.setSchemaManager( schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( schemaManager, adminDn,
             AuthenticationLevel.STRONG ),
-            new MockDirectoryService( 1 ) );
+            directoryService );
         AddOperationContext addCtx = new AddOperationContext( session );
 
         Entry entry1 = createEntry( "dc=test,ou=test,ou=system" );
@@ -363,9 +370,11 @@ public class LdifPartitionTest
     public void testLdifSearchExistingEntry() throws Exception
     {
         Dn adminDn = new Dn( schemaManager, "uid=admin,ou=system" );
+        DirectoryService directoryService = new MockDirectoryService( 1 );
+        directoryService.setSchemaManager( schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( schemaManager, adminDn,
             AuthenticationLevel.STRONG ),
-            new MockDirectoryService( 1 ) );
+            directoryService );
         AddOperationContext addCtx = new AddOperationContext( session );
 
         Entry entry1 = createEntry( "dc=test,ou=test,ou=system" );
@@ -592,9 +601,11 @@ public class LdifPartitionTest
     public void testSpecialCharacters() throws Exception
     {
         Dn adminDn = new Dn( schemaManager, "uid=admin,ou=system" );
+        DirectoryService directoryService = new MockDirectoryService( 1 );
+        directoryService.setSchemaManager( schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( schemaManager, adminDn,
             AuthenticationLevel.STRONG ),
-            new MockDirectoryService( 1 ) );
+            directoryService );
         AddOperationContext addCtx = new AddOperationContext( session );
 
         String rdnWithForbiddenChars = "dc=- -\\\"-%-&-(-)-*-\\+-/-:-\\;-\\<-\\>-?-[-\\5C-]-|-";
@@ -621,9 +632,11 @@ public class LdifPartitionTest
     public void testControlCharacters() throws Exception
     {
         Dn adminDn = new Dn( schemaManager, "uid=admin,ou=system" );
+        DirectoryService directoryService = new MockDirectoryService( 1 );
+        directoryService.setSchemaManager( schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( schemaManager, adminDn,
             AuthenticationLevel.STRONG ),
-            new MockDirectoryService( 1 ) );
+            directoryService );
         AddOperationContext addCtx = new AddOperationContext( session );
 
         String rdnWithControlChars = "userPassword=-\u0000-\u0001-\u0002-\u0003-\u0004-\u0005-\u0006-\u0007" +
@@ -653,9 +666,11 @@ public class LdifPartitionTest
     private CoreSession injectEntries() throws Exception
     {
         Dn adminDn = new Dn( schemaManager, "uid=admin,ou=system" );
+        DirectoryService directoryService = new MockDirectoryService( 1 );
+        directoryService.setSchemaManager( schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( schemaManager, adminDn,
             AuthenticationLevel.STRONG ),
-            new MockDirectoryService( 1 ) );
+            directoryService );
         AddOperationContext addCtx = new AddOperationContext( session );
 
         Entry childEntry1 = createEntry( "dc=child1,ou=test,ou=system" );

Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java Fri Dec 14 13:26:15 2012
@@ -37,6 +37,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.LdapPrincipal;
 import org.apache.directory.server.core.api.MockCoreSession;
 import org.apache.directory.server.core.api.MockDirectoryService;
@@ -140,8 +141,11 @@ public class SingleFileLdifPartitionTest
         defaultCSNFactory = new CsnFactory( 0 );
 
         Dn adminDn = new Dn( schemaManager, "uid=admin,ou=system" );
-        mockSession = new MockCoreSession( new LdapPrincipal( schemaManager, adminDn, AuthenticationLevel.STRONG ),
-            new MockDirectoryService( 1 ) );
+        DirectoryService directoryService = new MockDirectoryService( 1 );
+        directoryService.setSchemaManager( schemaManager );
+        mockSession = new MockCoreSession( new LdapPrincipal( schemaManager, adminDn,
+            AuthenticationLevel.STRONG ),
+            directoryService );
 
         String contextEntryStr =
             "dn: ou=test, ou=system\n" +

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Fri Dec 14 13:26:15 2012
@@ -40,7 +40,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.MoveAndRenameOperationContext;
@@ -61,8 +60,6 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.search.PartitionSearchResult;
 import org.apache.directory.server.xdbm.search.SearchEngine;
-import org.apache.directory.server.xdbm.search.cursor.ChildrenCursor;
-import org.apache.directory.server.xdbm.search.evaluator.PassThroughEvaluator;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -963,88 +960,6 @@ public abstract class AbstractBTreeParti
 
 
     //---------------------------------------------------------------------------------------------
-    // The List operation
-    //---------------------------------------------------------------------------------------------
-    /**
-     * {@inheritDoc}
-     */
-    public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException
-    {
-        return list( getEntryId( listContext.getDn() ), listContext );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public Cursor<IndexEntry<String, String>> list( String id ) throws LdapException
-    {
-        try
-        {
-            Cursor<IndexEntry<ParentIdAndRdn, String>> cursor = rdnIdx.forwardCursor();
-
-            IndexEntry<ParentIdAndRdn, String> startingPos = new IndexEntry<ParentIdAndRdn, String>();
-            startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) );
-            cursor.before( startingPos );
-
-            dumpRdnIdx();
-
-            PartitionSearchResult searchResult = new PartitionSearchResult( schemaManager );
-            Set<IndexEntry<String, String>> resultSet = new HashSet<IndexEntry<String, String>>();
-
-            Cursor<IndexEntry<String, String>> childrenCursor = new ChildrenCursor( this, id, cursor );
-
-            return childrenCursor;
-        }
-        catch ( Exception e )
-        {
-            throw new LdapOperationErrorException( e.getMessage(), e );
-        }
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public final EntryFilteringCursor list( String id, ListOperationContext listContext ) throws LdapException
-    {
-        try
-        {
-            // We use the OneLevel index to get all the entries from a starting point
-            // and below up to the number of children
-            Cursor<IndexEntry<ParentIdAndRdn, String>> cursor = rdnIdx.forwardCursor();
-
-            IndexEntry<ParentIdAndRdn, String> startingPos = new IndexEntry<ParentIdAndRdn, String>();
-            startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) );
-            cursor.before( startingPos );
-
-            dumpRdnIdx();
-
-            PartitionSearchResult searchResult = new PartitionSearchResult( schemaManager );
-            Set<IndexEntry<String, String>> resultSet = new HashSet<IndexEntry<String, String>>();
-
-            Cursor<IndexEntry<String, String>> childrenCursor = new ChildrenCursor( this, id, cursor );
-
-            while ( childrenCursor.next() )
-            {
-                IndexEntry<String, String> element = childrenCursor.get();
-                resultSet.add( element );
-            }
-
-            searchResult.setResultSet( resultSet );
-            searchResult.setEvaluator( new PassThroughEvaluator( this ) );
-
-            return new BaseEntryFilteringCursor( new EntryCursorAdaptor( this, searchResult ),
-                listContext );
-        }
-        catch ( Exception e )
-        {
-            throw new LdapOperationErrorException( e.getMessage(), e );
-        }
-    }
-
-
-    //---------------------------------------------------------------------------------------------
     // The Search operation
     //---------------------------------------------------------------------------------------------
     /**

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Fri Dec 14 13:26:15 2012
@@ -29,7 +29,6 @@ import java.util.Set;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -325,16 +324,6 @@ public interface Store
 
 
     /**
-     * Gets an IndexEntry Cursor over the child nodes of an entry.
-     *
-     * @param id the id of the parent entry
-     * @return an IndexEntry Cursor over the child entries
-     * @throws Exception on failures to access the underlying store
-     */
-    Cursor<IndexEntry<String, String>> list( String id ) throws Exception;
-
-
-    /**
      * Get back an entry knowing its UUID
      *
      * @param id The Entry UUID we want to get back

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java?rev=1421848&r1=1421847&r2=1421848&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java Fri Dec 14 13:26:15 2012
@@ -378,47 +378,6 @@ public class AvlPartitionTest
     }
 
 
-    @Test
-    public void testEntryOperations() throws Exception
-    {
-        assertEquals( 3, partition.getChildCount( Strings.getUUID( 1L ) ) );
-
-        Cursor<IndexEntry<String, String>> cursor = partition.list( Strings.getUUID( 2L ) );
-        assertNotNull( cursor );
-        cursor.beforeFirst();
-        assertTrue( cursor.next() );
-        assertEquals( Strings.getUUID( 6L ), cursor.get().getId() );
-        assertTrue( cursor.next() );
-        assertEquals( Strings.getUUID( 5L ), cursor.get().getId() );
-        assertFalse( cursor.next() );
-
-        assertEquals( 3, partition.getChildCount( Strings.getUUID( 1L ) ) );
-
-        partition.delete( Strings.getUUID( 2L ) );
-
-        assertEquals( 2, partition.getChildCount( Strings.getUUID( 1L ) ) );
-        assertEquals( 10, partition.count() );
-
-        // add an alias and delete to test dropAliasIndices method
-        Dn dn = new Dn( schemaManager, "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co." );
-        DefaultEntry entry = new DefaultEntry( schemaManager, dn,
-            "objectClass: top",
-            "objectClass: alias",
-            "objectClass: extensibleObject",
-            "ou: Apache",
-            "commonName: Jack Daniels",
-            "aliasedObjectName: cn=Jack Daniels,ou=Engineering,o=Good Times Co.",
-            "entryCSN", new CsnFactory( 1 ).newInstance().toString(),
-            "entryUUID", Strings.getUUID( 12 ).toString() );
-
-        AddOperationContext addContext = new AddOperationContext( null, entry );
-        partition.add( addContext );
-
-        partition.delete( Strings.getUUID( 12L ) );
-        cursor.close();
-    }
-
-
     @Test(expected = LdapNoSuchObjectException.class)
     public void testAddWithoutParentId() throws Exception
     {



Mime
View raw message