Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 08A6CE306 for ; Fri, 14 Dec 2012 18:36:53 +0000 (UTC) Received: (qmail 44207 invoked by uid 500); 14 Dec 2012 18:36:53 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 44173 invoked by uid 500); 14 Dec 2012 18:36:52 -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 44166 invoked by uid 99); 14 Dec 2012 18:36:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Dec 2012 18:36:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 14 Dec 2012 18:36:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DB5A1238899C; Fri, 14 Dec 2012 18:36:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1422029 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/api/filtering/ core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ interceptors/authz/src/main/java/org/apache/dir... Date: Fri, 14 Dec 2012 18:36:19 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121214183624.DB5A1238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Fri Dec 14 18:36:13 2012 New Revision: 1422029 URL: http://svn.apache.org/viewvc?rev=1422029&view=rev Log: o Deleted the SearchingOperationContext, it has been merged with the SearchOperationContext (we don't need the abstract class anymore as we have removed the ListOperationContext class) o Fixed the places where we were using this class Removed: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilter.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursor.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.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/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/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java?rev=1422029&r1=1422028&r2=1422029&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java Fri Dec 14 18:36:13 2012 @@ -27,7 +27,7 @@ import java.util.List; import org.apache.directory.server.core.api.entry.ClonedServerEntry; import org.apache.directory.server.core.api.entry.ClonedServerEntrySearch; import org.apache.directory.server.core.api.entry.ServerEntryUtils; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; import org.apache.directory.shared.ldap.model.cursor.AbstractCursor; import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor; import org.apache.directory.shared.ldap.model.cursor.Cursor; @@ -61,7 +61,7 @@ public class BaseEntryFilteringCursor ex private final Cursor wrapped; /** the parameters associated with the search operation */ - private final SearchingOperationContext operationContext; + private final SearchOperationContext operationContext; /** the list of filters to be applied */ private final List filters; @@ -84,7 +84,7 @@ public class BaseEntryFilteringCursor ex * @param filter a single filter to be used */ public BaseEntryFilteringCursor( Cursor wrapped, - SearchingOperationContext operationContext, EntryFilter filter ) + SearchOperationContext operationContext, EntryFilter filter ) { this( wrapped, operationContext, Collections.singletonList( filter ) ); } @@ -99,7 +99,7 @@ public class BaseEntryFilteringCursor ex * @param invocation the search operation invocation creating this Cursor * @param filter a single filter to be used */ - public BaseEntryFilteringCursor( Cursor wrapped, SearchingOperationContext operationContext ) + public BaseEntryFilteringCursor( Cursor wrapped, SearchOperationContext operationContext ) { if ( IS_DEBUG ) { @@ -122,7 +122,7 @@ public class BaseEntryFilteringCursor ex * @param filters a list of filters to be used */ public BaseEntryFilteringCursor( Cursor wrapped, - SearchingOperationContext operationContext, List filters ) + SearchOperationContext operationContext, List filters ) { if ( IS_DEBUG ) { @@ -193,7 +193,7 @@ public class BaseEntryFilteringCursor ex /** * {@inheritDoc} */ - public SearchingOperationContext getOperationContext() + public SearchOperationContext getOperationContext() { return operationContext; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java?rev=1422029&r1=1422028&r2=1422029&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java Fri Dec 14 18:36:13 2012 @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.model.cursor.AbstractCursor; import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor; @@ -72,7 +72,7 @@ public class CursorList extends Abstract private EntryFilteringCursor currentCursor; /** the operation context */ - private SearchingOperationContext searchContext; + private SearchOperationContext searchContext; /** flag to detect the closed cursor */ private boolean closed; @@ -93,7 +93,7 @@ public class CursorList extends Abstract * @param list the list this ListCursor operates on * @param end the upper bound index */ - public CursorList( int start, List list, int end, SearchingOperationContext searchContext ) + public CursorList( int start, List list, int end, SearchOperationContext searchContext ) { if ( IS_DEBUG ) { @@ -142,7 +142,7 @@ public class CursorList extends Abstract * * @param list the backing for this ListCursor */ - public CursorList( List list, SearchingOperationContext searchContext ) + public CursorList( List list, SearchOperationContext searchContext ) { this( 0, list, list.size(), searchContext ); } @@ -433,7 +433,7 @@ public class CursorList extends Abstract /** * {@inheritDoc} */ - public SearchingOperationContext getOperationContext() + public SearchOperationContext getOperationContext() { return searchContext; } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilter.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilter.java?rev=1422029&r1=1422028&r2=1422029&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilter.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilter.java Fri Dec 14 18:36:13 2012 @@ -20,7 +20,7 @@ package org.apache.directory.server.core.api.filtering; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; import org.apache.directory.shared.ldap.model.entry.Entry; @@ -47,7 +47,7 @@ public interface EntryFilter * @return true if the entry is to be returned, false if it is rejected * @throws Exception if there are failures during evaluation */ - boolean accept( SearchingOperationContext operation, Entry result ) throws Exception; + boolean accept( SearchOperationContext operation, Entry result ) throws Exception; /** Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursor.java?rev=1422029&r1=1422028&r2=1422029&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursor.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursor.java Fri Dec 14 18:36:13 2012 @@ -22,7 +22,7 @@ package org.apache.directory.server.core import java.util.List; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; +import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; import org.apache.directory.shared.ldap.model.cursor.Cursor; import org.apache.directory.shared.ldap.model.entry.Entry; @@ -55,5 +55,5 @@ public interface EntryFilteringCursor ex /** * @return the operationContext */ - SearchingOperationContext getOperationContext(); + SearchOperationContext getOperationContext(); } \ No newline at end of file Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java?rev=1422029&r1=1422028&r2=1422029&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java Fri Dec 14 18:36:13 2012 @@ -20,6 +20,8 @@ package org.apache.directory.server.core.api.interceptor.context; +import static org.apache.directory.shared.ldap.model.message.SearchScope.ONELEVEL; + import javax.naming.directory.SearchControls; import org.apache.directory.server.core.api.CoreSession; @@ -27,6 +29,7 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.filter.ExprNode; +import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.apache.directory.shared.ldap.model.message.MessageTypeEnum; import org.apache.directory.shared.ldap.model.message.SearchRequest; import org.apache.directory.shared.ldap.model.message.SearchScope; @@ -40,8 +43,23 @@ import org.apache.directory.shared.util. * * @author Apache Directory Project */ -public class SearchOperationContext extends SearchingOperationContext +public class SearchOperationContext extends FilteringOperationContext { + /** A flag describing the way alias should be handled */ + private AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS; + + /** The sizeLimit for this search operation */ + private long sizeLimit = 0; + + /** The timeLimit for this search operation */ + private int timeLimit = 0; + + /** The scope for this search : default to One Level */ + private SearchScope scope = ONELEVEL; + + /** A flag if the search operation is abandoned */ + protected boolean abandoned = false; + /** The filter */ private ExprNode filter; @@ -128,7 +146,7 @@ public class SearchOperationContext exte ExprNode filter, String... returningAttributes ) { super( session, dn, returningAttributes ); - super.setScope( scope ); + this.scope = scope; this.filter = filter; if ( session != null ) @@ -171,16 +189,6 @@ public class SearchOperationContext exte /** - * @see Object#toString() - */ - public String toString() - { - return "SearchContext for Dn '" + getDn().getName() + "', filter :'" - + filter + "'"; - } - - - /** * @return the operation name */ public String getName() @@ -207,4 +215,105 @@ public class SearchOperationContext exte { this.syncreplSearch = syncreplSearch; } + + + /** + * @return The alias dereferencing mode + */ + public AliasDerefMode getAliasDerefMode() + { + return aliasDerefMode; + } + + + /** + * Set the Alias dereferencing mode + * @param aliasDerefMode Th erequested mode + */ + public void setAliasDerefMode( AliasDerefMode aliasDerefMode ) + { + this.aliasDerefMode = aliasDerefMode; + } + + + /** + * @return the sizeLimit + */ + public long getSizeLimit() + { + return sizeLimit; + } + + + /** + * @param sizeLimit the sizeLimit to set + */ + public void setSizeLimit( long sizeLimit ) + { + this.sizeLimit = sizeLimit; + } + + + /** + * @return the timeLimit + */ + public int getTimeLimit() + { + return timeLimit; + } + + + /** + * @param timeLimit the timeLimit to set + */ + public void setTimeLimit( int timeLimit ) + { + this.timeLimit = timeLimit; + } + + + /** + * @return the scope + */ + public SearchScope getScope() + { + return scope; + } + + + /** + * @param scope the scope to set + */ + public void setScope( SearchScope scope ) + { + this.scope = scope; + } + + + /** + * @return the abandoned + */ + public boolean isAbandoned() + { + return abandoned; + } + + + /** + * @param abandoned the abandoned to set + */ + public void setAbandoned( boolean abandoned ) + { + this.abandoned = abandoned; + } + + + /** + * @see Object#toString() + */ + public String toString() + { + return "SearchContext for Dn '" + getDn().getName() + "', filter :'" + + filter + "'"; + } } 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=1422029&r1=1422028&r2=1422029&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 18:36:13 2012 @@ -51,7 +51,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.OperationContext; import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.api.subtree.SubentryUtils; import org.apache.directory.server.core.authz.support.ACDFEngine; @@ -1437,7 +1436,7 @@ public class AciAuthorizationInterceptor /** * {@inheritDoc} */ - public boolean accept( SearchingOperationContext searchContext, Entry entry ) throws Exception + public boolean accept( SearchOperationContext searchContext, Entry entry ) throws Exception { Dn normName = entry.getDn().apply( schemaManager ); 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=1422029&r1=1422028&r2=1422029&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 18:36:13 2012 @@ -42,7 +42,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.OperationContext; import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.shared.DefaultCoreSession; import org.apache.directory.server.core.shared.partition.DefaultPartitionNexus; @@ -95,7 +94,7 @@ public class DefaultAuthorizationInterce /** * {@inheritDoc} */ - public boolean accept( SearchingOperationContext operation, Entry entry ) throws Exception + public boolean accept( SearchOperationContext operation, Entry entry ) throws Exception { return DefaultAuthorizationInterceptor.this.isSearchable( operation, entry ); } 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=1422029&r1=1422028&r2=1422029&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 18:36:13 2012 @@ -36,7 +36,6 @@ import org.apache.directory.server.core. 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; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.entry.Attribute; @@ -87,7 +86,7 @@ public class CollectiveAttributeIntercep /** * {@inheritDoc} */ - public boolean accept( SearchingOperationContext operation, Entry entry ) throws Exception + public boolean accept( SearchOperationContext operation, Entry entry ) throws Exception { addCollectiveAttributes( operation, entry ); 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=1422029&r1=1422028&r2=1422029&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 18:36:13 2012 @@ -41,7 +41,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.MoveOperationContext; import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; import org.apache.directory.server.core.shared.SchemaService; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; @@ -102,7 +101,7 @@ public class OperationalAttributeInterce /** * {@inheritDoc} */ - public boolean accept( SearchingOperationContext operation, Entry entry ) throws Exception + public boolean accept( SearchOperationContext operation, Entry entry ) throws Exception { if ( operation.getReturningAttributesString() == null ) { 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=1422029&r1=1422028&r2=1422029&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 18:36:13 2012 @@ -44,7 +44,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants; @@ -871,7 +870,7 @@ public class SchemaInterceptor extends B */ // This will suppress PMD.EmptyCatchBlock warnings in this method @SuppressWarnings("PMD.EmptyCatchBlock") - private void filterAttributeTypes( SearchingOperationContext operation, Entry result ) + private void filterAttributeTypes( SearchOperationContext operation, Entry result ) { if ( operation.getReturningAttributes() == null ) { @@ -919,7 +918,7 @@ public class SchemaInterceptor extends B /** * {@inheritDoc} */ - public boolean accept( SearchingOperationContext operationContext, Entry entry ) throws Exception + public boolean accept( SearchOperationContext operationContext, Entry entry ) throws Exception { ServerEntryUtils.filterContents( operationContext.getSession().getDirectoryService().getSchemaManager(), 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=1422029&r1=1422028&r2=1422029&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 18:36:13 2012 @@ -46,7 +46,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.OperationContext; import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext; import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; import org.apache.directory.server.core.api.partition.PartitionNexus; import org.apache.directory.server.core.api.subtree.SubentryCache; import org.apache.directory.server.core.api.subtree.SubtreeEvaluator; @@ -139,7 +138,7 @@ public class SubentryInterceptor extends /** * {@inheritDoc} */ - public boolean accept( SearchingOperationContext searchContext, Entry entry ) throws Exception + public boolean accept( SearchOperationContext searchContext, Entry entry ) throws Exception { // See if the requested entry is a subentry if ( directoryService.getSubentryCache().hasSubentry( entry.getDn() ) ) @@ -170,7 +169,7 @@ public class SubentryInterceptor extends /** * {@inheritDoc} */ - public boolean accept( SearchingOperationContext searchContext, Entry entry ) throws Exception + public boolean accept( SearchOperationContext searchContext, Entry entry ) throws Exception { // See if the requested entry is a subentry if ( directoryService.getSubentryCache().hasSubentry( entry.getDn() ) ) Modified: directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java?rev=1422029&r1=1422028&r2=1422029&view=diff ============================================================================== --- directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java (original) +++ directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java Fri Dec 14 18:36:13 2012 @@ -25,7 +25,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.SearchOperationContext; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.exception.LdapException; @@ -55,7 +54,7 @@ public class DelayInducingInterceptor ex /** * {@inheritDoc} */ - public boolean accept( SearchingOperationContext operation, Entry result ) throws Exception + public boolean accept( SearchOperationContext operation, Entry result ) throws Exception { if ( delayMillis != null ) { Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java?rev=1422029&r1=1422028&r2=1422029&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java Fri Dec 14 18:36:13 2012 @@ -27,7 +27,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.DirectoryService; import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor; import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext; -import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext; import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition; import org.apache.directory.server.core.partition.impl.btree.EntryCursorAdaptor; import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor; @@ -109,7 +108,7 @@ public class AbstractCursorTest searchResult.setEvaluator( evaluator ); // We want all the user attributes plus the entryUUID - SearchingOperationContext operationContext = + SearchOperationContext operationContext = new SearchOperationContext( session, Dn.ROOT_DSE, SearchScope.ONELEVEL, null, "*", "EntryUUID" ); return new BaseEntryFilteringCursor( new EntryCursorAdaptor( ( AbstractBTreePartition ) store, searchResult ),