directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r938820 [8/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...
Date Wed, 28 Apr 2010 08:44:47 GMT
Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java Wed Apr 28 08:44:42 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
 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;
 import org.apache.directory.shared.ldap.filter.ApproximateNode;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -45,19 +45,19 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ApproximateEvaluator<T, ID> implements Evaluator<ApproximateNode<T>, ServerEntry, ID>
+public class ApproximateEvaluator<T, ID> implements Evaluator<ApproximateNode<T>, Entry, ID>
 {
     private final ApproximateNode<T> node;
-    private final Store<ServerEntry, ID> db;
+    private final Store<Entry, ID> db;
     private final SchemaManager schemaManager;
     private final AttributeType type;
     private final Normalizer normalizer;
     private final LdapComparator<? super Object> ldapComparator;
-    private final Index<T, ServerEntry, ID> idx;
+    private final Index<T, Entry, ID> idx;
 
 
     @SuppressWarnings("unchecked")
-    public ApproximateEvaluator( ApproximateNode<T> node, Store<ServerEntry, ID> db, SchemaManager schemaManager )
+    public ApproximateEvaluator( ApproximateNode<T> node, Store<Entry, ID> db, SchemaManager schemaManager )
         throws Exception
     {
         this.db = db;
@@ -66,7 +66,7 @@ public class ApproximateEvaluator<T, ID>
 
         if ( db.hasIndexOn( node.getAttribute() ) )
         {
-            idx = ( Index<T, ServerEntry, ID> ) db.getIndex( node.getAttribute() );
+            idx = ( Index<T, Entry, ID> ) db.getIndex( node.getAttribute() );
             type = null;
             normalizer = null;
             ldapComparator = null;
@@ -95,7 +95,7 @@ public class ApproximateEvaluator<T, ID>
     }
 
 
-    public boolean evaluateEntry( ServerEntry entry ) throws Exception
+    public boolean evaluateEntry( Entry entry ) throws Exception
     {
         // get the attribute
         EntryAttribute attr = entry.get( type );
@@ -146,14 +146,14 @@ public class ApproximateEvaluator<T, ID>
     }
 
 
-    public boolean evaluate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
         if ( idx != null )
         {
             return idx.forward( node.getValue().get(), indexEntry.getId() );
         }
 
-        ServerEntry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getObject();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java Wed Apr 28 08:44:42 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.NotImplementedException;
-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.NotNode;
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
 public class CursorBuilder<ID>
 {
     /** The database used by this builder */
-    private Store<ServerEntry, ID> db = null;
+    private Store<Entry, ID> db = null;
 
     /** Evaluator dependency on a EvaluatorBuilder */
     private EvaluatorBuilder<ID> evaluatorBuilder;
@@ -58,14 +58,14 @@ public class CursorBuilder<ID>
      * @param db database used by this enumerator
      * @param evaluatorBuilder the evaluator builder
      */
-    public CursorBuilder( Store<ServerEntry, ID> db, EvaluatorBuilder<ID> evaluatorBuilder )
+    public CursorBuilder( Store<Entry, ID> db, EvaluatorBuilder<ID> evaluatorBuilder )
     {
         this.db = db;
         this.evaluatorBuilder = evaluatorBuilder;
     }
 
 
-    public <T> IndexCursor<?, ServerEntry, ID> build( ExprNode node ) throws Exception
+    public <T> IndexCursor<?, Entry, ID> build( ExprNode node ) throws Exception
     {
         switch ( node.getAssertionType() )
         {
@@ -90,11 +90,11 @@ public class CursorBuilder<ID>
                 if ( ( ( ScopeNode ) node ).getScope() == SearchScope.ONELEVEL )
                 {
                     return new OneLevelScopeCursor<ID>( db,
-                        ( OneLevelScopeEvaluator<ServerEntry, ID> ) evaluatorBuilder.build( node ) );
+                        ( OneLevelScopeEvaluator<Entry, ID> ) evaluatorBuilder.build( node ) );
                 }
                 else
                 {
-                    return new SubtreeScopeCursor<ID>( db, ( SubtreeScopeEvaluator<ServerEntry, ID> ) evaluatorBuilder
+                    return new SubtreeScopeCursor<ID>( db, ( SubtreeScopeEvaluator<Entry, ID> ) evaluatorBuilder
                         .build( node ) );
                 }
 
@@ -131,12 +131,12 @@ public class CursorBuilder<ID>
      * @return Cursor over candidates satisfying disjunction expression
      * @throws Exception on db access failures
      */
-    private IndexCursor<?, ServerEntry, ID> buildOrCursor( OrNode node ) throws Exception
+    private IndexCursor<?, Entry, ID> buildOrCursor( OrNode node ) throws Exception
     {
         List<ExprNode> children = node.getChildren();
-        List<IndexCursor<? extends Object, ServerEntry, ID>> childCursors = new ArrayList<IndexCursor<?, ServerEntry, ID>>(
+        List<IndexCursor<? extends Object, Entry, ID>> childCursors = new ArrayList<IndexCursor<?, Entry, ID>>(
             children.size() );
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> childEvaluators = new ArrayList<Evaluator<? extends ExprNode, ServerEntry, ID>>(
+        List<Evaluator<? extends ExprNode, Entry, ID>> childEvaluators = new ArrayList<Evaluator<? extends ExprNode, Entry, ID>>(
             children.size() );
 
         // Recursively create Cursors and Evaluators for each child expression node
@@ -157,7 +157,7 @@ public class CursorBuilder<ID>
      * @return Cursor over the conjunction expression
      * @throws Exception on db access failures
      */
-    private IndexCursor<?, ServerEntry, ID> buildAndCursor( AndNode node ) throws Exception
+    private IndexCursor<?, Entry, ID> buildAndCursor( AndNode node ) throws Exception
     {
         int minIndex = 0;
         long minValue = Long.MAX_VALUE;
@@ -190,7 +190,7 @@ public class CursorBuilder<ID>
 
         // Once found we build the child Evaluators minus the one for the minChild
         ExprNode minChild = children.get( minIndex );
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> childEvaluators = new ArrayList<Evaluator<? extends ExprNode, ServerEntry, ID>>(
+        List<Evaluator<? extends ExprNode, Entry, ID>> childEvaluators = new ArrayList<Evaluator<? extends ExprNode, Entry, ID>>(
             children.size() - 1 );
         for ( ExprNode child : children )
         {
@@ -203,7 +203,7 @@ public class CursorBuilder<ID>
         }
 
         // Do recursive call to build min child Cursor then create AndCursor
-        IndexCursor<?, ServerEntry, ID> childCursor = build( minChild );
+        IndexCursor<?, Entry, ID> childCursor = build( minChild );
         return new AndCursor( childCursor, childEvaluators );
     }
 }

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java Wed Apr 28 08:44:42 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.search.SearchEngine;
-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.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -48,12 +48,12 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DefaultSearchEngine<ID> implements SearchEngine<ServerEntry, ID>
+public class DefaultSearchEngine<ID> implements SearchEngine<Entry, ID>
 {
     /** the Optimizer used by this DefaultSearchEngine */
     private final Optimizer optimizer;
     /** the Database this DefaultSearchEngine operates on */
-    private final Store<ServerEntry, ID> db;
+    private final Store<Entry, ID> db;
     /** creates Cursors over entries satisfying filter expressions */
     private final CursorBuilder<ID> cursorBuilder;
     /** creates evaluators which check to see if candidates satisfy a filter expression */
@@ -72,7 +72,7 @@ public class DefaultSearchEngine<ID> imp
      * @param evaluatorBuilder an expression evaluator builder
      * @param optimizer an optimizer to use during search
      */
-    public DefaultSearchEngine( Store<ServerEntry, ID> db, CursorBuilder<ID> cursorBuilder,
+    public DefaultSearchEngine( Store<Entry, ID> db, CursorBuilder<ID> cursorBuilder,
         EvaluatorBuilder<ID> evaluatorBuilder, Optimizer optimizer )
     {
         this.db = db;
@@ -96,7 +96,7 @@ public class DefaultSearchEngine<ID> imp
     /**
      * @see SearchEngine#cursor(DN, AliasDerefMode, ExprNode, SearchControls)
      */
-    public IndexCursor<ID, ServerEntry, ID> cursor( DN base, AliasDerefMode aliasDerefMode, ExprNode filter,
+    public IndexCursor<ID, Entry, ID> cursor( DN base, AliasDerefMode aliasDerefMode, ExprNode filter,
         SearchControls searchCtls ) throws Exception
     {
         DN effectiveBase;
@@ -106,7 +106,7 @@ public class DefaultSearchEngine<ID> imp
         if ( baseId == null )
         {
             // The entry is not found : ciao !
-            return new EmptyIndexCursor<ID, ServerEntry, ID>();
+            return new EmptyIndexCursor<ID, Entry, ID>();
         }
 
         String aliasedBase = db.getAliasIndex().reverseLookup( baseId );
@@ -147,18 +147,18 @@ public class DefaultSearchEngine<ID> imp
                 effectiveBaseId = db.getEntryId( effectiveBase );
             }
 
-            IndexEntry<ID, ServerEntry, ID> indexEntry = new ForwardIndexEntry<ID, ServerEntry, ID>();
+            IndexEntry<ID, Entry, ID> indexEntry = new ForwardIndexEntry<ID, Entry, ID>();
             indexEntry.setId( effectiveBaseId );
             optimizer.annotate( filter );
-            Evaluator<? extends ExprNode, ServerEntry, ID> evaluator = evaluatorBuilder.build( filter );
+            Evaluator<? extends ExprNode, Entry, ID> evaluator = evaluatorBuilder.build( filter );
 
             if ( evaluator.evaluate( indexEntry ) )
             {
-                return new SingletonIndexCursor<ID, ServerEntry, ID>( indexEntry );
+                return new SingletonIndexCursor<ID, Entry, ID>( indexEntry );
             }
             else
             {
-                return new EmptyIndexCursor<ID, ServerEntry, ID>();
+                return new EmptyIndexCursor<ID, Entry, ID>();
             }
         }
 
@@ -171,14 +171,14 @@ public class DefaultSearchEngine<ID> imp
 
         // Annotate the node with the optimizer and return search enumeration.
         optimizer.annotate( root );
-        return ( IndexCursor<ID, ServerEntry, ID> ) cursorBuilder.build( root );
+        return ( IndexCursor<ID, Entry, ID> ) cursorBuilder.build( root );
     }
 
 
     /**
      * @see SearchEngine#evaluator(ExprNode)
      */
-    public Evaluator<? extends ExprNode, ServerEntry, ID> evaluator( ExprNode filter ) throws Exception
+    public Evaluator<? extends ExprNode, Entry, ID> evaluator( ExprNode filter ) throws Exception
     {
         return evaluatorBuilder.build( filter );
     }

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java Wed Apr 28 08:44:42 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.i18n.I18n;
 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.entry.Value;
 
 
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public class EqualityCursor<V, ID> extends AbstractIndexCursor<V, ServerEntry, ID>
+public class EqualityCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
 {
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_714 );
 
@@ -50,17 +50,17 @@ public class EqualityCursor<V, ID> exten
     private final EqualityEvaluator equalityEvaluator;
 
     /** Cursor over attribute entry matching filter: set when index present */
-    private final IndexCursor<V, ServerEntry, ID> userIdxCursor;
+    private final IndexCursor<V, Entry, ID> userIdxCursor;
 
     /** NDN Cursor on all entries in  (set when no index on user attribute) */
-    private final IndexCursor<String, ServerEntry, ID> ndnIdxCursor;
+    private final IndexCursor<String, Entry, ID> ndnIdxCursor;
 
     /** used only when ndnIdxCursor is used (no index on attribute) */
     private boolean available = false;
 
 
     @SuppressWarnings("unchecked")
-    public EqualityCursor( Store<ServerEntry, ID> db, EqualityEvaluator<V, ID> equalityEvaluator ) throws Exception
+    public EqualityCursor( Store<Entry, ID> db, EqualityEvaluator<V, ID> equalityEvaluator ) throws Exception
     {
         this.equalityEvaluator = equalityEvaluator;
 
@@ -68,7 +68,7 @@ public class EqualityCursor<V, ID> exten
         Value<V> value = equalityEvaluator.getExpression().getValue();
         if ( db.hasIndexOn( attribute ) )
         {
-            Index<V, ServerEntry, ID> userIndex = ( Index<V, ServerEntry, ID> ) db.getIndex( attribute );
+            Index<V, Entry, ID> userIndex = ( Index<V, Entry, ID> ) db.getIndex( attribute );
             userIdxCursor = userIndex.forwardCursor( value.get() );
             ndnIdxCursor = null;
         }
@@ -105,7 +105,7 @@ public class EqualityCursor<V, ID> exten
     }
 
 
-    public void before( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
         if ( userIdxCursor != null )
@@ -133,7 +133,7 @@ public class EqualityCursor<V, ID> exten
     }
 
 
-    public void after( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
         if ( userIdxCursor != null )
@@ -202,7 +202,7 @@ public class EqualityCursor<V, ID> exten
         while ( ndnIdxCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, ServerEntry, ID> candidate = ndnIdxCursor.get();
+            IndexEntry<?, Entry, ID> candidate = ndnIdxCursor.get();
             if ( equalityEvaluator.evaluate( candidate ) )
             {
                 return available = true;
@@ -224,7 +224,7 @@ public class EqualityCursor<V, ID> exten
         while ( ndnIdxCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, ServerEntry, ID> candidate = ndnIdxCursor.get();
+            IndexEntry<?, Entry, ID> candidate = ndnIdxCursor.get();
             if ( equalityEvaluator.evaluate( candidate ) )
             {
                 return available = true;
@@ -236,7 +236,7 @@ public class EqualityCursor<V, ID> exten
 
 
     @SuppressWarnings("unchecked")
-    public IndexEntry<V, ServerEntry, ID> get() throws Exception
+    public IndexEntry<V, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( userIdxCursor != null )
@@ -246,7 +246,7 @@ public class EqualityCursor<V, ID> exten
 
         if ( available )
         {
-            return ( IndexEntry<V, ServerEntry, ID> ) ndnIdxCursor.get();
+            return ( IndexEntry<V, Entry, ID> ) ndnIdxCursor.get();
         }
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Wed Apr 28 08:44:42 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
 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;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -49,10 +49,10 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class EqualityEvaluator<T, ID> implements Evaluator<EqualityNode<T>, ServerEntry, ID>
+public class EqualityEvaluator<T, ID> implements Evaluator<EqualityNode<T>, Entry, ID>
 {
     private final EqualityNode<T> node;
-    private final Store<ServerEntry, ID> db;
+    private final Store<Entry, ID> db;
     private final SchemaManager schemaManager;
     private final AttributeType type;
     private final Normalizer normalizer;
@@ -66,11 +66,11 @@ public class EqualityEvaluator<T, ID> im
     /** The default String comparator if no comparator has been defined */
     private static final Comparator<String> STRING_COMPARATOR = new StringComparator( null );
 
-    private final Index<T, ServerEntry, ID> idx;
+    private final Index<T, Entry, ID> idx;
 
 
     @SuppressWarnings("unchecked")
-    public EqualityEvaluator( EqualityNode<T> node, Store<ServerEntry, ID> db, SchemaManager schemaManager )
+    public EqualityEvaluator( EqualityNode<T> node, Store<Entry, ID> db, SchemaManager schemaManager )
         throws Exception
     {
         this.db = db;
@@ -79,7 +79,7 @@ public class EqualityEvaluator<T, ID> im
 
         if ( db.hasIndexOn( node.getAttribute() ) )
         {
-            idx = ( Index<T, ServerEntry, ID> ) db.getIndex( node.getAttribute() );
+            idx = ( Index<T, Entry, ID> ) db.getIndex( node.getAttribute() );
             type = null;
             normalizer = null;
             comparator = null;
@@ -111,14 +111,14 @@ public class EqualityEvaluator<T, ID> im
     }
 
 
-    public boolean evaluate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
         if ( idx != null )
         {
             return idx.forward( node.getValue().get(), indexEntry.getId() );
         }
 
-        ServerEntry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getObject();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )
@@ -131,7 +131,7 @@ public class EqualityEvaluator<T, ID> im
     }
 
 
-    public boolean evaluateEntry( ServerEntry entry ) throws Exception
+    public boolean evaluateEntry( Entry entry ) throws Exception
     {
         // get the attribute
         EntryAttribute attr = entry.get( type );

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java Wed Apr 28 08:44:42 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.NotImplementedException;
-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.ApproximateNode;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap.
  */
 public class EvaluatorBuilder<ID>
 {
-    private final Store<ServerEntry, ID> db;
+    private final Store<Entry, ID> db;
     private final SchemaManager schemaManager;
 
 
@@ -63,14 +63,14 @@ public class EvaluatorBuilder<ID>
      * @param registries the schema registries
      * @throws Exception failure to access db or lookup schema in registries
      */
-    public EvaluatorBuilder( Store<ServerEntry, ID> db, SchemaManager schemaManager ) throws Exception
+    public EvaluatorBuilder( Store<Entry, ID> db, SchemaManager schemaManager ) throws Exception
     {
         this.db = db;
         this.schemaManager = schemaManager;
     }
 
 
-    public <T> Evaluator<? extends ExprNode, ServerEntry, ID> build( ExprNode node ) throws Exception
+    public <T> Evaluator<? extends ExprNode, Entry, ID> build( ExprNode node ) throws Exception
     {
         switch ( node.getAssertionType() )
         {
@@ -94,11 +94,11 @@ public class EvaluatorBuilder<ID>
             case SCOPE:
                 if ( ( ( ScopeNode ) node ).getScope() == SearchScope.ONELEVEL )
                 {
-                    return new OneLevelScopeEvaluator<ServerEntry, ID>( db, ( ScopeNode ) node );
+                    return new OneLevelScopeEvaluator<Entry, ID>( db, ( ScopeNode ) node );
                 }
                 else
                 {
-                    return new SubtreeScopeEvaluator<ServerEntry, ID>( db, ( ScopeNode ) node );
+                    return new SubtreeScopeEvaluator<Entry, ID>( db, ( ScopeNode ) node );
                 }
 
             case SUBSTRING:
@@ -130,7 +130,7 @@ public class EvaluatorBuilder<ID>
     AndEvaluator<ID> buildAndEvaluator( AndNode node ) throws Exception
     {
         List<ExprNode> children = node.getChildren();
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators = new ArrayList<Evaluator<? extends ExprNode, ServerEntry, ID>>(
+        List<Evaluator<? extends ExprNode, Entry, ID>> evaluators = new ArrayList<Evaluator<? extends ExprNode, Entry, ID>>(
             children.size() );
         for ( ExprNode child : children )
         {
@@ -143,7 +143,7 @@ public class EvaluatorBuilder<ID>
     OrEvaluator<ID> buildOrEvaluator( OrNode node ) throws Exception
     {
         List<ExprNode> children = node.getChildren();
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators = new ArrayList<Evaluator<? extends ExprNode, ServerEntry, ID>>(
+        List<Evaluator<? extends ExprNode, Entry, ID>> evaluators = new ArrayList<Evaluator<? extends ExprNode, Entry, ID>>(
             children.size() );
         for ( ExprNode child : children )
         {

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java Wed Apr 28 08:44:42 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 
 
 /**
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class GreaterEqCursor<V, ID> extends AbstractIndexCursor<V, ServerEntry, ID>
+public class GreaterEqCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
 {
     private static final String UNSUPPORTED_MSG = "GreaterEqCursors only support positioning by element when a user index exists on the asserted attribute.";
 
@@ -49,31 +49,31 @@ public class GreaterEqCursor<V, ID> exte
     private final GreaterEqEvaluator<V, ID> greaterEqEvaluator;
 
     /** Cursor over attribute entry matching filter: set when index present */
-    private final IndexCursor<V, ServerEntry, ID> userIdxCursor;
+    private final IndexCursor<V, Entry, ID> userIdxCursor;
 
     /** NDN Cursor on all entries in  (set when no index on user attribute) */
-    private final IndexCursor<String, ServerEntry, ID> ndnIdxCursor;
+    private final IndexCursor<String, Entry, ID> ndnIdxCursor;
 
     /**
      * Used to store indexEntry from ndnCandidate so it can be saved after
      * call to evaluate() which changes the value so it's not referring to
      * the NDN but to the value of the attribute instead.
      */
-    IndexEntry<String, ServerEntry, ID> ndnCandidate;
+    IndexEntry<String, Entry, ID> ndnCandidate;
 
     /** used in both modes */
     private boolean available = false;
 
 
     @SuppressWarnings("unchecked")
-    public GreaterEqCursor( Store<ServerEntry, ID> db, GreaterEqEvaluator greaterEqEvaluator ) throws Exception
+    public GreaterEqCursor( Store<Entry, ID> db, GreaterEqEvaluator greaterEqEvaluator ) throws Exception
     {
         this.greaterEqEvaluator = greaterEqEvaluator;
 
         String attribute = greaterEqEvaluator.getExpression().getAttribute();
         if ( db.hasIndexOn( attribute ) )
         {
-            userIdxCursor = ( ( Index<V, ServerEntry, ID> ) db.getIndex( attribute ) ).forwardCursor();
+            userIdxCursor = ( ( Index<V, Entry, ID> ) db.getIndex( attribute ) ).forwardCursor();
             ndnIdxCursor = null;
         }
         else
@@ -162,7 +162,7 @@ public class GreaterEqCursor<V, ID> exte
 
 
     @SuppressWarnings("unchecked")
-    public void before( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
         if ( userIdxCursor != null )
@@ -193,7 +193,7 @@ public class GreaterEqCursor<V, ID> exte
 
 
     @SuppressWarnings("unchecked")
-    public void after( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
         if ( userIdxCursor != null )
@@ -238,7 +238,7 @@ public class GreaterEqCursor<V, ID> exte
         checkNotClosed( "beforeFirst()" );
         if ( userIdxCursor != null )
         {
-            IndexEntry<V, ServerEntry, ID> advanceTo = new ForwardIndexEntry<V, ServerEntry, ID>();
+            IndexEntry<V, Entry, ID> advanceTo = new ForwardIndexEntry<V, Entry, ID>();
             advanceTo.setValue( ( V ) greaterEqEvaluator.getExpression().getValue().get() );
             userIdxCursor.before( advanceTo );
         }
@@ -296,7 +296,7 @@ public class GreaterEqCursor<V, ID> exte
             while ( userIdxCursor.previous() )
             {
                 checkNotClosed( "previous()" );
-                IndexEntry<?, ServerEntry, ID> candidate = userIdxCursor.get();
+                IndexEntry<?, Entry, ID> candidate = userIdxCursor.get();
                 if ( greaterEqEvaluator.getComparator().compare( candidate.getValue(),
                     greaterEqEvaluator.getExpression().getValue().get() ) >= 0 )
                 {
@@ -348,7 +348,7 @@ public class GreaterEqCursor<V, ID> exte
 
 
     @SuppressWarnings("unchecked")
-    public IndexEntry<V, ServerEntry, ID> get() throws Exception
+    public IndexEntry<V, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( userIdxCursor != null )
@@ -363,7 +363,7 @@ public class GreaterEqCursor<V, ID> exte
 
         if ( available )
         {
-            return ( IndexEntry<V, ServerEntry, ID> ) ndnCandidate;
+            return ( IndexEntry<V, Entry, ID> ) ndnCandidate;
         }
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java Wed Apr 28 08:44:42 2010
@@ -28,8 +28,8 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -45,19 +45,19 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class GreaterEqEvaluator<T, ID> implements Evaluator<GreaterEqNode<T>, ServerEntry, ID>
+public class GreaterEqEvaluator<T, ID> implements Evaluator<GreaterEqNode<T>, Entry, ID>
 {
     private final GreaterEqNode<T> node;
-    private final Store<ServerEntry, ID> db;
+    private final Store<Entry, ID> db;
     private final SchemaManager schemaManager;
     private final AttributeType type;
     private final Normalizer normalizer;
     private final Comparator comparator;
-    private final Index<Object, ServerEntry, ID> idx;
+    private final Index<Object, Entry, ID> idx;
 
 
     @SuppressWarnings("unchecked")
-    public GreaterEqEvaluator( GreaterEqNode<T> node, Store<ServerEntry, ID> db, SchemaManager schemaManager )
+    public GreaterEqEvaluator( GreaterEqNode<T> node, Store<Entry, ID> db, SchemaManager schemaManager )
         throws Exception
     {
         this.db = db;
@@ -67,7 +67,7 @@ public class GreaterEqEvaluator<T, ID> i
 
         if ( db.hasIndexOn( node.getAttribute() ) )
         {
-            idx = ( Index<Object, ServerEntry, ID> ) db.getIndex( node.getAttribute() );
+            idx = ( Index<Object, Entry, ID> ) db.getIndex( node.getAttribute() );
         }
         else
         {
@@ -121,14 +121,14 @@ public class GreaterEqEvaluator<T, ID> i
     }
 
 
-    public boolean evaluate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
         if ( idx != null && idx.isDupsEnabled() )
         {
             return idx.reverseGreaterOrEq( indexEntry.getId(), node.getValue().get() );
         }
 
-        ServerEntry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getObject();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )
@@ -139,7 +139,7 @@ public class GreaterEqEvaluator<T, ID> i
 
         /*
          * The code below could have been replaced by a call to
-         * evaluate( ServerEntry ) but it was not because we wanted to make
+         * evaluate( Entry ) but it was not because we wanted to make
          * sure the call to evaluate with the attribute was made using a
          * non-null IndexEntry parameter.  This is to make sure the call to
          * evaluate with the attribute will set the value on the IndexEntry.
@@ -150,7 +150,7 @@ public class GreaterEqEvaluator<T, ID> i
 
         // if the attribute exists and has a greater than or equal value return true
         //noinspection unchecked
-        if ( attr != null && evaluate( ( IndexEntry<Object, ServerEntry, ID> ) indexEntry, attr ) )
+        if ( attr != null && evaluate( ( IndexEntry<Object, Entry, ID> ) indexEntry, attr ) )
         {
             return true;
         }
@@ -173,7 +173,7 @@ public class GreaterEqEvaluator<T, ID> i
                 attr = entry.get( descendant );
 
                 //noinspection unchecked
-                if ( attr != null && evaluate( ( IndexEntry<Object, ServerEntry, ID> ) indexEntry, attr ) )
+                if ( attr != null && evaluate( ( IndexEntry<Object, Entry, ID> ) indexEntry, attr ) )
                 {
                     return true;
                 }
@@ -196,7 +196,7 @@ public class GreaterEqEvaluator<T, ID> i
     }
 
 
-    public boolean evaluateEntry( ServerEntry entry ) throws Exception
+    public boolean evaluateEntry( Entry entry ) throws Exception
     {
         // get the attribute
         EntryAttribute attr = entry.get( type );
@@ -238,7 +238,7 @@ public class GreaterEqEvaluator<T, ID> i
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value 
-    private boolean evaluate( IndexEntry<Object, ServerEntry, ID> indexEntry, EntryAttribute attribute )
+    private boolean evaluate( IndexEntry<Object, Entry, ID> indexEntry, EntryAttribute attribute )
         throws Exception
     {
         /*

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java Wed Apr 28 08:44:42 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 
 
 /**
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public class LessEqCursor<V, ID> extends AbstractIndexCursor<V, ServerEntry, ID>
+public class LessEqCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
 {
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_716 );
 
@@ -49,36 +49,36 @@ public class LessEqCursor<V, ID> extends
     private final LessEqEvaluator<V, ID> lessEqEvaluator;
 
     /** Cursor over attribute entry matching filter: set when index present */
-    private final IndexCursor<V, ServerEntry, ID> userIdxCursor;
+    private final IndexCursor<V, Entry, ID> userIdxCursor;
 
     /** NDN Cursor on all entries in  (set when no index on user attribute) */
-    private final IndexCursor<V, ServerEntry, ID> ndnIdxCursor;
+    private final IndexCursor<V, Entry, ID> ndnIdxCursor;
 
     /**
      * Used to store indexEntry from ndnCandidate so it can be saved after
      * call to evaluate() which changes the value so it's not referring to
      * the NDN but to the value of the attribute instead.
      */
-    IndexEntry<V, ServerEntry, ID> ndnCandidate;
+    IndexEntry<V, Entry, ID> ndnCandidate;
 
     /** used in both modes */
     private boolean available = false;
 
 
     @SuppressWarnings("unchecked")
-    public LessEqCursor( Store<ServerEntry, ID> db, LessEqEvaluator<V, ID> lessEqEvaluator ) throws Exception
+    public LessEqCursor( Store<Entry, ID> db, LessEqEvaluator<V, ID> lessEqEvaluator ) throws Exception
     {
         this.lessEqEvaluator = lessEqEvaluator;
 
         String attribute = lessEqEvaluator.getExpression().getAttribute();
         if ( db.hasIndexOn( attribute ) )
         {
-            userIdxCursor = ( ( Index<V, ServerEntry, ID> ) db.getIndex( attribute ) ).forwardCursor();
+            userIdxCursor = ( ( Index<V, Entry, ID> ) db.getIndex( attribute ) ).forwardCursor();
             ndnIdxCursor = null;
         }
         else
         {
-            ndnIdxCursor = ( IndexCursor<V, ServerEntry, ID> ) db.getNdnIndex().forwardCursor();
+            ndnIdxCursor = ( IndexCursor<V, Entry, ID> ) db.getNdnIndex().forwardCursor();
             userIdxCursor = null;
         }
     }
@@ -135,7 +135,7 @@ public class LessEqCursor<V, ID> extends
     }
 
 
-    public void before( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
         if ( userIdxCursor != null )
@@ -215,7 +215,7 @@ public class LessEqCursor<V, ID> extends
     }
 
 
-    public void after( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
         if ( userIdxCursor != null )
@@ -273,7 +273,7 @@ public class LessEqCursor<V, ID> extends
         checkNotClosed( "afterLast()" );
         if ( userIdxCursor != null )
         {
-            IndexEntry<V, ServerEntry, ID> advanceTo = new ForwardIndexEntry<V, ServerEntry, ID>();
+            IndexEntry<V, Entry, ID> advanceTo = new ForwardIndexEntry<V, Entry, ID>();
             //noinspection unchecked
             advanceTo.setValue( ( V ) lessEqEvaluator.getExpression().getValue().get() );
             userIdxCursor.after( advanceTo );
@@ -348,7 +348,7 @@ public class LessEqCursor<V, ID> extends
             while ( userIdxCursor.next() )
             {
                 checkNotClosed( "next()" );
-                IndexEntry<?, ServerEntry, ID> candidate = userIdxCursor.get();
+                IndexEntry<?, Entry, ID> candidate = userIdxCursor.get();
                 if ( lessEqEvaluator.getLdapComparator().compare( candidate.getValue(),
                     lessEqEvaluator.getExpression().getValue().get() ) <= 0 )
                 {
@@ -377,7 +377,7 @@ public class LessEqCursor<V, ID> extends
     }
 
 
-    public IndexEntry<V, ServerEntry, ID> get() throws Exception
+    public IndexEntry<V, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( userIdxCursor != null )

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java Wed Apr 28 08:44:42 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
 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;
 import org.apache.directory.shared.ldap.filter.LessEqNode;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -45,19 +45,19 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class LessEqEvaluator<T, ID> implements Evaluator<LessEqNode<T>, ServerEntry, ID>
+public class LessEqEvaluator<T, ID> implements Evaluator<LessEqNode<T>, Entry, ID>
 {
     private final LessEqNode<T> node;
-    private final Store<ServerEntry, ID> db;
+    private final Store<Entry, ID> db;
     private final SchemaManager schemaManager;
     private final AttributeType type;
     private final Normalizer normalizer;
     private final LdapComparator<? super Object> ldapComparator;
-    private final Index<T, ServerEntry, ID> idx;
+    private final Index<T, Entry, ID> idx;
 
 
     @SuppressWarnings("unchecked")
-    public LessEqEvaluator( LessEqNode<T> node, Store<ServerEntry, ID> db, SchemaManager schemaManager )
+    public LessEqEvaluator( LessEqNode<T> node, Store<Entry, ID> db, SchemaManager schemaManager )
         throws Exception
     {
         this.db = db;
@@ -67,7 +67,7 @@ public class LessEqEvaluator<T, ID> impl
 
         if ( db.hasIndexOn( node.getAttribute() ) )
         {
-            idx = ( Index<T, ServerEntry, ID> ) db.getIndex( node.getAttribute() );
+            idx = ( Index<T, Entry, ID> ) db.getIndex( node.getAttribute() );
         }
         else
         {
@@ -132,14 +132,14 @@ public class LessEqEvaluator<T, ID> impl
     }
 
 
-    public boolean evaluate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
         if ( idx != null && idx.isDupsEnabled() )
         {
             return idx.reverseLessOrEq( indexEntry.getId(), node.getValue().get() );
         }
 
-        ServerEntry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getObject();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )
@@ -158,7 +158,7 @@ public class LessEqEvaluator<T, ID> impl
 
         // if the attribute does not exist just return false
         //noinspection unchecked
-        if ( attr != null && evaluate( ( IndexEntry<Object, ServerEntry, ID> ) indexEntry, attr ) )
+        if ( attr != null && evaluate( ( IndexEntry<Object, Entry, ID> ) indexEntry, attr ) )
         {
             return true;
         }
@@ -181,7 +181,7 @@ public class LessEqEvaluator<T, ID> impl
                 attr = entry.get( descendant );
 
                 //noinspection unchecked
-                if ( attr != null && evaluate( ( IndexEntry<Object, ServerEntry, ID> ) indexEntry, attr ) )
+                if ( attr != null && evaluate( ( IndexEntry<Object, Entry, ID> ) indexEntry, attr ) )
                 {
                     return true;
                 }
@@ -193,7 +193,7 @@ public class LessEqEvaluator<T, ID> impl
     }
 
 
-    public boolean evaluateEntry( ServerEntry entry ) throws Exception
+    public boolean evaluateEntry( Entry entry ) throws Exception
     {
         // get the attribute
         EntryAttribute attr = entry.get( type );
@@ -235,7 +235,7 @@ public class LessEqEvaluator<T, ID> impl
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluate( IndexEntry<Object, ServerEntry, ID> indexEntry, EntryAttribute attribute )
+    private boolean evaluate( IndexEntry<Object, Entry, ID> indexEntry, EntryAttribute attribute )
         throws Exception
     {
         /*

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java Wed Apr 28 08:44:42 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.i18n.I18n;
 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;
 
 
@@ -37,20 +37,20 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public class NotCursor<V, ID> extends AbstractIndexCursor<V, ServerEntry, ID>
+public class NotCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
 {
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_718 );
-    private final IndexCursor<V, ServerEntry, ID> ndnCursor;
-    private final Evaluator<? extends ExprNode, ServerEntry, ID> childEvaluator;
+    private final IndexCursor<V, Entry, ID> ndnCursor;
+    private final Evaluator<? extends ExprNode, Entry, ID> childEvaluator;
     private boolean available = false;
 
 
     @SuppressWarnings("unchecked")
-    public NotCursor( Store<ServerEntry, ID> db, Evaluator<? extends ExprNode, ServerEntry, ID> childEvaluator )
+    public NotCursor( Store<Entry, ID> db, Evaluator<? extends ExprNode, Entry, ID> childEvaluator )
         throws Exception
     {
         this.childEvaluator = childEvaluator;
-        this.ndnCursor = ( IndexCursor<V, ServerEntry, ID> ) db.getNdnIndex().forwardCursor();
+        this.ndnCursor = ( IndexCursor<V, Entry, ID> ) db.getNdnIndex().forwardCursor();
     }
 
 
@@ -66,13 +66,13 @@ public class NotCursor<V, ID> extends Ab
     }
 
 
-    public void before( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( UNSUPPORTED_MSG );
     }
 
 
-    public void after( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( UNSUPPORTED_MSG );
     }
@@ -119,7 +119,7 @@ public class NotCursor<V, ID> extends Ab
         while ( ndnCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, ServerEntry, ID> candidate = ndnCursor.get();
+            IndexEntry<?, Entry, ID> candidate = ndnCursor.get();
             if ( !childEvaluator.evaluate( candidate ) )
             {
                 return available = true;
@@ -135,7 +135,7 @@ public class NotCursor<V, ID> extends Ab
         while ( ndnCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, ServerEntry, ID> candidate = ndnCursor.get();
+            IndexEntry<?, Entry, ID> candidate = ndnCursor.get();
             if ( !childEvaluator.evaluate( candidate ) )
             {
                 return available = true;
@@ -146,7 +146,7 @@ public class NotCursor<V, ID> extends Ab
     }
 
 
-    public IndexEntry<V, ServerEntry, ID> get() throws Exception
+    public IndexEntry<V, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( available )

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotEvaluator.java Wed Apr 28 08:44:42 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm.search.impl;
 
 
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.NotNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -33,13 +33,13 @@ import org.apache.directory.server.xdbm.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public class NotEvaluator<ID> implements Evaluator<NotNode, ServerEntry, ID>
+public class NotEvaluator<ID> implements Evaluator<NotNode, Entry, ID>
 {
     private final NotNode node;
-    private final Evaluator<? extends ExprNode, ServerEntry, ID> childEvaluator;
+    private final Evaluator<? extends ExprNode, Entry, ID> childEvaluator;
 
 
-    public NotEvaluator( NotNode node, Evaluator<? extends ExprNode, ServerEntry, ID> childEvaluator )
+    public NotEvaluator( NotNode node, Evaluator<? extends ExprNode, Entry, ID> childEvaluator )
     {
         this.node = node;
         this.childEvaluator = childEvaluator;
@@ -52,13 +52,13 @@ public class NotEvaluator<ID> implements
     }
 
 
-    public boolean evaluateEntry( ServerEntry entry ) throws Exception
+    public boolean evaluateEntry( Entry entry ) throws Exception
     {
         return !childEvaluator.evaluateEntry( entry );
     }
 
 
-    public boolean evaluate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
         return !childEvaluator.evaluate( indexEntry );
     }

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java Wed Apr 28 08:44:42 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexCursor;
 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;
 
 
 /**
@@ -37,26 +37,26 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class OneLevelScopeCursor<ID> extends AbstractIndexCursor<ID, ServerEntry, ID>
+public class OneLevelScopeCursor<ID> extends AbstractIndexCursor<ID, Entry, ID>
 {
     /** Error message for unsupported operations */
     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 onelevel ScopeNode Evaluator */
     @SuppressWarnings("unchecked")
     private final OneLevelScopeEvaluator 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 Cursor<IndexEntry<ID, ServerEntry, ID>> dereferencedCursor;
+    private final Cursor<IndexEntry<ID, Entry, ID>> dereferencedCursor;
 
     /** Currently active Cursor: we switch between two cursors */
-    private Cursor<IndexEntry<ID, ServerEntry, ID>> cursor;
+    private Cursor<IndexEntry<ID, Entry, ID>> cursor;
 
     /** Whether or not this Cursor is positioned so an entry is available */
     private boolean available = false;
@@ -70,7 +70,7 @@ public class OneLevelScopeCursor<ID> ext
      * @throws Exception on db access failures
      */
     //@SuppressWarnings("unchecked")
-    public OneLevelScopeCursor( Store<ServerEntry, ID> db, OneLevelScopeEvaluator<ServerEntry, ID> evaluator )
+    public OneLevelScopeCursor( Store<Entry, ID> db, OneLevelScopeEvaluator<Entry, ID> evaluator )
         throws Exception
     {
         this.db = db;
@@ -106,13 +106,13 @@ public class OneLevelScopeCursor<ID> ext
     }
 
 
-    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 );
     }
 
 
-    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 );
     }
@@ -290,7 +290,7 @@ public class OneLevelScopeCursor<ID> ext
     }
 
 
-    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/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java Wed Apr 28 08:44:42 2010
@@ -132,7 +132,7 @@ public class OneLevelScopeEvaluator<E, I
      * alias dereferencing into account.
      *
      * TODO - terribly inefficient - would benefit from exposing the id of an
-     * entry within the ServerEntry
+     * entry within the Entry
      *
      * @see Evaluator#evaluate(Object)
      */

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java Wed Apr 28 08:44:42 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.Evaluator;
 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;
 
 
@@ -42,19 +42,19 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class OrCursor<V, ID> extends AbstractIndexCursor<V, ServerEntry, ID>
+public class OrCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
 {
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_722 );
-    private final List<IndexCursor<V, ServerEntry, ID>> cursors;
-    private final List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators;
+    private final List<IndexCursor<V, Entry, ID>> cursors;
+    private final List<Evaluator<? extends ExprNode, Entry, ID>> evaluators;
     private final List<Set<ID>> blacklists;
     private int cursorIndex = -1;
     private boolean available = false;
 
 
     // TODO - do same evaluator fail fast optimization that we do in AndCursor
-    public OrCursor( List<IndexCursor<V, ServerEntry, ID>> cursors,
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators )
+    public OrCursor( List<IndexCursor<V, Entry, ID>> cursors,
+        List<Evaluator<? extends ExprNode, Entry, ID>> evaluators )
     {
         if ( cursors.size() <= 1 )
         {
@@ -79,13 +79,13 @@ public class OrCursor<V, ID> extends Abs
     }
 
 
-    public void before( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void before( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( UNSUPPORTED_MSG );
     }
 
 
-    public void after( IndexEntry<V, ServerEntry, ID> element ) throws Exception
+    public void after( IndexEntry<V, Entry, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( UNSUPPORTED_MSG );
     }
@@ -148,7 +148,7 @@ public class OrCursor<V, ID> extends Abs
      * @param indexEntry the index entry to blacklist
      * @throws Exception if there are problems accessing underlying db
      */
-    private void blackListIfDuplicate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    private void blackListIfDuplicate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
         for ( int ii = 0; ii < evaluators.size(); ii++ )
         {
@@ -170,7 +170,7 @@ public class OrCursor<V, ID> extends Abs
         while ( cursors.get( cursorIndex ).previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, ServerEntry, ID> candidate = cursors.get( cursorIndex ).get();
+            IndexEntry<?, Entry, ID> candidate = cursors.get( cursorIndex ).get();
             if ( !isBlackListed( candidate.getId() ) )
             {
                 blackListIfDuplicate( candidate );
@@ -187,7 +187,7 @@ public class OrCursor<V, ID> extends Abs
             while ( cursors.get( cursorIndex ).previous() )
             {
                 checkNotClosed( "previous()" );
-                IndexEntry<?, ServerEntry, ID> candidate = cursors.get( cursorIndex ).get();
+                IndexEntry<?, Entry, ID> candidate = cursors.get( cursorIndex ).get();
                 if ( !isBlackListed( candidate.getId() ) )
                 {
                     blackListIfDuplicate( candidate );
@@ -205,7 +205,7 @@ public class OrCursor<V, ID> extends Abs
         while ( cursors.get( cursorIndex ).next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, ServerEntry, ID> candidate = cursors.get( cursorIndex ).get();
+            IndexEntry<?, Entry, ID> candidate = cursors.get( cursorIndex ).get();
             if ( !isBlackListed( candidate.getId() ) )
             {
                 blackListIfDuplicate( candidate );
@@ -222,7 +222,7 @@ public class OrCursor<V, ID> extends Abs
             while ( cursors.get( cursorIndex ).next() )
             {
                 checkNotClosed( "previous()" );
-                IndexEntry<?, ServerEntry, ID> candidate = cursors.get( cursorIndex ).get();
+                IndexEntry<?, Entry, ID> candidate = cursors.get( cursorIndex ).get();
                 if ( !isBlackListed( candidate.getId() ) )
                 {
                     blackListIfDuplicate( candidate );
@@ -235,7 +235,7 @@ public class OrCursor<V, ID> extends Abs
     }
 
 
-    public IndexEntry<V, ServerEntry, ID> get() throws Exception
+    public IndexEntry<V, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( available )

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrEvaluator.java Wed Apr 28 08:44:42 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.xdbm.search.impl;
 
 
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.OrNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -38,14 +38,14 @@ import java.util.Comparator;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public class OrEvaluator<ID> implements Evaluator<OrNode, ServerEntry, ID>
+public class OrEvaluator<ID> implements Evaluator<OrNode, Entry, ID>
 {
-    private final List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators;
+    private final List<Evaluator<? extends ExprNode, Entry, ID>> evaluators;
 
     private final OrNode node;
 
 
-    public OrEvaluator( OrNode node, List<Evaluator<? extends ExprNode, ServerEntry, ID>> evaluators )
+    public OrEvaluator( OrNode node, List<Evaluator<? extends ExprNode, Entry, ID>> evaluators )
     {
         this.node = node;
         this.evaluators = optimize( evaluators );
@@ -63,16 +63,16 @@ public class OrEvaluator<ID> implements 
      * @param unoptimized the unoptimized list of Evaluators
      * @return optimized Evaluator list with decreasing scan count ordering
      */
-    private List<Evaluator<? extends ExprNode, ServerEntry, ID>> optimize(
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> unoptimized )
+    private List<Evaluator<? extends ExprNode, Entry, ID>> optimize(
+        List<Evaluator<? extends ExprNode, Entry, ID>> unoptimized )
     {
-        List<Evaluator<? extends ExprNode, ServerEntry, ID>> optimized = new ArrayList<Evaluator<? extends ExprNode, ServerEntry, ID>>(
+        List<Evaluator<? extends ExprNode, Entry, ID>> optimized = new ArrayList<Evaluator<? extends ExprNode, Entry, ID>>(
             unoptimized.size() );
         optimized.addAll( unoptimized );
-        Collections.sort( optimized, new Comparator<Evaluator<? extends ExprNode, ServerEntry, ID>>()
+        Collections.sort( optimized, new Comparator<Evaluator<? extends ExprNode, Entry, ID>>()
         {
-            public int compare( Evaluator<? extends ExprNode, ServerEntry, ID> e1,
-                Evaluator<? extends ExprNode, ServerEntry, ID> e2 )
+            public int compare( Evaluator<? extends ExprNode, Entry, ID> e1,
+                Evaluator<? extends ExprNode, Entry, ID> e2 )
             {
                 long scanCount1 = ( Long ) e1.getExpression().get( "count" );
                 long scanCount2 = ( Long ) e2.getExpression().get( "count" );
@@ -101,9 +101,9 @@ public class OrEvaluator<ID> implements 
     }
 
 
-    public boolean evaluate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
-        for ( Evaluator<?, ServerEntry, ID> evaluator : evaluators )
+        for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {
             if ( evaluator.evaluate( indexEntry ) )
             {
@@ -117,7 +117,7 @@ public class OrEvaluator<ID> implements 
 
     public boolean evaluateId( ID id ) throws Exception
     {
-        for ( Evaluator<?, ServerEntry, ID> evaluator : evaluators )
+        for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {
             if ( evaluator.evaluateId( id ) )
             {
@@ -129,9 +129,9 @@ public class OrEvaluator<ID> implements 
     }
 
 
-    public boolean evaluateEntry( ServerEntry entry ) throws Exception
+    public boolean evaluateEntry( Entry entry ) throws Exception
     {
-        for ( Evaluator<?, ServerEntry, ID> evaluator : evaluators )
+        for ( Evaluator<?, Entry, ID> evaluator : evaluators )
         {
             if ( evaluator.evaluateEntry( entry ) )
             {

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java Wed Apr 28 08:44:42 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.i18n.I18n;
 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.schema.AttributeType;
 
 
@@ -36,16 +36,16 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $$Rev$$
  */
-public class PresenceCursor<ID> extends AbstractIndexCursor<String, ServerEntry, ID>
+public class PresenceCursor<ID> extends AbstractIndexCursor<String, Entry, ID>
 {
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_724 );
-    private final IndexCursor<String, ServerEntry, ID> ndnCursor;
-    private final IndexCursor<String, ServerEntry, ID> presenceCursor;
+    private final IndexCursor<String, Entry, ID> ndnCursor;
+    private final IndexCursor<String, Entry, ID> presenceCursor;
     private final PresenceEvaluator<ID> presenceEvaluator;
     private boolean available = false;
 
 
-    public PresenceCursor( Store<ServerEntry, ID> db, PresenceEvaluator<ID> presenceEvaluator ) throws Exception
+    public PresenceCursor( Store<Entry, ID> db, PresenceEvaluator<ID> presenceEvaluator ) throws Exception
     {
         this.presenceEvaluator = presenceEvaluator;
         AttributeType type = presenceEvaluator.getAttributeType();
@@ -90,7 +90,7 @@ public class PresenceCursor<ID> extends 
     }
 
 
-    public void before( IndexEntry<String, ServerEntry, ID> element ) throws Exception
+    public void before( IndexEntry<String, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "before()" );
         if ( presenceCursor != null )
@@ -116,7 +116,7 @@ public class PresenceCursor<ID> extends 
     }
 
 
-    public void after( IndexEntry<String, ServerEntry, ID> element ) throws Exception
+    public void after( IndexEntry<String, Entry, ID> element ) throws Exception
     {
         checkNotClosed( "after()" );
         if ( presenceCursor != null )
@@ -194,7 +194,7 @@ public class PresenceCursor<ID> extends 
         while ( ndnCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, ServerEntry, ID> candidate = ndnCursor.get();
+            IndexEntry<?, Entry, ID> candidate = ndnCursor.get();
             if ( presenceEvaluator.evaluate( candidate ) )
             {
                 return available = true;
@@ -216,7 +216,7 @@ public class PresenceCursor<ID> extends 
         while ( ndnCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, ServerEntry, ID> candidate = ndnCursor.get();
+            IndexEntry<?, Entry, ID> candidate = ndnCursor.get();
             if ( presenceEvaluator.evaluate( candidate ) )
             {
                 return available = true;
@@ -227,7 +227,7 @@ public class PresenceCursor<ID> extends 
     }
 
 
-    public IndexEntry<String, ServerEntry, ID> get() throws Exception
+    public IndexEntry<String, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( presenceCursor != null )
@@ -247,7 +247,7 @@ public class PresenceCursor<ID> extends 
              * value to be the value of the attribute in question.  So we will
              * set that accordingly here.
              */
-            IndexEntry<String, ServerEntry, ID> indexEntry = ndnCursor.get();
+            IndexEntry<String, Entry, ID> indexEntry = ndnCursor.get();
             indexEntry.setValue( presenceEvaluator.getAttributeType().getOid() );
             return indexEntry;
         }

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java Wed Apr 28 08:44:42 2010
@@ -27,7 +27,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
 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.filter.PresenceNode;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -40,16 +40,16 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class PresenceEvaluator<ID> implements Evaluator<PresenceNode, ServerEntry, ID>
+public class PresenceEvaluator<ID> implements Evaluator<PresenceNode, Entry, ID>
 {
     private final PresenceNode node;
-    private final Store<ServerEntry, ID> db;
+    private final Store<Entry, ID> db;
     private final AttributeType type;
     private final SchemaManager schemaManager;
-    private final Index<String, ServerEntry, ID> idx;
+    private final Index<String, Entry, ID> idx;
 
 
-    public PresenceEvaluator( PresenceNode node, Store<ServerEntry, ID> db, SchemaManager schemaManager )
+    public PresenceEvaluator( PresenceNode node, Store<Entry, ID> db, SchemaManager schemaManager )
         throws Exception
     {
         this.db = db;
@@ -82,14 +82,14 @@ public class PresenceEvaluator<ID> imple
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    public boolean evaluate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
         if ( idx != null )
         {
             return idx.forward( type.getOid(), indexEntry.getId() );
         }
 
-        ServerEntry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getObject();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )
@@ -117,7 +117,7 @@ public class PresenceEvaluator<ID> imple
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    public boolean evaluateEntry( ServerEntry entry ) throws Exception
+    public boolean evaluateEntry( Entry entry ) throws Exception
     {
         if ( db.hasSystemIndexOn( node.getAttribute() ) )
         {

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java Wed Apr 28 08:44:42 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
+import org.apache.directory.shared.ldap.entry.Entry;
 
 
 /**
@@ -37,18 +37,18 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SubstringCursor<ID> extends AbstractIndexCursor<String, ServerEntry, ID>
+public class SubstringCursor<ID> extends AbstractIndexCursor<String, Entry, ID>
 {
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_725 );
     private final boolean hasIndex;
-    private final IndexCursor<String, ServerEntry, ID> wrapped;
+    private final IndexCursor<String, Entry, ID> wrapped;
     private final SubstringEvaluator<ID> evaluator;
-    private final ForwardIndexEntry<String, ServerEntry, ID> indexEntry = new ForwardIndexEntry<String, ServerEntry, ID>();
+    private final ForwardIndexEntry<String, Entry, ID> indexEntry = new ForwardIndexEntry<String, Entry, ID>();
     private boolean available = false;
 
 
     @SuppressWarnings("unchecked")
-    public SubstringCursor( Store<ServerEntry, ID> db, final SubstringEvaluator<ID> substringEvaluator )
+    public SubstringCursor( Store<Entry, ID> db, final SubstringEvaluator<ID> substringEvaluator )
         throws Exception
     {
         evaluator = substringEvaluator;
@@ -56,7 +56,7 @@ public class SubstringCursor<ID> extends
 
         if ( hasIndex )
         {
-            wrapped = ( ( Index<String, ServerEntry, ID> ) db.getIndex( evaluator.getExpression().getAttribute() ) )
+            wrapped = ( ( Index<String, Entry, ID> ) db.getIndex( evaluator.getExpression().getAttribute() ) )
                 .forwardCursor();
         }
         else
@@ -95,13 +95,13 @@ public class SubstringCursor<ID> extends
     }
 
 
-    public void before( IndexEntry<String, ServerEntry, ID> element ) throws Exception
+    public void before( IndexEntry<String, Entry, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( UNSUPPORTED_MSG );
     }
 
 
-    public void after( IndexEntry<String, ServerEntry, ID> element ) throws Exception
+    public void after( IndexEntry<String, Entry, ID> element ) throws Exception
     {
         throw new UnsupportedOperationException( UNSUPPORTED_MSG );
     }
@@ -112,7 +112,7 @@ public class SubstringCursor<ID> extends
         checkNotClosed( "beforeFirst()" );
         if ( evaluator.getExpression().getInitial() != null && hasIndex )
         {
-            ForwardIndexEntry<String, ServerEntry, ID> indexEntry = new ForwardIndexEntry<String, ServerEntry, ID>();
+            ForwardIndexEntry<String, Entry, ID> indexEntry = new ForwardIndexEntry<String, Entry, ID>();
             indexEntry.setValue( evaluator.getExpression().getInitial() );
             wrapped.before( indexEntry );
         }
@@ -153,7 +153,7 @@ public class SubstringCursor<ID> extends
     }
 
 
-    private boolean evaluateCandidate( IndexEntry<String, ServerEntry, ID> indexEntry ) throws Exception
+    private boolean evaluateCandidate( IndexEntry<String, Entry, ID> indexEntry ) throws Exception
     {
         if ( hasIndex )
         {
@@ -178,7 +178,7 @@ public class SubstringCursor<ID> extends
         while ( wrapped.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<String, ServerEntry, ID> entry = wrapped.get();
+            IndexEntry<String, Entry, ID> entry = wrapped.get();
             if ( evaluateCandidate( entry ) )
             {
                 available = true;
@@ -199,7 +199,7 @@ public class SubstringCursor<ID> extends
         while ( wrapped.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<String, ServerEntry, ID> entry = wrapped.get();
+            IndexEntry<String, Entry, ID> entry = wrapped.get();
             if ( evaluateCandidate( entry ) )
             {
                 available = true;
@@ -215,7 +215,7 @@ public class SubstringCursor<ID> extends
     }
 
 
-    public IndexEntry<String, ServerEntry, ID> get() throws Exception
+    public IndexEntry<String, Entry, ID> get() throws Exception
     {
         checkNotClosed( "get()" );
         if ( available )

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java?rev=938820&r1=938819&r2=938820&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java Wed Apr 28 08:44:42 2010
@@ -30,7 +30,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 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;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -46,10 +46,10 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SubstringEvaluator<ID> implements Evaluator<SubstringNode, ServerEntry, ID>
+public class SubstringEvaluator<ID> implements Evaluator<SubstringNode, Entry, ID>
 {
     /** Database used while evaluating candidates */
-    private final Store<ServerEntry, ID> db;
+    private final Store<Entry, ID> db;
 
     /** Reference to the SchemaManager */
     private final SchemaManager schemaManager;
@@ -64,7 +64,7 @@ public class SubstringEvaluator<ID> impl
 
     private final Normalizer normalizer;
 
-    private final Index<String, ServerEntry, ID> idx;
+    private final Index<String, Entry, ID> idx;
 
 
     /**
@@ -76,7 +76,7 @@ public class SubstringEvaluator<ID> impl
      * @throws Exception if there are failures accessing resources and the db
      */
     @SuppressWarnings("unchecked")
-    public SubstringEvaluator( SubstringNode node, Store<ServerEntry, ID> db, SchemaManager schemaManager )
+    public SubstringEvaluator( SubstringNode node, Store<Entry, ID> db, SchemaManager schemaManager )
         throws Exception
     {
         this.db = db;
@@ -107,7 +107,7 @@ public class SubstringEvaluator<ID> impl
 
         if ( db.hasIndexOn( node.getAttribute() ) )
         {
-            idx = ( Index<String, ServerEntry, ID> ) db.getIndex( node.getAttribute() );
+            idx = ( Index<String, Entry, ID> ) db.getIndex( node.getAttribute() );
         }
         else
         {
@@ -117,12 +117,12 @@ public class SubstringEvaluator<ID> impl
 
 
     @SuppressWarnings("unchecked")
-    public boolean evaluate( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
 
         if ( idx == null )
         {
-            return evaluateWithoutIndex( ( IndexEntry<String, ServerEntry, ID> ) indexEntry );
+            return evaluateWithoutIndex( ( IndexEntry<String, Entry, ID> ) indexEntry );
         }
         else
         {
@@ -145,7 +145,7 @@ public class SubstringEvaluator<ID> impl
     }
 
 
-    public boolean evaluateEntry( ServerEntry entry ) throws Exception
+    public boolean evaluateEntry( Entry entry ) throws Exception
     {
 
         if ( idx == null )
@@ -172,7 +172,7 @@ public class SubstringEvaluator<ID> impl
     }
 
 
-    private boolean evaluateWithIndex( IndexEntry<?, ServerEntry, ID> indexEntry ) throws Exception
+    private boolean evaluateWithIndex( IndexEntry<?, Entry, ID> indexEntry ) throws Exception
     {
         /*
          * Note that this is using the reverse half of the index giving a
@@ -180,12 +180,12 @@ public class SubstringEvaluator<ID> impl
          * Otherwise we would have to scan the entire index if there were
          * no reverse lookups.
          */
-        Cursor<IndexEntry<String, ServerEntry, ID>> entries = idx.reverseCursor( indexEntry.getId() );
+        Cursor<IndexEntry<String, Entry, ID>> entries = idx.reverseCursor( indexEntry.getId() );
 
         // cycle through the attribute values testing for a match
         while ( entries.next() )
         {
-            IndexEntry<String, ServerEntry, ID> rec = entries.get();
+            IndexEntry<String, Entry, ID> rec = entries.get();
 
             // once match is found cleanup and return true
             if ( regex.matcher( ( String ) rec.getValue() ).matches() )
@@ -200,7 +200,7 @@ public class SubstringEvaluator<ID> impl
     }
 
 
-    private boolean evaluateWithIndex( ServerEntry entry ) throws Exception
+    private boolean evaluateWithIndex( Entry entry ) throws Exception
     {
         throw new UnsupportedOperationException( I18n.err( I18n.ERR_721 ) );
     }
@@ -214,12 +214,12 @@ public class SubstringEvaluator<ID> impl
          * Otherwise we would have to scan the entire index if there were
          * no reverse lookups.
          */
-        Cursor<IndexEntry<String, ServerEntry, ID>> entries = idx.reverseCursor( id );
+        Cursor<IndexEntry<String, Entry, ID>> entries = idx.reverseCursor( id );
 
         // cycle through the attribute values testing for a match
         while ( entries.next() )
         {
-            IndexEntry<String, ServerEntry, ID> rec = entries.get();
+            IndexEntry<String, Entry, ID> rec = entries.get();
 
             // once match is found cleanup and return true
             if ( regex.matcher( ( String ) rec.getValue() ).matches() )
@@ -244,7 +244,7 @@ public class SubstringEvaluator<ID> impl
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluateWithoutIndex( ServerEntry entry ) throws Exception
+    private boolean evaluateWithoutIndex( Entry entry ) throws Exception
     {
         // get the attribute
         EntryAttribute attr = entry.get( type );
@@ -321,9 +321,9 @@ public class SubstringEvaluator<ID> impl
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluateWithoutIndex( IndexEntry<String, ServerEntry, ID> indexEntry ) throws Exception
+    private boolean evaluateWithoutIndex( IndexEntry<String, Entry, ID> indexEntry ) throws Exception
     {
-        ServerEntry entry = indexEntry.getObject();
+        Entry entry = indexEntry.getObject();
 
         // resuscitate the entry if it has not been and set entry in IndexEntry
         if ( null == entry )
@@ -333,7 +333,7 @@ public class SubstringEvaluator<ID> impl
         }
 
         /*
-         * Don't make a call here to evaluateWithoutIndex( ServerEntry ) for
+         * Don't make a call here to evaluateWithoutIndex( Entry ) for
          * code reuse since we do want to set the value on the indexEntry on
          * matches.
          */



Mime
View raw message