You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/04/28 10:44:47 UTC
svn commit: r938820 [9/10] - in /directory:
apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/
apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/
apacheds/trunk/core-annota...
Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java Wed Apr 28 08:44:42 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.IndexCursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
/**
@@ -36,24 +36,24 @@ import org.apache.directory.shared.ldap.
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class SubtreeScopeCursor<ID> extends AbstractIndexCursor<ID, ServerEntry, ID>
+public class SubtreeScopeCursor<ID> extends AbstractIndexCursor<ID, Entry, ID>
{
private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_719 );
/** The Entry database/store */
- private final Store<ServerEntry, ID> db;
+ private final Store<Entry, ID> db;
/** A ScopeNode Evaluator */
- private final SubtreeScopeEvaluator<ServerEntry, ID> evaluator;
+ private final SubtreeScopeEvaluator<Entry, ID> evaluator;
/** A Cursor over the entries in the scope of the search base */
- private final IndexCursor<ID, ServerEntry, ID> scopeCursor;
+ private final IndexCursor<ID, Entry, ID> scopeCursor;
/** A Cursor over entries brought into scope by alias dereferencing */
- private final IndexCursor<ID, ServerEntry, ID> dereferencedCursor;
+ private final IndexCursor<ID, Entry, ID> dereferencedCursor;
/** Currently active Cursor: we switch between two cursors */
- private IndexCursor<ID, ServerEntry, ID> cursor;
+ private IndexCursor<ID, Entry, ID> cursor;
/** Whether or not this Cursor is positioned so an entry is available */
private boolean available = false;
@@ -68,7 +68,7 @@ public class SubtreeScopeCursor<ID> exte
* @param evaluator an IndexEntry (candidate) evaluator
* @throws Exception on db access failures
*/
- public SubtreeScopeCursor( Store<ServerEntry, ID> db, SubtreeScopeEvaluator<ServerEntry, ID> evaluator )
+ public SubtreeScopeCursor( Store<Entry, ID> db, SubtreeScopeEvaluator<Entry, ID> evaluator )
throws Exception
{
this.db = db;
@@ -130,7 +130,7 @@ public class SubtreeScopeCursor<ID> exte
}
- public void before( IndexEntry<ID, ServerEntry, ID> element ) throws Exception
+ public void before( IndexEntry<ID, Entry, ID> element ) throws Exception
{
throw new UnsupportedOperationException( UNSUPPORTED_MSG );
}
@@ -142,7 +142,7 @@ public class SubtreeScopeCursor<ID> exte
}
- public void after( IndexEntry<ID, ServerEntry, ID> element ) throws Exception
+ public void after( IndexEntry<ID, Entry, ID> element ) throws Exception
{
throw new UnsupportedOperationException( UNSUPPORTED_MSG );
}
@@ -319,7 +319,7 @@ public class SubtreeScopeCursor<ID> exte
}
- public IndexEntry<ID, ServerEntry, ID> get() throws Exception
+ public IndexEntry<ID, Entry, ID> get() throws Exception
{
checkNotClosed( "get()" );
if ( available )
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Wed Apr 28 08:44:42 2010
@@ -39,7 +39,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.tools.StoreUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.AndNode;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -71,7 +71,7 @@ public class AndCursorTest
private static final Logger LOG = LoggerFactory.getLogger( AndCursorTest.class.getSimpleName() );
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
EvaluatorBuilder evaluatorBuilder;
CursorBuilder cursorBuilder;
private static SchemaManager schemaManager;
@@ -129,7 +129,7 @@ public class AndCursorTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
@@ -171,7 +171,7 @@ public class AndCursorTest
ExprNode exprNode = FilterParser.parse( filter );
- IndexCursor<?, ServerEntry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
cursor.beforeFirst();
@@ -203,12 +203,12 @@ public class AndCursorTest
{
AndNode andNode = new AndNode();
- List<Evaluator<? extends ExprNode, ServerEntry, Long>> evaluators = new ArrayList<Evaluator<? extends ExprNode, ServerEntry, Long>>();
- Evaluator<? extends ExprNode, ServerEntry, Long> eval;
+ List<Evaluator<? extends ExprNode, Entry, Long>> evaluators = new ArrayList<Evaluator<? extends ExprNode, Entry, Long>>();
+ Evaluator<? extends ExprNode, Entry, Long> eval;
ExprNode exprNode = new SubstringNode( "cn", "J", null );
eval = new SubstringEvaluator( ( SubstringNode ) exprNode, store, schemaManager );
- IndexCursor<?, ServerEntry, Long> wrapped = new SubstringCursor( store, ( SubstringEvaluator ) eval );
+ IndexCursor<?, Entry, Long> wrapped = new SubstringCursor( store, ( SubstringEvaluator ) eval );
/* adding this results in NPE adding Presence evaluator not
Substring evaluator but adding Substring cursor as wrapped cursor */
@@ -222,7 +222,7 @@ public class AndCursorTest
andNode.addNode( exprNode );
- IndexCursor<?, ServerEntry, Long> cursor = new AndCursor( wrapped, evaluators ); //cursorBuilder.build( andNode );
+ IndexCursor<?, Entry, Long> cursor = new AndCursor( wrapped, evaluators ); //cursorBuilder.build( andNode );
cursor.beforeFirst();
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Wed Apr 28 08:44:42 2010
@@ -41,8 +41,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.filter.GreaterEqNode;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -75,7 +75,7 @@ public class GreaterEqTest
public static final Logger LOG = LoggerFactory.getLogger( GreaterEqTest.class );
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
static SchemaManager schemaManager = null;
@@ -126,7 +126,7 @@ public class GreaterEqTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
@@ -307,7 +307,7 @@ public class GreaterEqTest
// ---------- test before() ----------
cursor = new GreaterEqCursor( store, evaluator );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "5" );
assertFalse( cursor.available() );
@@ -330,7 +330,7 @@ public class GreaterEqTest
assertTrue( cursor.isClosed() );
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "7" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
@@ -340,7 +340,7 @@ public class GreaterEqTest
cursor.close();
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "3" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
@@ -352,7 +352,7 @@ public class GreaterEqTest
// ---------- test after() ----------
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "4" );
assertFalse( cursor.available() );
@@ -375,7 +375,7 @@ public class GreaterEqTest
assertTrue( cursor.isClosed() );
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "7" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
@@ -385,7 +385,7 @@ public class GreaterEqTest
cursor.close();
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "3" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
@@ -540,7 +540,7 @@ public class GreaterEqTest
// ---------- test before() ----------
cursor = new GreaterEqCursor( store, evaluator );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "2" );
try
{
@@ -554,7 +554,7 @@ public class GreaterEqTest
// ---------- test after() ----------
cursor = new GreaterEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "2" );
try
{
@@ -577,7 +577,7 @@ public class GreaterEqTest
AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.POSTALCODE_AT_OID );
GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTALCODE_AT_OID, new StringValue( at, "3" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
assertNotNull( evaluator.getNormalizer() );
@@ -586,31 +586,31 @@ public class GreaterEqTest
indexEntry.setId( 1L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 4L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 7L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 8L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 9L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 10L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
@@ -622,7 +622,7 @@ public class GreaterEqTest
AttributeType at = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.STREET_AT_OID );
GreaterEqNode node = new GreaterEqNode( SchemaConstants.STREET_AT_OID, new StringValue( at, "2" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.STREET_AT_OID, evaluator.getAttributeType().getOid() );
assertNotNull( evaluator.getNormalizer() );
@@ -630,7 +630,7 @@ public class GreaterEqTest
DN dn = new DN( "cn=jane doe,o=good times co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- ServerEntry attrs = new DefaultServerEntry( schemaManager, dn );
+ Entry attrs = new DefaultClientEntry( schemaManager, dn );
attrs.add( "objectClass", "person" );
attrs.add( "c-street", "3" );
attrs.add( "cn", "jane doe" );
@@ -651,7 +651,7 @@ public class GreaterEqTest
GreaterEqNode node = new GreaterEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new StringValue( at, "2" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.C_POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
assertNotNull( evaluator.getNormalizer() );
@@ -669,7 +669,7 @@ public class GreaterEqTest
GreaterEqNode node = new GreaterEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new StringValue( at, "3" ) );
GreaterEqEvaluator evaluator = new GreaterEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.POSTOFFICEBOX_AT_OID, evaluator.getAttributeType().getOid() );
assertNotNull( evaluator.getNormalizer() );
@@ -678,31 +678,31 @@ public class GreaterEqTest
indexEntry.setId( 1L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 4L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 7L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 8L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 9L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 10L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Wed Apr 28 08:44:42 2010
@@ -41,8 +41,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.filter.LessEqNode;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -75,7 +75,7 @@ public class LessEqTest
public static final Logger LOG = LoggerFactory.getLogger( LessEqTest.class );
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
static SchemaManager schemaManager = null;
@@ -126,7 +126,7 @@ public class LessEqTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
@@ -327,7 +327,7 @@ public class LessEqTest
// ---------- test before() ----------
cursor = new LessEqCursor( store, evaluator );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "2" );
assertFalse( cursor.available() );
@@ -350,7 +350,7 @@ public class LessEqTest
assertTrue( cursor.isClosed() );
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "7" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
@@ -360,7 +360,7 @@ public class LessEqTest
cursor.close();
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "3" );
cursor.before( indexEntry );
assertFalse( cursor.available() );
@@ -372,7 +372,7 @@ public class LessEqTest
// ---------- test after() ----------
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "1" );
assertFalse( cursor.available() );
@@ -395,7 +395,7 @@ public class LessEqTest
assertTrue( cursor.isClosed() );
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "7" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
@@ -405,7 +405,7 @@ public class LessEqTest
cursor.close();
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "3" );
cursor.after( indexEntry );
assertFalse( cursor.available() );
@@ -579,7 +579,7 @@ public class LessEqTest
// ---------- test before() ----------
cursor = new LessEqCursor( store, evaluator );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "2" );
try
{
@@ -593,7 +593,7 @@ public class LessEqTest
// ---------- test after() ----------
cursor = new LessEqCursor( store, evaluator );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setValue( "2" );
try
{
@@ -617,7 +617,7 @@ public class LessEqTest
LessEqNode node = new LessEqNode( SchemaConstants.POSTALCODE_AT_OID, new StringValue( at, "3" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
assertNotNull( evaluator.getNormalizer() );
@@ -626,31 +626,31 @@ public class LessEqTest
indexEntry.setId( 1L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 4L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 7L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 8L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 9L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 10L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
@@ -663,7 +663,7 @@ public class LessEqTest
LessEqNode node = new LessEqNode( SchemaConstants.STREET_AT_OID, new StringValue( at, "2" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.STREET_AT_OID, evaluator.getAttributeType().getOid() );
assertNotNull( evaluator.getNormalizer() );
@@ -671,7 +671,7 @@ public class LessEqTest
DN dn = new DN( "cn=jane doe,o=good times co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- ServerEntry attrs = new DefaultServerEntry( schemaManager, dn );
+ Entry attrs = new DefaultClientEntry( schemaManager, dn );
attrs.add( "objectClass", "person" );
attrs.add( "c-street", "1" );
attrs.add( "cn", "jane doe" );
@@ -692,7 +692,7 @@ public class LessEqTest
LessEqNode node = new LessEqNode( SchemaConstants.C_POSTALCODE_AT_OID, new StringValue( at, "2" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.C_POSTALCODE_AT_OID, evaluator.getAttributeType().getOid() );
assertNotNull( evaluator.getNormalizer() );
@@ -710,7 +710,7 @@ public class LessEqTest
LessEqNode node = new LessEqNode( SchemaConstants.POSTOFFICEBOX_AT_OID, new StringValue( at, "3" ) );
LessEqEvaluator evaluator = new LessEqEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
assertEquals( node, evaluator.getExpression() );
assertEquals( SchemaConstants.POSTOFFICEBOX_AT_OID, evaluator.getAttributeType().getOid() );
assertNotNull( evaluator.getNormalizer() );
@@ -719,31 +719,31 @@ public class LessEqTest
indexEntry.setId( 1L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 4L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 7L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 8L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 9L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 10L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Wed Apr 28 08:44:42 2010
@@ -35,7 +35,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.search.Optimizer;
import org.apache.directory.server.xdbm.tools.StoreUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.FilterParser;
import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
@@ -67,7 +67,7 @@ public class NestedFilterTest
private static final Logger LOG = LoggerFactory.getLogger( NestedFilterTest.class.getSimpleName() );
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
static SchemaManager schemaManager = null;
EvaluatorBuilder evaluatorBuilder;
CursorBuilder cursorBuilder;
@@ -125,7 +125,7 @@ public class NestedFilterTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
@@ -170,7 +170,7 @@ public class NestedFilterTest
exprNode.accept( visitor );
optimizer.annotate( exprNode );
- IndexCursor<?, ServerEntry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
@@ -199,7 +199,7 @@ public class NestedFilterTest
ExprNode exprNode = FilterParser.parse( filter );
optimizer.annotate( exprNode );
- IndexCursor<?, ServerEntry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
@@ -220,7 +220,7 @@ public class NestedFilterTest
ExprNode exprNode = FilterParser.parse( filter );
optimizer.annotate( exprNode );
- IndexCursor<?, ServerEntry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
@@ -244,6 +244,6 @@ public class NestedFilterTest
ExprNode exprNode = FilterParser.parse( filter );
optimizer.annotate( exprNode );
- IndexCursor<?, ServerEntry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
}
}
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Wed Apr 28 08:44:42 2010
@@ -38,7 +38,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.FilterParser;
import org.apache.directory.shared.ldap.filter.NotNode;
@@ -73,7 +73,7 @@ public class NotCursorTest
CsnSyntaxChecker csnSynChecker = new CsnSyntaxChecker();
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
static SchemaManager schemaManager = null;
EvaluatorBuilder evaluatorBuilder;
CursorBuilder cursorBuilder;
@@ -126,7 +126,7 @@ public class NotCursorTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
@@ -168,7 +168,7 @@ public class NotCursorTest
ExprNode exprNode = FilterParser.parse( filter );
- IndexCursor<?, ServerEntry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
assertFalse( cursor.available() );
@@ -214,7 +214,7 @@ public class NotCursorTest
NotNode notNode = new NotNode();
ExprNode exprNode = new SubstringNode( "cn", "J", null );
- Evaluator<? extends ExprNode, ServerEntry, Long> eval = new SubstringEvaluator( ( SubstringNode ) exprNode,
+ Evaluator<? extends ExprNode, Entry, Long> eval = new SubstringEvaluator( ( SubstringNode ) exprNode,
store, schemaManager );
notNode.addNode( exprNode );
@@ -294,7 +294,7 @@ public class NotCursorTest
try
{
- cursor.after( new ForwardIndexEntry<String, ServerEntry, Long>() );
+ cursor.after( new ForwardIndexEntry<String, Entry, Long>() );
fail( "should fail with UnsupportedOperationException " );
}
catch ( UnsupportedOperationException uoe )
@@ -303,7 +303,7 @@ public class NotCursorTest
try
{
- cursor.before( new ForwardIndexEntry<String, ServerEntry, Long>() );
+ cursor.before( new ForwardIndexEntry<String, Entry, Long>() );
fail( "should fail with UnsupportedOperationException " );
}
catch ( UnsupportedOperationException uoe )
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Wed Apr 28 08:44:42 2010
@@ -39,8 +39,8 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.filter.ScopeNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -70,7 +70,7 @@ public class OneLevelScopeTest
public static final Logger LOG = LoggerFactory.getLogger( OneLevelScopeTest.class );
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
static SchemaManager schemaManager = null;
@@ -121,14 +121,14 @@ public class OneLevelScopeTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( true );
- store.addIndex( new JdbmIndex<String, ServerEntry>( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex<String, ServerEntry>( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
LOG.debug( "Created new store" );
}
@@ -157,7 +157,7 @@ public class OneLevelScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -170,7 +170,7 @@ public class OneLevelScopeTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- IndexEntry<Long, ServerEntry, Long> indexEntry = cursor.get();
+ IndexEntry<Long, Entry, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 5L, ( long ) indexEntry.getId() );
assertEquals( 2L, ( long ) indexEntry.getValue() );
@@ -303,7 +303,7 @@ public class OneLevelScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -316,7 +316,7 @@ public class OneLevelScopeTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- IndexEntry<Long, ServerEntry, Long> indexEntry = cursor.get();
+ IndexEntry<Long, Entry, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 8L, ( long ) indexEntry.getId() );
assertEquals( 4L, ( long ) indexEntry.getValue() );
@@ -449,7 +449,7 @@ public class OneLevelScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+ "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -462,7 +462,7 @@ public class OneLevelScopeTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- IndexEntry<Long, ServerEntry, Long> indexEntry = cursor.get();
+ IndexEntry<Long, Entry, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
assertEquals( 3L, ( long ) indexEntry.getValue() );
@@ -574,7 +574,7 @@ public class OneLevelScopeTest
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+ "=apache," + SchemaConstants.OU_AT_OID + "=board of directors," + SchemaConstants.O_AT_OID
+ "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -587,7 +587,7 @@ public class OneLevelScopeTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- IndexEntry<Long, ServerEntry, Long> indexEntry = cursor.get();
+ IndexEntry<Long, Entry, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 6L, ( long ) indexEntry.getId() );
assertEquals( 7L, ( long ) indexEntry.getValue() );
@@ -665,7 +665,7 @@ public class OneLevelScopeTest
+ SchemaConstants.O_AT_OID + "=good times co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- ServerEntry attrs = new DefaultServerEntry( schemaManager, dn );
+ Entry attrs = new DefaultClientEntry( schemaManager, dn );
attrs.add( "objectClass", "alias", "extensibleObject" );
attrs.add( "cn", "jd" );
attrs.add( "aliasedObjectName", "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
@@ -677,7 +677,7 @@ public class OneLevelScopeTest
+ SchemaConstants.O_AT_OID + "=good times co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- attrs = new DefaultServerEntry( schemaManager, dn );
+ attrs = new DefaultClientEntry( schemaManager, dn );
attrs.add( "objectClass", "person" );
attrs.add( "cn", "jdoe" );
attrs.add( "sn", "doe" );
@@ -687,7 +687,7 @@ public class OneLevelScopeTest
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+ "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
@@ -700,7 +700,7 @@ public class OneLevelScopeTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- IndexEntry<Long, ServerEntry, Long> indexEntry = cursor.get();
+ IndexEntry<Long, Entry, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
assertEquals( 3L, ( long ) indexEntry.getValue() );
@@ -917,10 +917,10 @@ public class OneLevelScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
- ForwardIndexEntry<Long, ServerEntry, Long> indexEntry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ ForwardIndexEntry<Long, Entry, Long> indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
indexEntry.setId( 6L );
assertTrue( evaluator.evaluate( indexEntry ) );
}
@@ -931,7 +931,7 @@ public class OneLevelScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, new DN( SchemaConstants.OU_AT_OID
+ "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
assertEquals( node, evaluator.getExpression() );
@@ -940,19 +940,19 @@ public class OneLevelScopeTest
* will not accept an alias candidate because aliases are not returned
* when alias dereferencing while searching is enabled.
*/
- ForwardIndexEntry<Long, ServerEntry, Long> indexEntry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ ForwardIndexEntry<Long, Entry, Long> indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
indexEntry.setId( 11L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
indexEntry.setId( 8L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
indexEntry.setId( 6L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
@@ -963,7 +963,7 @@ public class OneLevelScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
cursor.get();
@@ -975,12 +975,12 @@ public class OneLevelScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
// test before()
- ForwardIndexEntry<Long, ServerEntry, Long> entry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ ForwardIndexEntry<Long, Entry, Long> entry = new ForwardIndexEntry<Long, Entry, Long>();
entry.setValue( 3L );
cursor.before( entry );
}
@@ -991,12 +991,12 @@ public class OneLevelScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- OneLevelScopeEvaluator<ServerEntry, Long> evaluator = new OneLevelScopeEvaluator<ServerEntry, Long>( store,
+ OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
node );
OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store, evaluator );
// test after()
- ForwardIndexEntry<Long, ServerEntry, Long> entry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ ForwardIndexEntry<Long, Entry, Long> entry = new ForwardIndexEntry<Long, Entry, Long>();
entry.setValue( 3L );
cursor.after( entry );
}
@@ -1007,6 +1007,6 @@ public class OneLevelScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
- new OneLevelScopeEvaluator<ServerEntry, Long>( store, node );
+ new OneLevelScopeEvaluator<Entry, Long>( store, node );
}
}
\ No newline at end of file
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Wed Apr 28 08:44:42 2010
@@ -41,7 +41,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.FilterParser;
import org.apache.directory.shared.ldap.filter.OrNode;
@@ -76,7 +76,7 @@ public class OrCursorTest
private static final Logger LOG = LoggerFactory.getLogger( OrCursorTest.class.getSimpleName() );
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
static SchemaManager schemaManager = null;
EvaluatorBuilder evaluatorBuilder;
CursorBuilder cursorBuilder;
@@ -128,7 +128,7 @@ public class OrCursorTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
@@ -170,7 +170,7 @@ public class OrCursorTest
ExprNode exprNode = FilterParser.parse( filter );
- IndexCursor<?, ServerEntry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
cursor.afterLast();
@@ -251,10 +251,10 @@ public class OrCursorTest
@SuppressWarnings("unchecked")
public void testOrCursor() throws Exception
{
- List<Evaluator<? extends ExprNode, ServerEntry, Long>> evaluators = new ArrayList<Evaluator<? extends ExprNode, ServerEntry, Long>>();
- List<Cursor<IndexEntry<?, ServerEntry, Long>>> cursors = new ArrayList<Cursor<IndexEntry<?, ServerEntry, Long>>>();
- Evaluator<? extends ExprNode, ServerEntry, Long> eval;
- Cursor<IndexEntry<?, ServerEntry, Long>> cursor;
+ List<Evaluator<? extends ExprNode, Entry, Long>> evaluators = new ArrayList<Evaluator<? extends ExprNode, Entry, Long>>();
+ List<Cursor<IndexEntry<?, Entry, Long>>> cursors = new ArrayList<Cursor<IndexEntry<?, Entry, Long>>>();
+ Evaluator<? extends ExprNode, Entry, Long> eval;
+ Cursor<IndexEntry<?, Entry, Long>> cursor;
OrNode orNode = new OrNode();
@@ -378,5 +378,4 @@ public class OrCursorTest
cursor.get();
}
-
}
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Wed Apr 28 08:44:42 2010
@@ -37,7 +37,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.tools.StoreUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -64,7 +64,7 @@ public class PresenceTest
private static final Logger LOG = LoggerFactory.getLogger( PresenceTest.class.getSimpleName() );
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
static SchemaManager schemaManager = null;
@@ -114,7 +114,7 @@ public class PresenceTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
@@ -202,7 +202,7 @@ public class PresenceTest
assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() );
// test before()
- ForwardIndexEntry<String, ServerEntry, Long> entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.CN_AT_OID );
cursor.before( entry );
assertTrue( cursor.next() );
@@ -210,7 +210,7 @@ public class PresenceTest
assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() );
// test after()
- entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ entry = new ForwardIndexEntry<String, Entry, Long>();
cursor.after( entry );
assertTrue( cursor.previous() );
assertTrue( cursor.available() );
@@ -378,11 +378,11 @@ public class PresenceTest
{
PresenceNode node = new PresenceNode( SchemaConstants.CN_AT_OID );
PresenceEvaluator<Long> evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.CN_AT_OID );
entry.setId( ( long ) 3 );
assertFalse( evaluator.evaluate( entry ) );
- entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.CN_AT_OID );
entry.setId( ( long ) 5 );
assertTrue( evaluator.evaluate( entry ) );
@@ -403,12 +403,12 @@ public class PresenceTest
PresenceNode node = new PresenceNode( oid );
PresenceEvaluator<Long> evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String, Entry, Long>();
// no need to set a value or id, because the evaluator must always evaluate to true
// as each entry contains an objectClass, entryUUID, and entryCSN attribute
assertTrue( evaluator.evaluate( entry ) );
- entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( oid );
entry.setId( ( long ) 5 );
assertTrue( evaluator.evaluate( entry ) );
@@ -420,22 +420,22 @@ public class PresenceTest
{
PresenceNode node = new PresenceNode( SchemaConstants.NAME_AT_OID );
PresenceEvaluator<Long> evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.NAME_AT_OID );
entry.setId( ( long ) 3 );
assertTrue( evaluator.evaluate( entry ) );
- entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.NAME_AT_OID );
entry.setId( ( long ) 5 );
assertTrue( evaluator.evaluate( entry ) );
node = new PresenceNode( SchemaConstants.SEARCHGUIDE_AT_OID );
evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
- entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.SEARCHGUIDE_AT_OID );
entry.setId( ( long ) 3 );
assertFalse( evaluator.evaluate( entry ) );
- entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.SEARCHGUIDE_AT_OID );
entry.setId( ( long ) 5 );
entry.setObject( store.lookup( ( long ) 5 ) );
@@ -443,11 +443,11 @@ public class PresenceTest
node = new PresenceNode( SchemaConstants.ST_AT_OID );
evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
- entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.ST_AT_OID );
entry.setId( ( long ) 3 );
assertFalse( evaluator.evaluate( entry ) );
- entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.ST_AT_OID );
entry.setId( ( long ) 5 );
entry.setObject( store.lookup( ( long ) 5 ) );
@@ -483,7 +483,7 @@ public class PresenceTest
PresenceCursor<Long> cursor = new PresenceCursor<Long>( store, evaluator );
// test before()
- ForwardIndexEntry<String, ServerEntry, Long> entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.SN_AT_OID );
cursor.before( entry );
}
@@ -497,7 +497,7 @@ public class PresenceTest
PresenceCursor<Long> cursor = new PresenceCursor<Long>( store, evaluator );
// test before()
- ForwardIndexEntry<String, ServerEntry, Long> entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.SN_AT_OID );
cursor.after( entry );
}
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Wed Apr 28 08:44:42 2010
@@ -35,7 +35,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.tools.StoreUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.SubstringNode;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -62,7 +62,7 @@ public class SubstringTest
private static final Logger LOG = LoggerFactory.getLogger( SubstringTest.class.getSimpleName() );
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
static SchemaManager schemaManager = null;
@@ -112,7 +112,7 @@ public class SubstringTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
@@ -607,7 +607,7 @@ public class SubstringTest
{
SubstringNode node = new SubstringNode( SchemaConstants.SN_AT_OID, "walk", null );
SubstringEvaluator<Long> evaluator = new SubstringEvaluator<Long>( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 5L );
assertTrue( evaluator.evaluate( indexEntry ) );
indexEntry.setId( 3L );
@@ -619,35 +619,35 @@ public class SubstringTest
node = new SubstringNode( SchemaConstants.SN_AT_OID, "wa", null );
evaluator = new SubstringEvaluator<Long>( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 5L );
indexEntry.setObject( store.lookup( 5L ) );
assertTrue( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( SchemaConstants.SEARCHGUIDE_AT_OID, "j", null );
evaluator = new SubstringEvaluator<Long>( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
indexEntry.setObject( store.lookup( 6L ) );
assertFalse( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( SchemaConstants.ST_AT_OID, "j", null );
evaluator = new SubstringEvaluator<Long>( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
indexEntry.setObject( store.lookup( 6L ) );
assertFalse( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( SchemaConstants.NAME_AT_OID, "j", null );
evaluator = new SubstringEvaluator<Long>( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
indexEntry.setObject( store.lookup( 6L ) );
assertTrue( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( SchemaConstants.NAME_AT_OID, "s", null );
evaluator = new SubstringEvaluator<Long>( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
indexEntry.setObject( store.lookup( 6L ) );
assertTrue( evaluator.evaluate( indexEntry ) );
@@ -659,7 +659,7 @@ public class SubstringTest
{
SubstringNode node = new SubstringNode( SchemaConstants.CN_AT_OID, "jim", null );
SubstringEvaluator<Long> evaluator = new SubstringEvaluator<Long>( node, store, schemaManager );
- ForwardIndexEntry<String, ServerEntry, Long> indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
assertTrue( evaluator.evaluate( indexEntry ) );
indexEntry.setId( 3L );
@@ -668,14 +668,14 @@ public class SubstringTest
node = new SubstringNode( SchemaConstants.CN_AT_OID, "j", null );
evaluator = new SubstringEvaluator<Long>( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
indexEntry.setObject( store.lookup( 6L ) );
assertTrue( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( SchemaConstants.CN_AT_OID, "s", null );
evaluator = new SubstringEvaluator<Long>( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<String, Entry, Long>();
indexEntry.setId( 6L );
indexEntry.setObject( store.lookup( 6L ) );
assertFalse( evaluator.evaluate( indexEntry ) );
@@ -716,7 +716,7 @@ public class SubstringTest
SubstringCursor<Long> cursor = new SubstringCursor<Long>( store, evaluator );
// test before()
- ForwardIndexEntry<String, ServerEntry, Long> entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.SN_AT_OID );
cursor.before( entry );
}
@@ -730,7 +730,7 @@ public class SubstringTest
SubstringCursor<Long> cursor = new SubstringCursor<Long>( store, evaluator );
// test before()
- ForwardIndexEntry<String, ServerEntry, Long> entry = new ForwardIndexEntry<String, ServerEntry, Long>();
+ ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String, Entry, Long>();
entry.setValue( SchemaConstants.SN_AT_OID );
cursor.after( entry );
}
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Wed Apr 28 08:44:42 2010
@@ -40,8 +40,8 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.filter.ScopeNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -71,7 +71,7 @@ public class SubtreeScopeTest
public static final Logger LOG = LoggerFactory.getLogger( SubtreeScopeTest.class );
File wkdir;
- Store<ServerEntry, Long> store;
+ Store<Entry, Long> store;
static SchemaManager schemaManager = null;
@@ -121,14 +121,14 @@ public class SubtreeScopeTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<ServerEntry>();
+ store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( true );
- store.addIndex( new JdbmIndex<String, ServerEntry>( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex<String, ServerEntry>( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
LOG.debug( "Created new store" );
}
@@ -157,7 +157,7 @@ public class SubtreeScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
assertTrue( cursor.isElementReused() );
@@ -169,7 +169,7 @@ public class SubtreeScopeTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- IndexEntry<Long, ServerEntry, Long> indexEntry = cursor.get();
+ IndexEntry<Long, Entry, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 2L, ( long ) indexEntry.getId() );
assertEquals( 2L, ( long ) indexEntry.getValue() );
@@ -315,7 +315,7 @@ public class SubtreeScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+ "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
assertTrue( cursor.isElementReused() );
@@ -327,7 +327,7 @@ public class SubtreeScopeTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- IndexEntry<Long, ServerEntry, Long> indexEntry = cursor.get();
+ IndexEntry<Long, Entry, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 3L, ( long ) indexEntry.getId() );
assertEquals( 3L, ( long ) indexEntry.getValue() );
@@ -503,7 +503,7 @@ public class SubtreeScopeTest
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+ "=apache," + SchemaConstants.OU_AT_OID + "=board of directors," + SchemaConstants.O_AT_OID
+ "=good times co." ), SearchScope.SUBTREE );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
assertTrue( cursor.isElementReused() );
@@ -515,7 +515,7 @@ public class SubtreeScopeTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- IndexEntry<Long, ServerEntry, Long> indexEntry = cursor.get();
+ IndexEntry<Long, Entry, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 7L, ( long ) indexEntry.getId() );
assertEquals( 7L, ( long ) indexEntry.getValue() );
@@ -628,7 +628,7 @@ public class SubtreeScopeTest
+ SchemaConstants.O_AT_OID + "=good times co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- ServerEntry attrs = new DefaultServerEntry( schemaManager, dn );
+ Entry attrs = new DefaultClientEntry( schemaManager, dn );
attrs.add( "objectClass", "alias", "extensibleObject" );
attrs.add( "cn", "jd" );
attrs.add( "aliasedObjectName", "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
@@ -640,7 +640,7 @@ public class SubtreeScopeTest
+ SchemaConstants.O_AT_OID + "=good times co." );
dn.normalize( schemaManager.getNormalizerMapping() );
- attrs = new DefaultServerEntry( schemaManager, dn );
+ attrs = new DefaultClientEntry( schemaManager, dn );
attrs.add( "objectClass", "person" );
attrs.add( "cn", "jdoe" );
attrs.add( "sn", "doe" );
@@ -650,7 +650,7 @@ public class SubtreeScopeTest
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+ "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
assertTrue( cursor.isElementReused() );
@@ -662,7 +662,7 @@ public class SubtreeScopeTest
assertTrue( cursor.next() );
assertTrue( cursor.available() );
- IndexEntry<Long, ServerEntry, Long> indexEntry = cursor.get();
+ IndexEntry<Long, Entry, Long> indexEntry = cursor.get();
assertNotNull( indexEntry );
assertEquals( 3L, ( long ) indexEntry.getId() );
assertEquals( 3L, ( long ) indexEntry.getValue() );
@@ -915,9 +915,9 @@ public class SubtreeScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
- ForwardIndexEntry<Long, ServerEntry, Long> indexEntry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ ForwardIndexEntry<Long, Entry, Long> indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
indexEntry.setId( 6L );
assertTrue( evaluator.evaluate( indexEntry ) );
}
@@ -928,22 +928,22 @@ public class SubtreeScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, new DN( SchemaConstants.OU_AT_OID
+ "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
assertEquals( node, evaluator.getExpression() );
/*
* With dereferencing the evaluator does not accept candidates that
* are aliases. This is done to filter out aliases from the results.
*/
- ForwardIndexEntry<Long, ServerEntry, Long> indexEntry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ ForwardIndexEntry<Long, Entry, Long> indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
indexEntry.setId( 11L );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
indexEntry.setId( 8L );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
indexEntry.setId( 6L );
assertFalse( evaluator.evaluate( indexEntry ) );
}
@@ -954,7 +954,7 @@ public class SubtreeScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
cursor.get();
}
@@ -965,11 +965,11 @@ public class SubtreeScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
// test before()
- ForwardIndexEntry<Long, ServerEntry, Long> entry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ ForwardIndexEntry<Long, Entry, Long> entry = new ForwardIndexEntry<Long, Entry, Long>();
entry.setValue( 3L );
cursor.before( entry );
}
@@ -980,11 +980,11 @@ public class SubtreeScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
// test after()
- ForwardIndexEntry<Long, ServerEntry, Long> entry = new ForwardIndexEntry<Long, ServerEntry, Long>();
+ ForwardIndexEntry<Long, Entry, Long> entry = new ForwardIndexEntry<Long, Entry, Long>();
entry.setValue( 3L );
cursor.after( entry );
}
@@ -995,7 +995,7 @@ public class SubtreeScopeTest
{
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+ "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
- SubtreeScopeEvaluator<ServerEntry, Long> evaluator = new SubtreeScopeEvaluator<ServerEntry, Long>( store, node );
+ SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
assertNull( evaluator );
}
}
Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java Wed Apr 28 08:44:42 2010
@@ -40,8 +40,8 @@ import javax.swing.JTable;
import javax.swing.JTextField;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +73,7 @@ public class AddEntryDialog extends JDia
private JButton m_cancelBut = new JButton();
private JPopupMenu m_popup;
- private ServerEntry childEntry = null;
+ private Entry childEntry = null;
/**
@@ -85,7 +85,7 @@ public class AddEntryDialog extends JDia
public AddEntryDialog(Frame parent, boolean modal, SchemaManager schemaManager )
{
super( parent, modal );
- childEntry = new DefaultServerEntry( schemaManager );
+ childEntry = new DefaultClientEntry( schemaManager );
childEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC );
initGUI();
}
@@ -284,7 +284,7 @@ public class AddEntryDialog extends JDia
}
- public ServerEntry getChildEntry()
+ public Entry getChildEntry()
{
return childEntry;
}
Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java Wed Apr 28 08:44:42 2010
@@ -26,7 +26,7 @@ import javax.swing.table.AbstractTableMo
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.Value;
@@ -39,22 +39,28 @@ import org.apache.directory.shared.ldap.
public class AttributesTableModel extends AbstractTableModel
{
private static final long serialVersionUID = 3256443603340310841L;
+
/** name for the key column */
public static final String KEY_COL = "Keys";
+
/** name for the values column */
public static final String VAL_COL = "Values";
/** list of attribute ids */
private final transient ArrayList<Object> keyList;
+
/** list of attribute values */
private final transient ArrayList<Object> valList;
/** the attributes for the entry */
- private final ServerEntry entry;
+ private final Entry entry;
+
/** the unique id of the entry */
private final Long id;
+
/** the distinguished name of the entry */
private final String dn;
+
/** whether or not the model is mutable */
private boolean isMutable = true;
@@ -67,7 +73,7 @@ public class AttributesTableModel extend
* @param dn the distinguished name of the entry
* @param isMutable whether or not the model can be changed
*/
- public AttributesTableModel( ServerEntry entry, Long id, String dn, boolean isMutable)
+ public AttributesTableModel( Entry entry, Long id, String dn, boolean isMutable)
{
this.dn = dn;
this.id = id;