You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2013/12/27 07:48:38 UTC
svn commit: r1553632 - 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/sp/
core-api/src/test/java/org/apache/directory/server/core/api/ core-integ/sr...
Author: kayyagari
Date: Fri Dec 27 06:48:37 2013
New Revision: 1553632
URL: http://svn.apache.org/r1553632
Log:
changed the CoreSession interface to return Cursor instead of EntryFilteringCursor from search() method
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/CoreSession.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/LdapClassLoader.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcExecutionManager.java
directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockCoreSession.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java
directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/cramMD5/CramMd5CallbackHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/digestMD5/DigestMd5CallbackHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplConsumerManager.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/CoreSession.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/CoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/CoreSession.java Fri Dec 27 06:48:37 2013
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.entry.Modification;
import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -735,7 +736,7 @@ public interface CoreSession
* @param filter the search filter
* @throws Exception if there are failures while listing children
*/
- EntryFilteringCursor search( Dn dn, String filter ) throws LdapException;
+ Cursor<Entry> search( Dn dn, String filter ) throws LdapException;
/**
@@ -748,7 +749,7 @@ public interface CoreSession
* @param ignoreReferrals a flag to tell the server to ignore referrals
* @throws Exception if there are failures while listing children
*/
- EntryFilteringCursor search( Dn dn, String filter, boolean ignoreReferrals ) throws LdapException;
+ Cursor<Entry> search( Dn dn, String filter, boolean ignoreReferrals ) throws LdapException;
/**
@@ -761,11 +762,11 @@ public interface CoreSession
* @param returningAttributes the attributes to return
* @throws Exception if there are failures while listing children
*/
- EntryFilteringCursor search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
+ Cursor<Entry> search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
String... returningAttributes ) throws LdapException;
- EntryFilteringCursor search( SearchRequest searchRequest ) throws LdapException;
+ Cursor<Entry> search( SearchRequest searchRequest ) throws LdapException;
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java Fri Dec 27 06:48:37 2013
@@ -31,6 +31,7 @@ import org.apache.directory.api.asn1.uti
import org.apache.directory.api.ldap.codec.api.BinaryAttributeDetector;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.cursor.EmptyCursor;
import org.apache.directory.api.ldap.model.cursor.EntryCursor;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
@@ -84,7 +85,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.ldap.client.api.AbstractLdapConnection;
import org.apache.directory.ldap.client.api.EntryCursorImpl;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -998,7 +998,7 @@ public class LdapCoreSessionConnection e
searchRequest.setMessageId( newId );
- EntryFilteringCursor entryCursor = session.search( searchRequest );
+ Cursor<Entry> entryCursor = session.search( searchRequest );
entryCursor.beforeFirst();
//TODO enforce the size and time limits, similar in the way SearchHandler does
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/LdapClassLoader.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/LdapClassLoader.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/LdapClassLoader.java Fri Dec 27 06:48:37 2013
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.entry.StringValue;
@@ -39,7 +40,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.server.core.api.DirectoryService;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.i18n.I18n;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,7 +93,7 @@ public class LdapClassLoader extends Cla
{
for ( Dn base : searchContexts )
{
- EntryFilteringCursor cursor = null;
+ Cursor<Entry> cursor = null;
try
{
cursor = directoryService.getAdminSession()
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcExecutionManager.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcExecutionManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/sp/StoredProcExecutionManager.java Fri Dec 27 06:48:37 2013
@@ -25,6 +25,7 @@ import java.util.List;
import javax.naming.directory.SearchControls;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.entry.StringValue;
import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -36,7 +37,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.entry.ClonedServerEntry;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.i18n.I18n;
@@ -88,7 +88,7 @@ public class StoredProcExecutionManager
ExprNode filter = new EqualityNode<String>( storeProcUnitNamAT,
new StringValue( storeProcUnitNamAT, spUnitName ) );
Dn dn = session.getDirectoryService().getDnFactory().create( storedProcContainer );
- EntryFilteringCursor results = session.search( dn, SearchScope.SUBTREE, filter,
+ Cursor<Entry> results = session.search( dn, SearchScope.SUBTREE, filter,
AliasDerefMode.DEREF_ALWAYS );
if ( results.first() )
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=1553632&r1=1553631&r2=1553632&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 27 06:48:37 2013
@@ -29,6 +29,7 @@ import java.util.Set;
import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.BinaryValue;
import org.apache.directory.api.ldap.model.entry.DefaultModification;
import org.apache.directory.api.ldap.model.entry.Entry;
@@ -726,7 +727,7 @@ public class MockCoreSession implements
/**
* {@inheritDoc}
*/
- public EntryFilteringCursor search( Dn dn, String filter ) throws LdapException
+ public Cursor<Entry> search( Dn dn, String filter ) throws LdapException
{
return search( dn, filter, true );
}
@@ -735,7 +736,7 @@ public class MockCoreSession implements
/**
* {@inheritDoc}
*/
- public EntryFilteringCursor search( Dn dn, String filter, boolean ignoreReferrals ) throws LdapException
+ public Cursor<Entry> search( Dn dn, String filter, boolean ignoreReferrals ) throws LdapException
{
OperationManager operationManager = directoryService.getOperationManager();
ExprNode filterNode = null;
@@ -760,7 +761,7 @@ public class MockCoreSession implements
/* (non-Javadoc)
* @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.api.ldap.model.name.Dn, org.apache.directory.api.ldap.model.filter.SearchScope, org.apache.directory.api.ldap.model.filter.ExprNode, org.apache.directory.api.ldap.model.message.AliasDerefMode, java.util.Set)
*/
- public EntryFilteringCursor search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
+ public Cursor<Entry> search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
String... returningAttributes ) throws LdapException
{
OperationManager operationManager = directoryService.getOperationManager();
@@ -929,7 +930,7 @@ public class MockCoreSession implements
}
- public EntryFilteringCursor search( SearchRequest searchRequest ) throws LdapException
+ public Cursor<Entry> search( SearchRequest searchRequest ) throws LdapException
{
SearchOperationContext searchContext = new SearchOperationContext( this, searchRequest );
OperationManager operationManager = directoryService.getOperationManager();
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Fri Dec 27 06:48:37 2013
@@ -28,6 +28,7 @@ import static org.junit.Assert.fail;
import java.util.Arrays;
import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -46,7 +47,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.junit.Test;
@@ -173,7 +173,7 @@ public class AuthorizationServiceAsNonAd
CoreSession akarasuluSession = getService().getSession( principal );
ExprNode filter = FilterParser.parse( getService().getSchemaManager(), "(objectClass=*)" );
- EntryFilteringCursor cursor = akarasuluSession.search( new Dn( "ou=users,ou=system" ), SearchScope.OBJECT, filter , AliasDerefMode.DEREF_ALWAYS );
+ Cursor<Entry> cursor = akarasuluSession.search( new Dn( "ou=users,ou=system" ), SearchScope.OBJECT, filter , AliasDerefMode.DEREF_ALWAYS );
while ( cursor.next() )
{
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java Fri Dec 27 06:48:37 2013
@@ -39,6 +39,7 @@ import javax.naming.directory.SearchCont
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapPartialResultException;
@@ -48,7 +49,6 @@ import org.apache.directory.server.const
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.api.CoreSession;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.junit.Before;
@@ -423,7 +423,7 @@ public class SearchReferralIT extends Ab
CoreSession coreSession = getService().getAdminSession();
Dn dn = new Dn( "ou=roles,o=Mnn,c=WW,ou=system" );
- EntryFilteringCursor cursor = coreSession.search( dn, "(ObjectClass=*)", true );
+ Cursor<Entry> cursor = coreSession.search( dn, "(ObjectClass=*)", true );
assertNotNull( cursor );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java Fri Dec 27 06:48:37 2013
@@ -27,6 +27,8 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
+import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException;
import org.apache.directory.api.ldap.model.filter.ExprNode;
import org.apache.directory.api.ldap.model.filter.FilterParser;
@@ -36,7 +38,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.CreatePartition;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.junit.Ignore;
@@ -441,7 +442,7 @@ public class AliasSearchIT extends Abstr
SearchScope scope = SearchScope.SUBTREE;
ExprNode exprNode = FilterParser.parse( getService().getSchemaManager(), "(objectClass=*)" );
AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS;
- EntryFilteringCursor cursor = getService().getAdminSession()
+ Cursor<Entry> cursor = getService().getAdminSession()
.search( base, scope, exprNode, aliasDerefMode );
// advancing the cursor forward and backward must give the same result
@@ -488,7 +489,7 @@ public class AliasSearchIT extends Abstr
SearchScope scope = SearchScope.SUBTREE;
ExprNode exprNode = FilterParser.parse( getService().getSchemaManager(), "(objectClass=*)" );
AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS;
- EntryFilteringCursor cursor = getService().getAdminSession()
+ Cursor<Entry> cursor = getService().getAdminSession()
.search( base, scope, exprNode, aliasDerefMode );
// advancing the cursor backward and forward must give the same result
@@ -583,7 +584,7 @@ public class AliasSearchIT extends Abstr
List<String> nextResults = new ArrayList<String>();
ExprNode exprNode = FilterParser.parse( getService().getSchemaManager(), filter );
- EntryFilteringCursor cursor = getService().getAdminSession().search( new Dn( base ), scope, exprNode,
+ Cursor<Entry> cursor = getService().getAdminSession().search( new Dn( base ), scope, exprNode,
aliasDerefMode );
cursor.beforeFirst();
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=1553632&r1=1553631&r2=1553632&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 27 06:48:37 2013
@@ -30,6 +30,7 @@ import java.util.Set;
import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.BinaryValue;
import org.apache.directory.api.ldap.model.entry.DefaultModification;
import org.apache.directory.api.ldap.model.entry.Entry;
@@ -794,7 +795,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public EntryFilteringCursor search( Dn dn, String filter ) throws LdapException
+ public Cursor<Entry> search( Dn dn, String filter ) throws LdapException
{
return search( dn, filter, true );
}
@@ -803,7 +804,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public EntryFilteringCursor search( Dn dn, String filter, boolean ignoreReferrals ) throws LdapException
+ public Cursor<Entry> search( Dn dn, String filter, boolean ignoreReferrals ) throws LdapException
{
OperationManager operationManager = directoryService.getOperationManager();
ExprNode filterNode = null;
@@ -829,7 +830,7 @@ public class DefaultCoreSession implemen
/* (non-Javadoc)
* @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.api.ldap.model.name.Dn, org.apache.directory.api.ldap.model.filter.SearchScope, org.apache.directory.api.ldap.model.filter.ExprNode, org.apache.directory.api.ldap.message.AliasDerefMode, java.util.Set)
*/
- public EntryFilteringCursor search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
+ public Cursor<Entry> search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
String... returningAttributes ) throws LdapException
{
OperationManager operationManager = directoryService.getOperationManager();
@@ -1068,7 +1069,7 @@ public class DefaultCoreSession implemen
}
- public EntryFilteringCursor search( SearchRequest searchRequest ) throws LdapException
+ public Cursor<Entry> search( SearchRequest searchRequest ) throws LdapException
{
SearchOperationContext searchContext = new SearchOperationContext( this, searchRequest );
searchContext.setSyncreplSearch( searchRequest.getControls().containsKey( SyncRequestValue.OID ) );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java Fri Dec 27 06:48:37 2013
@@ -485,7 +485,7 @@ public class LdapSession
if ( oldContext != null )
{
// ??? Very unlikely to happen ...
- EntryFilteringCursor cursor = oldContext.getCursor();
+ Cursor<Entry> cursor = oldContext.getCursor();
if ( cursor != null )
{
@@ -525,7 +525,7 @@ public class LdapSession
{
PagedSearchContext context = pagedSearchContexts.get( contextId );
- EntryFilteringCursor cursor = context.getCursor();
+ Cursor<Entry> cursor = context.getCursor();
if ( cursor != null )
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java Fri Dec 27 06:48:37 2013
@@ -20,11 +20,12 @@
package org.apache.directory.server.ldap.handlers;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
+import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.message.AbandonListener;
import org.apache.directory.api.ldap.model.message.AbandonableRequest;
import org.apache.directory.server.core.api.event.DirectoryListener;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
-import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.ldap.LdapServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,11 +41,11 @@ public class SearchAbandonListener imple
{
private static final Logger LOG = LoggerFactory.getLogger( SearchAbandonListener.class );
private final LdapServer ldapServer;
- private EntryFilteringCursor cursor;
+ private Cursor<Entry> cursor;
private DirectoryListener listener;
- public SearchAbandonListener( LdapServer ldapServer, EntryFilteringCursor cursor, DirectoryListener listener )
+ public SearchAbandonListener( LdapServer ldapServer, Cursor<Entry> cursor, DirectoryListener listener )
{
if ( ldapServer == null )
{
@@ -63,7 +64,7 @@ public class SearchAbandonListener imple
}
- public SearchAbandonListener( LdapServer ldapServer, EntryFilteringCursor cursor )
+ public SearchAbandonListener( LdapServer ldapServer, Cursor<Entry> cursor )
{
this( ldapServer, cursor, null );
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Fri Dec 27 06:48:37 2013
@@ -26,6 +26,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.directory.api.asn1.ber.tlv.BerValue;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
+import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.message.SearchRequest;
import org.apache.directory.api.ldap.model.schema.AttributeType;
@@ -57,7 +59,7 @@ public class PagedSearchContext
private AtomicInteger cookieValue;
/** The associated cursor for the current search request */
- private EntryFilteringCursor cursor;
+ private Cursor<Entry> cursor;
/**
@@ -292,7 +294,7 @@ public class PagedSearchContext
/**
* @return The associated cursor
*/
- public EntryFilteringCursor getCursor()
+ public Cursor<Entry> getCursor()
{
return cursor;
}
@@ -302,7 +304,7 @@ public class PagedSearchContext
* Set the new cursor for this search request
* @param cursor The associated cursor
*/
- public void setCursor( EntryFilteringCursor cursor )
+ public void setCursor( Cursor<Entry> cursor )
{
this.cursor = cursor;
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java Fri Dec 27 06:48:37 2013
@@ -32,6 +32,7 @@ import org.apache.commons.lang.exception
import org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator;
import org.apache.directory.api.ldap.extras.controls.SyncRequestValue;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.cursor.CursorClosedException;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.Entry;
@@ -307,7 +308,7 @@ public class SearchRequestHandler extend
* @param cursor the {@link EntryFilteringCursor} over the search results
*/
private void setTimeLimitsOnCursor( SearchRequest req, LdapSession session,
- final EntryFilteringCursor cursor )
+ final Cursor<Entry> cursor )
{
// Don't bother setting time limits for administrators
if ( session.getCoreSession().isAnAdministrator() && req.getTimeLimit() == NO_TIME_LIMIT )
@@ -387,7 +388,7 @@ public class SearchRequestHandler extend
private void writeResults( LdapSession session, SearchRequest req, LdapResult ldapResult,
- EntryFilteringCursor cursor, long sizeLimit ) throws Exception
+ Cursor<Entry> cursor, long sizeLimit ) throws Exception
{
long count = 0;
@@ -446,7 +447,7 @@ public class SearchRequestHandler extend
private void readPagedResults( LdapSession session, SearchRequest req, LdapResult ldapResult,
- EntryFilteringCursor cursor, long sizeLimit, int pagedLimit, PagedSearchContext pagedContext,
+ Cursor<Entry> cursor, long sizeLimit, int pagedLimit, PagedSearchContext pagedContext,
PagedResultsDecorator pagedResultsControl ) throws Exception
{
req.addAbandonListener( new SearchAbandonListener( ldapServer, cursor ) );
@@ -567,7 +568,7 @@ public class SearchRequestHandler extend
pagedSearchControl.setCritical( true );
// Close the cursor
- EntryFilteringCursor cursor = psCookie.getCursor();
+ Cursor<Entry> cursor = psCookie.getCursor();
if ( cursor != null )
{
@@ -622,7 +623,7 @@ public class SearchRequestHandler extend
long sizeLimit = min( serverLimit, requestLimit );
int pagedLimit = pagedSearchControl.getSize();
- EntryFilteringCursor cursor = null;
+ Cursor<Entry> cursor = null;
PagedSearchContext pagedContext = null;
// We have the following cases :
@@ -815,7 +816,7 @@ public class SearchRequestHandler extend
// A normal search
// Check that we have a cursor or not.
// No cursor : do a search.
- EntryFilteringCursor cursor = session.getCoreSession().search( req );
+ Cursor<Entry> cursor = session.getCoreSession().search( req );
// register the request in the session
session.registerSearchRequest( req, cursor );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/cramMD5/CramMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/cramMD5/CramMd5CallbackHandler.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/cramMD5/CramMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/cramMD5/CramMd5CallbackHandler.java Fri Dec 27 06:48:37 2013
@@ -25,6 +25,7 @@ import javax.security.sasl.AuthorizeCall
import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.filter.ExprNode;
@@ -36,7 +37,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.server.ldap.handlers.sasl.AbstractSaslCallbackHandler;
import org.apache.directory.server.ldap.handlers.sasl.SaslConstants;
@@ -83,7 +83,7 @@ public class CramMd5CallbackHandler exte
Dn baseDn = new Dn( bindDn );
- EntryFilteringCursor cursor = adminSession.search(
+ Cursor<Entry> cursor = adminSession.search(
baseDn,
SearchScope.SUBTREE,
filter,
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/digestMD5/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/digestMD5/DigestMd5CallbackHandler.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/digestMD5/DigestMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/digestMD5/DigestMd5CallbackHandler.java Fri Dec 27 06:48:37 2013
@@ -25,6 +25,7 @@ import javax.security.sasl.AuthorizeCall
import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.filter.ExprNode;
@@ -36,7 +37,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.server.ldap.handlers.sasl.AbstractSaslCallbackHandler;
import org.apache.directory.server.ldap.handlers.sasl.SaslConstants;
@@ -83,7 +83,7 @@ public class DigestMd5CallbackHandler ex
Dn baseDn = new Dn( bindDn );
- EntryFilteringCursor cursor = adminSession.search(
+ Cursor<Entry> cursor = adminSession.search(
baseDn,
SearchScope.SUBTREE,
filter,
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java Fri Dec 27 06:48:37 2013
@@ -41,6 +41,7 @@ import org.apache.directory.api.ldap.ext
import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.csn.Csn;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -1031,7 +1032,7 @@ public class ReplicationConsumerImpl imp
searchRequest.setScope( SearchScope.SUBTREE );
searchRequest.addAttributes( "entryUuid", "entryCsn", "*" );
- EntryFilteringCursor cursor = session.search( searchRequest );
+ Cursor<Entry> cursor = session.search( searchRequest );
cursor.beforeFirst();
Entry localEntry = null;
@@ -1362,7 +1363,7 @@ public class ReplicationConsumerImpl imp
Dn dn = new Dn( schemaManager, config.getBaseDn() );
LOG.debug( "selecting entries to be deleted using filter {}", filter.toString() );
- EntryFilteringCursor cursor = session.search( dn, SearchScope.SUBTREE, filter,
+ Cursor<Entry> cursor = session.search( dn, SearchScope.SUBTREE, filter,
AliasDerefMode.NEVER_DEREF_ALIASES, SchemaConstants.ENTRY_UUID_AT );
cursor.beforeFirst();
@@ -1418,16 +1419,16 @@ public class ReplicationConsumerImpl imp
* @param map a map to hold the Cursor related to a Dn
* @throws Exception If the Dn is not valid or if the deletion failed
*/
- private void deleteRecursive( Dn rootDn, Map<Dn, EntryFilteringCursor> cursorMap ) throws Exception
+ private void deleteRecursive( Dn rootDn, Map<Dn, Cursor<Entry>> cursorMap ) throws Exception
{
LOG.debug( "searching for {}", rootDn.getName() );
- EntryFilteringCursor cursor = null;
+ Cursor<Entry> cursor = null;
try
{
if ( cursorMap == null )
{
- cursorMap = new HashMap<Dn, EntryFilteringCursor>();
+ cursorMap = new HashMap<Dn, Cursor<Entry>>();
}
cursor = cursorMap.get( rootDn );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplConsumerManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplConsumerManager.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplConsumerManager.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplConsumerManager.java Fri Dec 27 06:48:37 2013
@@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentHa
import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.DefaultModification;
@@ -50,7 +51,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.event.EventType;
import org.apache.directory.server.core.api.event.NotificationCriteria;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -275,7 +275,7 @@ public class ReplConsumerManager
searchRequest.setFilter( filter );
searchRequest.addAttributes( SchemaConstants.ALL_ATTRIBUTES_ARRAY );
- EntryFilteringCursor cursor = adminSession.search( searchRequest );
+ Cursor<Entry> cursor = adminSession.search( searchRequest );
// Now loop on each consumer configuration
while ( cursor.next() )
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java Fri Dec 27 06:48:37 2013
@@ -50,6 +50,7 @@ import org.apache.directory.api.ldap.ext
import org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueDecorator;
import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.entry.Modification;
@@ -634,7 +635,7 @@ public class SyncReplRequestHandler impl
// A normal search
// Check that we have a cursor or not.
// No cursor : do a search.
- EntryFilteringCursor cursor = session.getCoreSession().search( req );
+ Cursor<Entry> cursor = session.getCoreSession().search( req );
// Position the cursor at the beginning
cursor.beforeFirst();
@@ -683,7 +684,7 @@ public class SyncReplRequestHandler impl
* Process the results get from a search request. We will send them to the client.
*/
private void readResults( LdapSession session, SearchRequest req, LdapResult ldapResult,
- EntryFilteringCursor cursor, long sizeLimit, ReplicaEventLog replicaLog ) throws Exception
+ Cursor<Entry> cursor, long sizeLimit, ReplicaEventLog replicaLog ) throws Exception
{
long count = 0;
@@ -864,7 +865,7 @@ public class SyncReplRequestHandler impl
private void setTimeLimitsOnCursor( SearchRequest req, LdapSession session,
- final EntryFilteringCursor cursor )
+ final Cursor<Entry> cursor )
{
// Don't bother setting time limits for administrators
if ( session.getCoreSession().isAnAdministrator() && req.getTimeLimit() == NO_TIME_LIMIT )
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Fri Dec 27 06:48:37 2013
@@ -24,6 +24,7 @@ package org.apache.directory.server.prot
import java.util.HashMap;
import java.util.Map;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.filter.FilterParser;
@@ -50,7 +51,7 @@ public class GetCatalog implements Direc
{
String filter = "(objectClass=" + ApacheSchemaConstants.APACHE_CATALOG_ENTRY_OC + ")";
- EntryFilteringCursor list = session.search(
+ Cursor<Entry> list = session.search(
Dn.ROOT_DSE,
SearchScope.SUBTREE,
FilterParser.parse( session.getDirectoryService().getSchemaManager(), filter ),
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java Fri Dec 27 06:48:37 2013
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.entry.StringValue;
import org.apache.directory.api.ldap.model.entry.Value;
@@ -129,7 +130,7 @@ public class StoreUtils
public static Entry findPrincipalEntry( CoreSession session, Dn searchBaseDn, String principal )
throws Exception
{
- EntryFilteringCursor cursor = null;
+ Cursor<Entry> cursor = null;
try
{
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java Fri Dec 27 06:48:37 2013
@@ -32,6 +32,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.csn.Csn;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.message.ModifyRequest;
@@ -128,7 +129,7 @@ public class ClientServerReplicationIT
System.out.println( "-----------> Dumping the server <-----------" );
System.out.println( "-----------> Looking for " + entryDn.getNormName() + " <-----------" );
- EntryFilteringCursor cursor = session.search( searchRequest );
+ Cursor<Entry> cursor = session.search( searchRequest );
while ( cursor.next() )
{
Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1553632&r1=1553631&r2=1553632&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Fri Dec 27 06:48:37 2013
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.UUID;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
import org.apache.directory.api.ldap.model.entry.DefaultModification;
@@ -66,7 +67,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.DnFactory;
import org.apache.directory.server.core.api.InstanceLayout;
-import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
import org.apache.directory.server.core.api.partition.Partition;
import org.apache.directory.server.core.api.schema.SchemaPartition;
@@ -677,7 +677,7 @@ public class ApacheDsService
ExprNode filter = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT );
- EntryFilteringCursor cursor = session.search( partition.getSuffixDn(), SearchScope.SUBTREE, filter,
+ Cursor<Entry> cursor = session.search( partition.getSuffixDn(), SearchScope.SUBTREE, filter,
AliasDerefMode.NEVER_DEREF_ALIASES, MANDATORY_ENTRY_ATOP_AT );
cursor.beforeFirst();