directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1378653 [3/5] - in /directory: apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/branches/apacheds-mvbt/core-api/src/main/java/org/apache/directory/server/core/api/partition/ ...
Date Wed, 29 Aug 2012 17:13:59 GMT
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.Index;
@@ -60,10 +58,10 @@ public class ApproximateCursor<V> extend
     private final ApproximateEvaluator<V> approximateEvaluator;
 
     /** Cursor over attribute entry matching filter: set when index present */
-    private final Cursor<IndexEntry<V, UUID>> userIdxCursor;
+    private final Cursor<IndexEntry<V, String>> userIdxCursor;
 
     /** NDN Cursor on all entries in  (set when no index on user attribute) */
-    private final Cursor<IndexEntry<String, UUID>> uuidIdxCursor;
+    private final Cursor<IndexEntry<String, String>> uuidIdxCursor;
 
 
     /**
@@ -83,7 +81,7 @@ public class ApproximateCursor<V> extend
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            Index<V, Entry, UUID> index = ( Index<V, Entry, UUID> ) db.getIndex( attributeType );
+            Index<V, Entry, String> index = ( Index<V, Entry, String> ) db.getIndex( attributeType );
             userIdxCursor = index.forwardCursor( value.getValue() );
             uuidIdxCursor = null;
         }
@@ -121,7 +119,7 @@ public class ApproximateCursor<V> extend
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<V, UUID> element ) throws Exception
+    public void before( IndexEntry<V, String> element ) throws Exception
     {
         checkNotClosed( "before()" );
 
@@ -140,7 +138,7 @@ public class ApproximateCursor<V> extend
      * {@inheritDoc}
      */
     @Override
-    public void after( IndexEntry<V, UUID> element ) throws Exception
+    public void after( IndexEntry<V, String> element ) throws Exception
     {
         checkNotClosed( "after()" );
 
@@ -227,7 +225,7 @@ public class ApproximateCursor<V> extend
         while ( uuidIdxCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, UUID> candidate = uuidIdxCursor.get();
+            IndexEntry<?, String> candidate = uuidIdxCursor.get();
 
             if ( approximateEvaluator.evaluate( candidate ) )
             {
@@ -252,7 +250,7 @@ public class ApproximateCursor<V> extend
         while ( uuidIdxCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, UUID> candidate = uuidIdxCursor.get();
+            IndexEntry<?, String> candidate = uuidIdxCursor.get();
 
             if ( approximateEvaluator.evaluate( candidate ) )
             {
@@ -268,7 +266,7 @@ public class ApproximateCursor<V> extend
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public IndexEntry<V, UUID> get() throws Exception
+    public IndexEntry<V, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 
@@ -279,7 +277,7 @@ public class ApproximateCursor<V> extend
 
         if ( available() )
         {
-            return ( IndexEntry<V, UUID> ) uuidIdxCursor.get();
+            return ( IndexEntry<V, String> ) uuidIdxCursor.get();
         }
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
@@ -40,7 +38,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ChildrenCursor extends AbstractIndexCursor<UUID>
+public class ChildrenCursor extends AbstractIndexCursor<String>
 {
     /** A dedicated log for cursors */
     private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -49,13 +47,13 @@ public class ChildrenCursor extends Abst
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_719 );
 
     /** A Cursor over the entries in the scope of the search base */
-    private final Cursor<IndexEntry<ParentIdAndRdn, UUID>> cursor;
+    private final Cursor<IndexEntry<ParentIdAndRdn, String>> cursor;
 
     /** The Parent ID */
-    private UUID parentId;
+    private String parentId;
 
     /** The prefetched element */
-    private IndexEntry<UUID, UUID> prefetched;
+    private IndexEntry<String, String> prefetched;
 
 
     /**
@@ -65,7 +63,7 @@ public class ChildrenCursor extends Abst
      * @param evaluator an IndexEntry (candidate) evaluator
      * @throws Exception on db access failures
      */
-    public ChildrenCursor( Store<Entry> db, UUID parentId, Cursor<IndexEntry<ParentIdAndRdn, UUID>> cursor )
+    public ChildrenCursor( Store<Entry> db, String parentId, Cursor<IndexEntry<ParentIdAndRdn, String>> cursor )
         throws Exception
     {
         LOG_CURSOR.debug( "Creating ChildrenCursor {}", this );
@@ -143,8 +141,8 @@ public class ChildrenCursor extends Abst
         if ( hasNext )
         {
             IndexEntry cursorEntry = cursor.get();
-            IndexEntry<UUID, UUID> entry = new ForwardIndexEntry();
-            entry.setId( ( UUID ) cursorEntry.getId() );
+            IndexEntry<String, String> entry = new ForwardIndexEntry();
+            entry.setId( ( String ) cursorEntry.getId() );
             entry.setKey( ( ( ParentIdAndRdn ) cursorEntry.getTuple().getKey() ).getParentId() );
 
             if ( entry.getKey().equals( parentId ) )
@@ -158,7 +156,7 @@ public class ChildrenCursor extends Abst
     }
 
 
-    public IndexEntry<UUID, UUID> get() throws Exception
+    public IndexEntry<String, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.commons.collections.ArrayStack;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
@@ -43,7 +41,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DescendantCursor extends AbstractIndexCursor<UUID>
+public class DescendantCursor extends AbstractIndexCursor<String>
 {
     /** A dedicated log for cursors */
     private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -58,10 +56,10 @@ public class DescendantCursor extends Ab
     private IndexEntry prefetched;
 
     /** The current Cursor over the entries in the scope of the search base */
-    private Cursor<IndexEntry<ParentIdAndRdn, UUID>> currentCursor;
+    private Cursor<IndexEntry<ParentIdAndRdn, String>> currentCursor;
 
     /** The current Parent ID */
-    private UUID currentParentId;
+    private String currentParentId;
 
     /** The stack of cursors used to process the depth-first traversal */
     private ArrayStack cursorStack;
@@ -70,7 +68,7 @@ public class DescendantCursor extends Ab
     private ArrayStack parentIdStack;
 
     /** The initial entry ID we are looking descendants for */
-    private UUID baseId;
+    private String baseId;
 
     /** A flag to tell that we are in the top level cursor or not */
     private boolean topLevel;
@@ -86,8 +84,8 @@ public class DescendantCursor extends Ab
      * @param evaluator an IndexEntry (candidate) evaluator
      * @throws Exception on db access failures
      */
-    public DescendantCursor( Store<Entry> db, UUID baseId, UUID parentId,
-        Cursor<IndexEntry<ParentIdAndRdn, UUID>> cursor )
+    public DescendantCursor( Store<Entry> db, String baseId, String parentId,
+        Cursor<IndexEntry<ParentIdAndRdn, String>> cursor )
         throws Exception
     {
         this( db, baseId, parentId, cursor, TOP_LEVEL );
@@ -101,8 +99,8 @@ public class DescendantCursor extends Ab
      * @param evaluator an IndexEntry (candidate) evaluator
      * @throws Exception on db access failures
      */
-    public DescendantCursor( Store<Entry> db, UUID baseId, UUID parentId,
-        Cursor<IndexEntry<ParentIdAndRdn, UUID>> cursor,
+    public DescendantCursor( Store<Entry> db, String baseId, String parentId,
+        Cursor<IndexEntry<ParentIdAndRdn, String>> cursor,
         boolean topLevel )
         throws Exception
     {
@@ -204,8 +202,8 @@ public class DescendantCursor extends Ab
                     if ( !finished )
                     {
                         currentCursor.close();
-                        currentCursor = ( Cursor<IndexEntry<ParentIdAndRdn, UUID>> ) cursorStack.pop();
-                        currentParentId = ( UUID ) parentIdStack.pop();
+                        currentCursor = ( Cursor<IndexEntry<ParentIdAndRdn, String>> ) cursorStack.pop();
+                        currentParentId = ( String ) parentIdStack.pop();
                     }
 
                     // And continue...
@@ -227,12 +225,12 @@ public class DescendantCursor extends Ab
                     // Check if the current entry has children or not.
                     if ( parentIdAndRdn.getNbDescendants() > 0 )
                     {
-                        UUID newParentId = ( UUID ) cursorEntry.getId();
+                        String newParentId = ( String ) cursorEntry.getId();
 
                         // Yes, then create a new cursor and go down one level
-                        Cursor<IndexEntry<ParentIdAndRdn, UUID>> cursor = db.getRdnIndex().forwardCursor();
+                        Cursor<IndexEntry<ParentIdAndRdn, String>> cursor = db.getRdnIndex().forwardCursor();
 
-                        IndexEntry<ParentIdAndRdn, UUID> startingPos = new ForwardIndexEntry<ParentIdAndRdn, UUID>();
+                        IndexEntry<ParentIdAndRdn, String> startingPos = new ForwardIndexEntry<ParentIdAndRdn, String>();
                         startingPos.setKey( new ParentIdAndRdn( newParentId, ( Rdn[] ) null ) );
                         cursor.before( startingPos );
 
@@ -254,8 +252,8 @@ public class DescendantCursor extends Ab
                 if ( !finished )
                 {
                     currentCursor.close();
-                    currentCursor = ( Cursor<IndexEntry<ParentIdAndRdn, UUID>> ) cursorStack.pop();
-                    currentParentId = ( UUID ) parentIdStack.pop();
+                    currentCursor = ( Cursor<IndexEntry<ParentIdAndRdn, String>> ) cursorStack.pop();
+                    currentParentId = ( String ) parentIdStack.pop();
                 }
                 // and continue...
             }
@@ -265,7 +263,7 @@ public class DescendantCursor extends Ab
     }
 
 
-    public IndexEntry<UUID, UUID> get() throws Exception
+    public IndexEntry<String, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.Index;
@@ -58,10 +56,10 @@ public class EqualityCursor<V> extends A
     private final EqualityEvaluator<V> equalityEvaluator;
 
     /** Cursor over attribute entry matching filter: set when index present */
-    private final Cursor<IndexEntry<V, UUID>> userIdxCursor;
+    private final Cursor<IndexEntry<V, String>> userIdxCursor;
 
     /** NDN Cursor on all entries in  (set when no index on user attribute) */
-    private final Cursor<IndexEntry<String, UUID>> uuidIdxCursor;
+    private final Cursor<IndexEntry<String, String>> uuidIdxCursor;
 
 
     /**
@@ -81,7 +79,7 @@ public class EqualityCursor<V> extends A
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            Index<V, Entry, UUID> userIndex = ( Index<V, Entry, UUID> ) db.getIndex( attributeType );
+            Index<V, Entry, String> userIndex = ( Index<V, Entry, String> ) db.getIndex( attributeType );
             userIdxCursor = userIndex.forwardCursor( value.getValue() );
             uuidIdxCursor = null;
         }
@@ -119,7 +117,7 @@ public class EqualityCursor<V> extends A
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<V, UUID> element ) throws Exception
+    public void before( IndexEntry<V, String> element ) throws Exception
     {
         checkNotClosed( "before()" );
 
@@ -137,7 +135,7 @@ public class EqualityCursor<V> extends A
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<V, UUID> element ) throws Exception
+    public void after( IndexEntry<V, String> element ) throws Exception
     {
         checkNotClosed( "after()" );
 
@@ -227,7 +225,7 @@ public class EqualityCursor<V> extends A
         while ( uuidIdxCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, UUID> candidate = uuidIdxCursor.get();
+            IndexEntry<?, String> candidate = uuidIdxCursor.get();
 
             if ( equalityEvaluator.evaluate( candidate ) )
             {
@@ -252,7 +250,7 @@ public class EqualityCursor<V> extends A
         while ( uuidIdxCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, UUID> candidate = uuidIdxCursor.get();
+            IndexEntry<?, String> candidate = uuidIdxCursor.get();
 
             if ( equalityEvaluator.evaluate( candidate ) )
             {
@@ -268,7 +266,7 @@ public class EqualityCursor<V> extends A
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public IndexEntry<V, UUID> get() throws Exception
+    public IndexEntry<V, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 
@@ -279,7 +277,7 @@ public class EqualityCursor<V> extends A
 
         if ( available() )
         {
-            return ( IndexEntry<V, UUID> ) uuidIdxCursor.get();
+            return ( IndexEntry<V, String> ) uuidIdxCursor.get();
         }
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
@@ -57,17 +55,17 @@ public class GreaterEqCursor<V> extends 
     private final GreaterEqEvaluator<V> greaterEqEvaluator;
 
     /** Cursor over attribute entry matching filter: set when index present */
-    private final Cursor<IndexEntry<V, UUID>> userIdxCursor;
+    private final Cursor<IndexEntry<V, String>> userIdxCursor;
 
     /** NDN Cursor on all entries in  (set when no index on user attribute) */
-    private final Cursor<IndexEntry<String, UUID>> uuidIdxCursor;
+    private final Cursor<IndexEntry<String, String>> uuidIdxCursor;
 
     /**
      * Used to store indexEntry from uuidCandidate 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.
      */
-    private IndexEntry<String, UUID> uuidCandidate;
+    private IndexEntry<String, String> uuidCandidate;
 
 
     /**
@@ -86,7 +84,7 @@ public class GreaterEqCursor<V> extends 
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            userIdxCursor = ( ( Index<V, Entry, UUID> ) db.getIndex( attributeType ) ).forwardCursor();
+            userIdxCursor = ( ( Index<V, Entry, String> ) db.getIndex( attributeType ) ).forwardCursor();
             uuidIdxCursor = null;
         }
         else
@@ -109,7 +107,7 @@ public class GreaterEqCursor<V> extends 
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<V, UUID> element ) throws Exception
+    public void before( IndexEntry<V, String> element ) throws Exception
     {
         checkNotClosed( "before()" );
 
@@ -143,7 +141,7 @@ public class GreaterEqCursor<V> extends 
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<V, UUID> element ) throws Exception
+    public void after( IndexEntry<V, String> element ) throws Exception
     {
         checkNotClosed( "after()" );
 
@@ -196,7 +194,7 @@ public class GreaterEqCursor<V> extends 
 
         if ( userIdxCursor != null )
         {
-            IndexEntry<V, UUID> advanceTo = new ForwardIndexEntry<V, UUID>();
+            IndexEntry<V, String> advanceTo = new ForwardIndexEntry<V, String>();
             advanceTo.setKey( ( V ) greaterEqEvaluator.getExpression().getValue().getValue() );
             userIdxCursor.before( advanceTo );
         }
@@ -269,7 +267,7 @@ public class GreaterEqCursor<V> extends 
             while ( userIdxCursor.previous() )
             {
                 checkNotClosed( "previous()" );
-                IndexEntry<?, UUID> candidate = userIdxCursor.get();
+                IndexEntry<?, String> candidate = userIdxCursor.get();
 
                 if ( greaterEqEvaluator.getComparator().compare( candidate.getKey(),
                     greaterEqEvaluator.getExpression().getValue().getValue() ) >= 0 )
@@ -331,7 +329,7 @@ public class GreaterEqCursor<V> extends 
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public IndexEntry<V, UUID> get() throws Exception
+    public IndexEntry<V, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 
@@ -347,7 +345,7 @@ public class GreaterEqCursor<V> extends 
 
         if ( available() )
         {
-            return ( IndexEntry<V, UUID> ) uuidCandidate;
+            return ( IndexEntry<V, String> ) uuidCandidate;
         }
 
         throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
@@ -57,17 +55,17 @@ public class LessEqCursor<V> extends Abs
     private final LessEqEvaluator<V> lessEqEvaluator;
 
     /** Cursor over attribute entry matching filter: set when index present */
-    private final Cursor<IndexEntry<V, UUID>> userIdxCursor;
+    private final Cursor<IndexEntry<V, String>> userIdxCursor;
 
     /** NDN Cursor on all entries in  (set when no index on user attribute) */
-    private final Cursor<IndexEntry<V, UUID>> uuidIdxCursor;
+    private final Cursor<IndexEntry<V, String>> uuidIdxCursor;
 
     /**
      * Used to store indexEntry from uudCandidate so it can be saved after
      * call to evaluate() which changes the value so it's not referring to
-     * the UUID but to the value of the attribute instead.
+     * the String but to the value of the attribute instead.
      */
-    private IndexEntry<V, UUID> uuidCandidate;
+    private IndexEntry<V, String> uuidCandidate;
 
 
     @SuppressWarnings("unchecked")
@@ -80,7 +78,7 @@ public class LessEqCursor<V> extends Abs
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            userIdxCursor = ( ( Index<V, Entry, UUID> ) db.getIndex( attributeType ) ).forwardCursor();
+            userIdxCursor = ( ( Index<V, Entry, String> ) db.getIndex( attributeType ) ).forwardCursor();
             uuidIdxCursor = null;
         }
         else
@@ -103,7 +101,7 @@ public class LessEqCursor<V> extends Abs
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<V, UUID> element ) throws Exception
+    public void before( IndexEntry<V, String> element ) throws Exception
     {
         checkNotClosed( "before()" );
 
@@ -151,7 +149,7 @@ public class LessEqCursor<V> extends Abs
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<V, UUID> element ) throws Exception
+    public void after( IndexEntry<V, String> element ) throws Exception
     {
         checkNotClosed( "after()" );
 
@@ -210,7 +208,7 @@ public class LessEqCursor<V> extends Abs
         checkNotClosed( "afterLast()" );
         if ( userIdxCursor != null )
         {
-            IndexEntry<V, UUID> advanceTo = new ForwardIndexEntry<V, UUID>();
+            IndexEntry<V, String> advanceTo = new ForwardIndexEntry<V, String>();
             //noinspection unchecked
             advanceTo.setKey( lessEqEvaluator.getExpression().getValue().getValue() );
             userIdxCursor.after( advanceTo );
@@ -286,7 +284,7 @@ public class LessEqCursor<V> extends Abs
             while ( userIdxCursor.next() )
             {
                 checkNotClosed( "next()" );
-                IndexEntry<?, UUID> candidate = userIdxCursor.get();
+                IndexEntry<?, String> candidate = userIdxCursor.get();
 
                 if ( lessEqEvaluator.getComparator().compare( candidate.getKey(),
                     lessEqEvaluator.getExpression().getValue().getValue() ) <= 0 )
@@ -317,7 +315,7 @@ public class LessEqCursor<V> extends Abs
     }
 
 
-    public IndexEntry<V, UUID> get() throws Exception
+    public IndexEntry<V, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -46,7 +44,7 @@ public class NotCursor<V> extends Abstra
     private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
 
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_718 );
-    private final Cursor<IndexEntry<V, UUID>> uuidCursor;
+    private final Cursor<IndexEntry<V, String>> uuidCursor;
     private final Evaluator<? extends ExprNode> childEvaluator;
 
 
@@ -106,7 +104,7 @@ public class NotCursor<V> extends Abstra
         while ( uuidCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, UUID> candidate = uuidCursor.get();
+            IndexEntry<?, String> candidate = uuidCursor.get();
 
             if ( !childEvaluator.evaluate( candidate ) )
             {
@@ -123,7 +121,7 @@ public class NotCursor<V> extends Abstra
         while ( uuidCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, UUID> candidate = uuidCursor.get();
+            IndexEntry<?, String> candidate = uuidCursor.get();
 
             if ( !childEvaluator.evaluate( candidate ) )
             {
@@ -135,7 +133,7 @@ public class NotCursor<V> extends Abstra
     }
 
 
-    public IndexEntry<V, UUID> get() throws Exception
+    public IndexEntry<V, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OneLevelScopeCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OneLevelScopeCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OneLevelScopeCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
@@ -43,7 +41,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class OneLevelScopeCursor extends AbstractIndexCursor<UUID>
+public class OneLevelScopeCursor extends AbstractIndexCursor<String>
 {
     /** A dedicated log for cursors */
     private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -59,13 +57,13 @@ public class OneLevelScopeCursor extends
     private final OneLevelScopeEvaluator evaluator;
 
     /** A Cursor over the entries in the scope of the search base */
-    private final Cursor<IndexEntry<UUID, UUID>> scopeCursor;
+    private final Cursor<IndexEntry<String, String>> scopeCursor;
 
     /** A Cursor over entries brought into scope by alias dereferencing */
-    private final Cursor<IndexEntry<UUID, UUID>> dereferencedCursor;
+    private final Cursor<IndexEntry<String, String>> dereferencedCursor;
 
     /** Currently active Cursor: we switch between two cursors */
-    private Cursor<IndexEntry<UUID, UUID>> cursor;
+    private Cursor<IndexEntry<String, String>> cursor;
 
 
     /**
@@ -85,9 +83,9 @@ public class OneLevelScopeCursor extends
 
         // We use the RdnIndex to get all the entries from a starting point
         // and below up to the number of children
-        Cursor<IndexEntry<ParentIdAndRdn, UUID>> cursor = db.getRdnIndex().forwardCursor();
+        Cursor<IndexEntry<ParentIdAndRdn, String>> cursor = db.getRdnIndex().forwardCursor();
 
-        IndexEntry<ParentIdAndRdn, UUID> startingPos = new ForwardIndexEntry<ParentIdAndRdn, UUID>();
+        IndexEntry<ParentIdAndRdn, String> startingPos = new ForwardIndexEntry<ParentIdAndRdn, String>();
         startingPos.setKey( new ParentIdAndRdn( evaluator.getBaseId(), ( Rdn[] ) null ) );
         cursor.before( startingPos );
 
@@ -286,7 +284,7 @@ public class OneLevelScopeCursor extends
     }
 
 
-    public IndexEntry<UUID, UUID> get() throws Exception
+    public IndexEntry<String, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java Wed Aug 29 17:13:56 2012
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
@@ -48,14 +47,14 @@ public class OrCursor<V> extends Abstrac
     private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
 
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_722 );
-    private final List<Cursor<IndexEntry<V, UUID>>> cursors;
+    private final List<Cursor<IndexEntry<V, String>>> cursors;
     private final List<Evaluator<? extends ExprNode>> evaluators;
-    private final List<Set<UUID>> blacklists;
+    private final List<Set<String>> blacklists;
     private int cursorIndex = -1;
 
 
     // TODO - do same evaluator fail fast optimization that we do in AndCursor
-    public OrCursor( List<Cursor<IndexEntry<V, UUID>>> cursors,
+    public OrCursor( List<Cursor<IndexEntry<V, String>>> cursors,
         List<Evaluator<? extends ExprNode>> evaluators )
     {
         LOG_CURSOR.debug( "Creating OrCursor {}", this );
@@ -67,11 +66,11 @@ public class OrCursor<V> extends Abstrac
 
         this.cursors = cursors;
         this.evaluators = evaluators;
-        this.blacklists = new ArrayList<Set<UUID>>();
+        this.blacklists = new ArrayList<Set<String>>();
 
         for ( int i = 0; i < cursors.size(); i++ )
         {
-            this.blacklists.add( new HashSet<UUID>() );
+            this.blacklists.add( new HashSet<String>() );
         }
 
         this.cursorIndex = 0;
@@ -121,7 +120,7 @@ public class OrCursor<V> extends Abstrac
     }
 
 
-    private boolean isBlackListed( UUID id )
+    private boolean isBlackListed( String id )
     {
         return blacklists.get( cursorIndex ).contains( id );
     }
@@ -134,7 +133,7 @@ public class OrCursor<V> extends Abstrac
      * @param indexEntry the index entry to blacklist
      * @throws Exception if there are problems accessing underlying db
      */
-    private void blackListIfDuplicate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    private void blackListIfDuplicate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         for ( int ii = 0; ii < evaluators.size(); ii++ )
         {
@@ -156,7 +155,7 @@ public class OrCursor<V> extends Abstrac
         while ( cursors.get( cursorIndex ).previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, UUID> candidate = cursors.get( cursorIndex ).get();
+            IndexEntry<?, String> candidate = cursors.get( cursorIndex ).get();
 
             if ( !isBlackListed( candidate.getId() ) )
             {
@@ -175,7 +174,7 @@ public class OrCursor<V> extends Abstrac
             while ( cursors.get( cursorIndex ).previous() )
             {
                 checkNotClosed( "previous()" );
-                IndexEntry<?, UUID> candidate = cursors.get( cursorIndex ).get();
+                IndexEntry<?, String> candidate = cursors.get( cursorIndex ).get();
 
                 if ( !isBlackListed( candidate.getId() ) )
                 {
@@ -195,7 +194,7 @@ public class OrCursor<V> extends Abstrac
         while ( cursors.get( cursorIndex ).next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<?, UUID> candidate = cursors.get( cursorIndex ).get();
+            IndexEntry<?, String> candidate = cursors.get( cursorIndex ).get();
 
             if ( !isBlackListed( candidate.getId() ) )
             {
@@ -214,7 +213,7 @@ public class OrCursor<V> extends Abstrac
             while ( cursors.get( cursorIndex ).next() )
             {
                 checkNotClosed( "previous()" );
-                IndexEntry<?, UUID> candidate = cursors.get( cursorIndex ).get();
+                IndexEntry<?, String> candidate = cursors.get( cursorIndex ).get();
                 if ( !isBlackListed( candidate.getId() ) )
                 {
                     blackListIfDuplicate( candidate );
@@ -228,7 +227,7 @@ public class OrCursor<V> extends Abstrac
     }
 
 
-    public IndexEntry<V, UUID> get() throws Exception
+    public IndexEntry<V, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/PresenceCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/PresenceCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/PresenceCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/PresenceCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -46,12 +44,12 @@ public class PresenceCursor extends Abst
     private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
 
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_724 );
-    private final Cursor<IndexEntry<String, UUID>> uuidCursor;
-    private final Cursor<IndexEntry<String, UUID>> presenceCursor;
+    private final Cursor<IndexEntry<String, String>> uuidCursor;
+    private final Cursor<IndexEntry<String, String>> presenceCursor;
     private final PresenceEvaluator presenceEvaluator;
 
     /** The prefetched entry, if it's a valid one */
-    private IndexEntry<String, UUID> prefetched;
+    private IndexEntry<String, String> prefetched;
 
 
     public PresenceCursor( Store<Entry> store, PresenceEvaluator presenceEvaluator ) throws Exception
@@ -99,7 +97,7 @@ public class PresenceCursor extends Abst
     /**
      * {@inheritDoc}
      */
-    public void before( IndexEntry<String, UUID> element ) throws Exception
+    public void before( IndexEntry<String, String> element ) throws Exception
     {
         checkNotClosed( "before()" );
 
@@ -117,7 +115,7 @@ public class PresenceCursor extends Abst
     /**
      * {@inheritDoc}
      */
-    public void after( IndexEntry<String, UUID> element ) throws Exception
+    public void after( IndexEntry<String, String> element ) throws Exception
     {
         checkNotClosed( "after()" );
 
@@ -203,7 +201,7 @@ public class PresenceCursor extends Abst
         while ( uuidCursor.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<?, UUID> candidate = uuidCursor.get();
+            IndexEntry<?, String> candidate = uuidCursor.get();
 
             if ( presenceEvaluator.evaluate( candidate ) )
             {
@@ -227,7 +225,7 @@ public class PresenceCursor extends Abst
         while ( uuidCursor.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<String, UUID> candidate = uuidCursor.get();
+            IndexEntry<String, String> candidate = uuidCursor.get();
 
             if ( presenceEvaluator.evaluate( candidate ) )
             {
@@ -241,7 +239,7 @@ public class PresenceCursor extends Abst
     }
 
 
-    public IndexEntry<String, UUID> get() throws Exception
+    public IndexEntry<String, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
@@ -48,9 +46,9 @@ public class SubstringCursor extends Abs
 
     private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_725 );
     private final boolean hasIndex;
-    private final Cursor<IndexEntry<String, UUID>> wrapped;
+    private final Cursor<IndexEntry<String, String>> wrapped;
     private final SubstringEvaluator evaluator;
-    private final ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+    private final ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
 
 
     @SuppressWarnings("unchecked")
@@ -63,7 +61,7 @@ public class SubstringCursor extends Abs
 
         if ( hasIndex )
         {
-            wrapped = ( ( Index<String, Entry, UUID> ) store.getIndex( evaluator.getExpression().getAttributeType() ) )
+            wrapped = ( ( Index<String, Entry, String> ) store.getIndex( evaluator.getExpression().getAttributeType() ) )
                 .forwardCursor();
         }
         else
@@ -98,7 +96,7 @@ public class SubstringCursor extends Abs
         checkNotClosed( "beforeFirst()" );
         if ( evaluator.getExpression().getInitial() != null && hasIndex )
         {
-            ForwardIndexEntry<String, UUID> indexEntry = new ForwardIndexEntry<String, UUID>();
+            ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
             indexEntry.setKey( evaluator.getExpression().getInitial() );
             wrapped.before( indexEntry );
         }
@@ -139,7 +137,7 @@ public class SubstringCursor extends Abs
     }
 
 
-    private boolean evaluateCandidate( IndexEntry<String, UUID> indexEntry ) throws Exception
+    private boolean evaluateCandidate( IndexEntry<String, String> indexEntry ) throws Exception
     {
         if ( hasIndex )
         {
@@ -165,7 +163,7 @@ public class SubstringCursor extends Abs
         while ( wrapped.previous() )
         {
             checkNotClosed( "previous()" );
-            IndexEntry<String, UUID> entry = wrapped.get();
+            IndexEntry<String, String> entry = wrapped.get();
 
             if ( evaluateCandidate( entry ) )
             {
@@ -187,7 +185,7 @@ public class SubstringCursor extends Abs
         while ( wrapped.next() )
         {
             checkNotClosed( "next()" );
-            IndexEntry<String, UUID> entry = wrapped.get();
+            IndexEntry<String, String> entry = wrapped.get();
 
             if ( evaluateCandidate( entry ) )
             {
@@ -205,7 +203,7 @@ public class SubstringCursor extends Abs
     }
 
 
-    public IndexEntry<String, UUID> get() throws Exception
+    public IndexEntry<String, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubtreeScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubtreeScopeCursor.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubtreeScopeCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubtreeScopeCursor.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.cursor;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
@@ -44,7 +42,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SubtreeScopeCursor extends AbstractIndexCursor<UUID>
+public class SubtreeScopeCursor extends AbstractIndexCursor<String>
 {
     /** A dedicated log for cursors */
     private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -58,15 +56,15 @@ public class SubtreeScopeCursor extends 
     private final SubtreeScopeEvaluator<Entry> evaluator;
 
     /** A Cursor over the entries in the scope of the search base */
-    private final Cursor<IndexEntry<UUID, UUID>> scopeCursor;
+    private final Cursor<IndexEntry<String, String>> scopeCursor;
 
     /** A Cursor over entries brought into scope by alias dereferencing */
-    private final Cursor<IndexEntry<UUID, UUID>> dereferencedCursor;
+    private final Cursor<IndexEntry<String, String>> dereferencedCursor;
 
     /** Currently active Cursor: we switch between two cursors */
-    private Cursor<IndexEntry<UUID, UUID>> cursor;
+    private Cursor<IndexEntry<String, String>> cursor;
 
-    private UUID contextEntryId;
+    private String contextEntryId;
 
 
     /**
@@ -91,16 +89,16 @@ public class SubtreeScopeCursor extends 
         {
             // We use the RdnIndex to get all the entries from a starting point
             // and below up to the number of children
-            UUID baseId = evaluator.getBaseId();
+            String baseId = evaluator.getBaseId();
             ParentIdAndRdn parentIdAndRdn = db.getRdnIndex().reverseLookup( baseId );
             IndexEntry indexEntry = new ForwardIndexEntry();
 
             indexEntry.setId( baseId );
             indexEntry.setKey( parentIdAndRdn );
 
-            Cursor<IndexEntry<ParentIdAndRdn, UUID>> cursor = new SingletonIndexCursor<ParentIdAndRdn>(
+            Cursor<IndexEntry<ParentIdAndRdn, String>> cursor = new SingletonIndexCursor<ParentIdAndRdn>(
                 indexEntry );
-            UUID parentId = parentIdAndRdn.getParentId();
+            String parentId = parentIdAndRdn.getParentId();
 
             scopeCursor = new DescendantCursor( db, baseId, parentId, cursor );
         }
@@ -126,7 +124,7 @@ public class SubtreeScopeCursor extends 
 
 
     // This will suppress PMD.EmptyCatchBlock warnings in this method
-    private UUID getContextEntryId() throws Exception
+    private String getContextEntryId() throws Exception
     {
         if ( contextEntryId == null )
         {
@@ -324,7 +322,7 @@ public class SubtreeScopeCursor extends 
     }
 
 
-    public IndexEntry<UUID, UUID> get() throws Exception
+    public IndexEntry<String, String> get() throws Exception
     {
         checkNotClosed( "get()" );
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/AndEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/AndEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/AndEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/AndEvaluator.java Wed Aug 29 17:13:56 2012
@@ -23,7 +23,6 @@ package org.apache.directory.server.xdbm
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.UUID;
 
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.search.Evaluator;
@@ -103,7 +102,7 @@ public class AndEvaluator implements Eva
     /**
      * {@inheritDoc}
      */
-    public boolean evaluate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         for ( Evaluator<?> evaluator : evaluators )
         {

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java Wed Aug 29 17:13:56 2012
@@ -21,7 +21,6 @@ package org.apache.directory.server.xdbm
 
 
 import java.util.Iterator;
-import java.util.UUID;
 
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
@@ -58,7 +57,7 @@ public class ApproximateEvaluator<T> ext
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            idx = ( Index<T, Entry, UUID> ) db.getIndex( attributeType );
+            idx = ( Index<T, Entry, String> ) db.getIndex( attributeType );
             normalizer = null;
             ldapComparator = null;
         }
@@ -133,7 +132,7 @@ public class ApproximateEvaluator<T> ext
     /**
      * {@inheritDoc}
      */
-    public boolean evaluate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         Entry entry = indexEntry.getEntry();
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java Wed Aug 29 17:13:56 2012
@@ -22,7 +22,6 @@ package org.apache.directory.server.xdbm
 
 import java.util.Comparator;
 import java.util.Iterator;
-import java.util.UUID;
 
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -63,7 +62,7 @@ public class EqualityEvaluator<T> extend
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            idx = ( Index<T, Entry, UUID> ) db.getIndex( attributeType );
+            idx = ( Index<T, Entry, String> ) db.getIndex( attributeType );
             normalizer = null;
             ldapComparator = null;
         }
@@ -93,7 +92,7 @@ public class EqualityEvaluator<T> extend
     }
 
 
-    public boolean evaluate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         Entry entry = indexEntry.getEntry();
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java Wed Aug 29 17:13:56 2012
@@ -21,7 +21,6 @@ package org.apache.directory.server.xdbm
 
 
 import java.util.Iterator;
-import java.util.UUID;
 
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
@@ -52,7 +51,7 @@ public class GreaterEqEvaluator<T> exten
 
         if ( db.hasIndexOn( node.getAttributeType() ) )
         {
-            idx = ( Index<T, Entry, UUID> ) db.getIndex( attributeType );
+            idx = ( Index<T, Entry, String> ) db.getIndex( attributeType );
         }
         else
         {
@@ -88,7 +87,7 @@ public class GreaterEqEvaluator<T> exten
     }
 
 
-    public boolean evaluate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         if ( idx != null && idx.isDupsEnabled() )
         {
@@ -117,7 +116,7 @@ public class GreaterEqEvaluator<T> exten
 
         // if the attribute exists and has a greater than or equal value return true
         //noinspection unchecked
-        if ( attr != null && evaluate( ( IndexEntry<Object, UUID> ) indexEntry, attr ) )
+        if ( attr != null && evaluate( ( IndexEntry<Object, String> ) indexEntry, attr ) )
         {
             return true;
         }
@@ -139,7 +138,7 @@ public class GreaterEqEvaluator<T> exten
                 attr = entry.get( descendant );
 
                 //noinspection unchecked
-                if ( attr != null && evaluate( ( IndexEntry<Object, UUID> ) indexEntry, attr ) )
+                if ( attr != null && evaluate( ( IndexEntry<Object, String> ) indexEntry, attr ) )
                 {
                     return true;
                 }
@@ -192,7 +191,7 @@ public class GreaterEqEvaluator<T> exten
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value 
-    private boolean evaluate( IndexEntry<Object, UUID> indexEntry, Attribute attribute )
+    private boolean evaluate( IndexEntry<Object, String> indexEntry, Attribute attribute )
         throws Exception
     {
         /*

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LeafEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LeafEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LeafEvaluator.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.evaluator;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
@@ -61,7 +59,7 @@ public abstract class LeafEvaluator<T> i
     protected LdapComparator<? super Object> ldapComparator;
 
     /** The index to use if any */
-    protected Index<T, Entry, UUID> idx;
+    protected Index<T, Entry, String> idx;
 
 
     @SuppressWarnings("unchecked")

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java Wed Aug 29 17:13:56 2012
@@ -21,7 +21,6 @@ package org.apache.directory.server.xdbm
 
 
 import java.util.Iterator;
-import java.util.UUID;
 
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
@@ -52,7 +51,7 @@ public class LessEqEvaluator<T> extends 
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            idx = ( Index<T, Entry, UUID> ) db.getIndex( attributeType );
+            idx = ( Index<T, Entry, String> ) db.getIndex( attributeType );
         }
         else
         {
@@ -88,7 +87,7 @@ public class LessEqEvaluator<T> extends 
     }
 
 
-    public boolean evaluate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         Entry entry = indexEntry.getEntry();
 
@@ -109,7 +108,7 @@ public class LessEqEvaluator<T> extends 
 
         // if the attribute does not exist just return false
         //noinspection unchecked
-        if ( attr != null && evaluate( ( IndexEntry<Object, UUID> ) indexEntry, attr ) )
+        if ( attr != null && evaluate( ( IndexEntry<Object, String> ) indexEntry, attr ) )
         {
             return true;
         }
@@ -131,7 +130,7 @@ public class LessEqEvaluator<T> extends 
                 attr = entry.get( descendant );
 
                 //noinspection unchecked
-                if ( attr != null && evaluate( ( IndexEntry<Object, UUID> ) indexEntry, attr ) )
+                if ( attr != null && evaluate( ( IndexEntry<Object, String> ) indexEntry, attr ) )
                 {
                     return true;
                 }
@@ -184,7 +183,7 @@ public class LessEqEvaluator<T> extends 
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluate( IndexEntry<Object, UUID> indexEntry, Attribute attribute )
+    private boolean evaluate( IndexEntry<Object, String> indexEntry, Attribute attribute )
         throws Exception
     {
         /*

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/NotEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/NotEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/NotEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/NotEvaluator.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.evaluator;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -56,7 +54,7 @@ public class NotEvaluator implements Eva
     }
 
 
-    public boolean evaluate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         return !childEvaluator.evaluate( indexEntry );
     }

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.evaluator;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.ParentIdAndRdn;
@@ -37,13 +35,13 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class OneLevelScopeEvaluator<E> implements Evaluator<ScopeNode<UUID>>
+public class OneLevelScopeEvaluator<E> implements Evaluator<ScopeNode<String>>
 {
     /** The ScopeNode containing initial search scope constraints */
-    private final ScopeNode<UUID> node;
+    private final ScopeNode<String> node;
 
     /** The entry identifier of the scope base */
-    private final UUID baseId;
+    private final String baseId;
 
     /** True if the scope requires alias dereferencing while searching */
     private final boolean dereferencing;
@@ -59,7 +57,7 @@ public class OneLevelScopeEvaluator<E> i
      * @param db the database used to evaluate scope node
      * @throws Exception on db access failure
      */
-    public OneLevelScopeEvaluator( Store<E> db, ScopeNode<UUID> node ) throws Exception
+    public OneLevelScopeEvaluator( Store<E> db, ScopeNode<String> node ) throws Exception
     {
         this.node = node;
 
@@ -98,7 +96,7 @@ public class OneLevelScopeEvaluator<E> i
      * @throws Exception if db lookups fail
      * @see org.apache.directory.server.xdbm.search.Evaluator#evaluate(IndexEntry)
      */
-    public boolean evaluate( IndexEntry<?, UUID> candidate ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> candidate ) throws Exception
     {
         ParentIdAndRdn parent = db.getRdnIndex().reverseLookup( candidate.getId() );
         boolean isChild = parent.getParentId().equals( baseId );
@@ -146,7 +144,7 @@ public class OneLevelScopeEvaluator<E> i
     }
 
 
-    public ScopeNode<UUID> getExpression()
+    public ScopeNode<String> getExpression()
     {
         return node;
     }
@@ -157,7 +155,7 @@ public class OneLevelScopeEvaluator<E> i
      *
      * @return identifier of the search base
      */
-    public UUID getBaseId()
+    public String getBaseId()
     {
         return baseId;
     }

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OrEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OrEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OrEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OrEvaluator.java Wed Aug 29 17:13:56 2012
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.UUID;
 
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.search.Evaluator;
@@ -103,7 +102,7 @@ public class OrEvaluator implements Eval
     }
 
 
-    public boolean evaluate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         for ( Evaluator<?> evaluator : evaluators )
         {

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java Wed Aug 29 17:13:56 2012
@@ -21,7 +21,6 @@ package org.apache.directory.server.xdbm
 
 
 import java.util.Iterator;
-import java.util.UUID;
 
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -55,7 +54,7 @@ public class PresenceEvaluator implement
     private final SchemaManager schemaManager;
 
     /** The index to use if any */
-    private final Index<String, Entry, UUID> idx;
+    private final Index<String, Entry, String> idx;
 
 
     public PresenceEvaluator( PresenceNode node, Store<Entry> db, SchemaManager schemaManager )
@@ -91,7 +90,7 @@ public class PresenceEvaluator implement
 
     // TODO - determine if comparator and index entry should have the Value
     // wrapper or the raw normalized value
-    public boolean evaluate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         Entry entry = indexEntry.getEntry();
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubstringEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubstringEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubstringEvaluator.java Wed Aug 29 17:13:56 2012
@@ -21,7 +21,6 @@ package org.apache.directory.server.xdbm
 
 
 import java.util.Iterator;
-import java.util.UUID;
 import java.util.regex.Pattern;
 
 import org.apache.directory.server.xdbm.Index;
@@ -66,7 +65,7 @@ public class SubstringEvaluator implemen
     private final Normalizer normalizer;
 
     /** The index to use if any */
-    private final Index<String, Entry, UUID> idx;
+    private final Index<String, Entry, String> idx;
 
 
     /**
@@ -115,7 +114,7 @@ public class SubstringEvaluator implemen
 
         if ( db.hasIndexOn( attributeType ) )
         {
-            idx = ( Index<String, Entry, UUID> ) db.getIndex( attributeType );
+            idx = ( Index<String, Entry, String> ) db.getIndex( attributeType );
         }
         else
         {
@@ -125,11 +124,11 @@ public class SubstringEvaluator implemen
 
 
     @SuppressWarnings("unchecked")
-    public boolean evaluate( IndexEntry<?, UUID> indexEntry ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> indexEntry ) throws Exception
     {
         if ( ( idx == null ) || ( !idx.hasReverse() ) )
         {
-            return evaluateWithoutIndex( ( IndexEntry<String, UUID> ) indexEntry );
+            return evaluateWithoutIndex( ( IndexEntry<String, String> ) indexEntry );
         }
         else
         {
@@ -156,7 +155,7 @@ public class SubstringEvaluator implemen
     }
 
 
-    private boolean evaluateWithIndex( IndexEntry<?, UUID> indexEntry ) throws Exception
+    private boolean evaluateWithIndex( IndexEntry<?, String> indexEntry ) throws Exception
     {
         /*
          * Note that this is using the reverse half of the index giving a
@@ -164,12 +163,12 @@ public class SubstringEvaluator implemen
          * Otherwise we would have to scan the entire index if there were
          * no reverse lookups.
          */
-        Cursor<IndexEntry<String, UUID>> entries = idx.reverseCursor( indexEntry.getId() );
+        Cursor<IndexEntry<String, String>> entries = idx.reverseCursor( indexEntry.getId() );
 
         // cycle through the attribute values testing for a match
         while ( entries.next() )
         {
-            IndexEntry<String, UUID> rec = entries.get();
+            IndexEntry<String, String> rec = entries.get();
 
             // once match is found cleanup and return true
             if ( regex.matcher( rec.getKey() ).matches() )
@@ -262,7 +261,7 @@ public class SubstringEvaluator implemen
 
     // TODO - determine if comaparator and index entry should have the Value
     // wrapper or the raw normalized value
-    private boolean evaluateWithoutIndex( IndexEntry<String, UUID> indexEntry ) throws Exception
+    private boolean evaluateWithoutIndex( IndexEntry<String, String> indexEntry ) throws Exception
     {
         Entry entry = indexEntry.getEntry();
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.evaluator;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.IndexEntry;
@@ -39,13 +37,13 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SubtreeScopeEvaluator<E> implements Evaluator<ScopeNode<UUID>>
+public class SubtreeScopeEvaluator<E> implements Evaluator<ScopeNode<String>>
 {
     /** The ScopeNode containing initial search scope constraints */
-    private final ScopeNode<UUID> node;
+    private final ScopeNode<String> node;
 
     /** The entry identifier of the scope base */
-    private final UUID baseId;
+    private final String baseId;
 
     /** 
      * Whether or not to accept all candidates.  If this evaluator's baseId is
@@ -73,7 +71,7 @@ public class SubtreeScopeEvaluator<E> im
      * @param db the database used to evaluate scope node
      * @throws Exception on db access failure
      */
-    public SubtreeScopeEvaluator( Store<E> db, ScopeNode<UUID> node ) throws Exception
+    public SubtreeScopeEvaluator( Store<E> db, ScopeNode<String> node ) throws Exception
     {
         this.db = db;
         this.node = node;
@@ -88,12 +86,12 @@ public class SubtreeScopeEvaluator<E> im
         dereferencing = node.getDerefAliases().isDerefInSearching() || node.getDerefAliases().isDerefAlways();
     }
 
-    private UUID contextEntryId;
+    private String contextEntryId;
 
 
     // This will suppress PMD.EmptyCatchBlock warnings in this method
     @SuppressWarnings("PMD.EmptyCatchBlock")
-    private UUID getContextEntryId() throws Exception
+    private String getContextEntryId() throws Exception
     {
         if ( contextEntryId == null )
         {
@@ -121,9 +119,9 @@ public class SubtreeScopeEvaluator<E> im
      * the parentIdAndRdn up to the baseId. If we terminate on the context entry without 
      * having found the baseId, then the candidate is not a descendant.
      */
-    private boolean isDescendant( UUID candidateId ) throws Exception
+    private boolean isDescendant( String candidateId ) throws Exception
     {
-        UUID tmp = candidateId;
+        String tmp = candidateId;
 
         while ( true )
         {
@@ -159,9 +157,9 @@ public class SubtreeScopeEvaluator<E> im
      * @throws Exception if the index lookups fail.
      * @see Evaluator#evaluate(org.apache.directory.server.xdbm.IndexEntry)
      */
-    public boolean evaluate( IndexEntry<?, UUID> candidate ) throws Exception
+    public boolean evaluate( IndexEntry<?, String> candidate ) throws Exception
     {
-        UUID id = candidate.getId();
+        String id = candidate.getId();
 
         /*
          * This condition catches situations where the candidate is equal to 
@@ -234,13 +232,13 @@ public class SubtreeScopeEvaluator<E> im
     }
 
 
-    public ScopeNode<UUID> getExpression()
+    public ScopeNode<String> getExpression()
     {
         return node;
     }
 
 
-    public UUID getBaseId()
+    public String getBaseId()
     {
         return baseId;
     }

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java Wed Aug 29 17:13:56 2012
@@ -77,7 +77,7 @@ public class CursorBuilder
     }
 
 
-    public <T> Cursor<IndexEntry<?, UUID>> build( ExprNode node ) throws Exception
+    public <T> Cursor<IndexEntry<?, String>> build( ExprNode node ) throws Exception
     {
         switch ( node.getAssertionType() )
         {
@@ -135,7 +135,7 @@ public class CursorBuilder
                 return buildAndCursor( ( AndNode ) node );
 
             case NOT:
-                return ( Cursor ) new NotCursor<UUID>( db, evaluatorBuilder.build( ( ( NotNode ) node )
+                return ( Cursor ) new NotCursor<String>( db, evaluatorBuilder.build( ( ( NotNode ) node )
                     .getFirstChild() ) );
 
             case OR:
@@ -160,10 +160,10 @@ public class CursorBuilder
      * @return Cursor over candidates satisfying disjunction expression
      * @throws Exception on db access failures
      */
-    private Cursor<IndexEntry<?, UUID>> buildOrCursor( OrNode node ) throws Exception
+    private Cursor<IndexEntry<?, String>> buildOrCursor( OrNode node ) throws Exception
     {
         List<ExprNode> children = node.getChildren();
-        List<Cursor<IndexEntry<?, UUID>>> childCursors = new ArrayList<Cursor<IndexEntry<?, UUID>>>(
+        List<Cursor<IndexEntry<?, String>>> childCursors = new ArrayList<Cursor<IndexEntry<?, String>>>(
             children.size() );
         List<Evaluator<? extends ExprNode>> childEvaluators = new ArrayList<Evaluator<? extends ExprNode>>(
             children.size() );
@@ -186,7 +186,7 @@ public class CursorBuilder
      * @return Cursor over the conjunction expression
      * @throws Exception on db access failures
      */
-    private Cursor<IndexEntry<?, UUID>> buildAndCursor( AndNode node ) throws Exception
+    private Cursor<IndexEntry<?, String>> buildAndCursor( AndNode node ) throws Exception
     {
         int minIndex = 0;
         long minValue = Long.MAX_VALUE;
@@ -234,7 +234,7 @@ public class CursorBuilder
         }
 
         // Do recursive call to build min child Cursor then create AndCursor
-        Cursor<IndexEntry<?, UUID>> childCursor = build( minChild );
+        Cursor<IndexEntry<?, String>> childCursor = build( minChild );
 
         return new AndCursor( childCursor, childEvaluators );
     }

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java Wed Aug 29 17:13:56 2012
@@ -21,7 +21,6 @@ package org.apache.directory.server.xdbm
 
 
 import java.util.List;
-import java.util.UUID;
 
 import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.i18n.I18n;
@@ -55,7 +54,7 @@ public class DefaultOptimizer<E> impleme
 {
     /** the database this optimizer operates on */
     private final Store<E> db;
-    private UUID contextEntryId;
+    private String contextEntryId;
 
 
     /**
@@ -71,7 +70,7 @@ public class DefaultOptimizer<E> impleme
 
     // This will suppress PMD.EmptyCatchBlock warnings in this method
     @SuppressWarnings("PMD.EmptyCatchBlock")
-    private UUID getContextEntryId() throws Exception
+    private String getContextEntryId() throws Exception
     {
         if ( contextEntryId == null )
         {
@@ -123,7 +122,7 @@ public class DefaultOptimizer<E> impleme
 
         if ( node instanceof ScopeNode )
         {
-            count = getScopeScan( ( ScopeNode<UUID> ) node );
+            count = getScopeScan( ( ScopeNode<String> ) node );
         }
         else if ( node instanceof AssertionNode )
         {
@@ -279,7 +278,7 @@ public class DefaultOptimizer<E> impleme
     {
         if ( db.hasIndexOn( node.getAttributeType() ) )
         {
-            Index<V, E, UUID> idx = ( Index<V, E, UUID> ) db.getIndex( node.getAttributeType() );
+            Index<V, E, String> idx = ( Index<V, E, String> ) db.getIndex( node.getAttributeType() );
 
             return idx.count( node.getValue().getValue() );
         }
@@ -303,7 +302,7 @@ public class DefaultOptimizer<E> impleme
     {
         if ( db.hasIndexOn( node.getAttributeType() ) )
         {
-            Index<V, E, UUID> idx = ( Index<V, E, UUID> ) db.getIndex( node.getAttributeType() );
+            Index<V, E, String> idx = ( Index<V, E, String> ) db.getIndex( node.getAttributeType() );
             if ( isGreaterThan )
             {
                 return idx.greaterThanCount( node.getValue().getValue() );
@@ -352,7 +351,7 @@ public class DefaultOptimizer<E> impleme
     {
         if ( db.hasUserIndexOn( node.getAttributeType() ) )
         {
-            Index<String, E, UUID> idx = db.getPresenceIndex();
+            Index<String, E, String> idx = db.getPresenceIndex();
             return idx.count( node.getAttributeType().getOid() );
         }
         else if ( db.hasSystemIndexOn( node.getAttributeType() ) )
@@ -373,9 +372,9 @@ public class DefaultOptimizer<E> impleme
      * @return the scan count for scope
      * @throws Exception if any errors result
      */
-    private long getScopeScan( ScopeNode<UUID> node ) throws Exception
+    private long getScopeScan( ScopeNode<String> node ) throws Exception
     {
-        UUID id = node.getBaseId();
+        String id = node.getBaseId();
 
         switch ( node.getScope() )
         {

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java Wed Aug 29 17:13:56 2012
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search.impl;
 
 
-import java.util.UUID;
-
 import org.apache.directory.server.core.api.partition.Partition;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.EmptyIndexCursor;
@@ -101,11 +99,11 @@ public class DefaultSearchEngine impleme
     /**
      * {@inheritDoc}
      */
-    public Cursor<IndexEntry<UUID, UUID>> cursor( Dn base, AliasDerefMode aliasDerefMode, ExprNode filter,
+    public Cursor<IndexEntry<String, String>> cursor( Dn base, AliasDerefMode aliasDerefMode, ExprNode filter,
         SearchScope scope ) throws Exception
     {
         Dn effectiveBase;
-        UUID baseId = db.getEntryId( base );
+        String baseId = db.getEntryId( base );
 
         // Check that we have an entry, otherwise we can immediately get out
         if ( baseId == null )
@@ -113,7 +111,7 @@ public class DefaultSearchEngine impleme
             if ( ( ( Partition ) db ).getSuffixDn().equals( base ) )
             {
                 // The context entry is not created yet, return an empty cursor
-                return new EmptyIndexCursor<UUID>();
+                return new EmptyIndexCursor<String>();
             }
             else
             {
@@ -150,7 +148,7 @@ public class DefaultSearchEngine impleme
         // --------------------------------------------------------------------
         // Specifically Handle Object Level Scope
         // --------------------------------------------------------------------
-        UUID effectiveBaseId = baseId;
+        String effectiveBaseId = baseId;
 
         if ( effectiveBase != base )
         {
@@ -159,7 +157,7 @@ public class DefaultSearchEngine impleme
 
         if ( scope == SearchScope.OBJECT )
         {
-            IndexEntry<UUID, UUID> indexEntry = new ForwardIndexEntry<UUID, UUID>();
+            IndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
             indexEntry.setId( effectiveBaseId );
             optimizer.annotate( filter );
             Evaluator<? extends ExprNode> evaluator = evaluatorBuilder.build( filter );
@@ -180,11 +178,11 @@ public class DefaultSearchEngine impleme
 
             if ( evaluator.evaluate( indexEntry ) )
             {
-                return new SingletonIndexCursor<UUID>( indexEntry );
+                return new SingletonIndexCursor<String>( indexEntry );
             }
             else
             {
-                return new EmptyIndexCursor<UUID>();
+                return new EmptyIndexCursor<String>();
             }
         }
 

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java Wed Aug 29 17:13:56 2012
@@ -22,7 +22,6 @@ package org.apache.directory.server.xdbm
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Store;
@@ -103,13 +102,13 @@ public class EvaluatorBuilder
                 return new PresenceEvaluator( ( PresenceNode ) node, db, schemaManager );
 
             case SCOPE:
-                if ( ( ( ScopeNode<UUID> ) node ).getScope() == SearchScope.ONELEVEL )
+                if ( ( ( ScopeNode<String> ) node ).getScope() == SearchScope.ONELEVEL )
                 {
-                    return new OneLevelScopeEvaluator<Entry>( db, ( ScopeNode<UUID> ) node );
+                    return new OneLevelScopeEvaluator<Entry>( db, ( ScopeNode<String> ) node );
                 }
                 else
                 {
-                    return new SubtreeScopeEvaluator<Entry>( db, ( ScopeNode<UUID> ) node );
+                    return new SubtreeScopeEvaluator<Entry>( db, ( ScopeNode<String> ) node );
                 }
 
             case SUBSTRING:

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java?rev=1378653&r1=1378652&r2=1378653&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java Wed Aug 29 17:13:56 2012
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 
 import java.util.Iterator;
-import java.util.UUID;
 
 import org.apache.directory.shared.ldap.model.cursor.CursorClosedException;
 import org.apache.directory.shared.ldap.model.cursor.DefaultClosureMonitor;
@@ -125,7 +124,7 @@ public class AbstractIndexCursorTest
     @Test
     public void testIterator()
     {
-        Iterator<IndexEntry<String, UUID>> iterator = indexCursor.iterator();
+        Iterator<IndexEntry<String, String>> iterator = indexCursor.iterator();
         assertNotNull( iterator );
     }
 



Mime
View raw message