svn commit: r945933 - in /directory/apacheds/branches/xdbm-refactoring: avl-partition/ avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ core-annotati...

[se...@apache.org]

Author: seelmann
Date: Tue May 18 22:28:52 2010
New Revision: 945933

URL: http://svn.apache.org/viewvc?rev=945933&view=rev
Log:
Part for DIRSERVER-1505 (Merge XDBM modules):
o add package org.apache.directory.server.xdbm.impl.avl in xdbm-search
o move AVL store classes and tests from apacheds-avl-partition to xdbm-search
o use AVL store instead of JDBM store for xdbm-search tests
o add dependency core-avl to xdbm-search
o remove dependency jdbm-store from xdbm-search
o remove dependency xdbm-tools from avl-partition

Added:
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
      - copied, changed from r945891, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlIndex.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlRdnIndex.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java
      - copied, changed from r945891, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
      - copied, changed from r945891, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTableDupsCursor.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlRdnIndexTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java
      - copied, changed from r945891, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlTableTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/TableData.java
Removed:
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlIndex.java
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlRdnIndex.java
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTableDupsCursor.java
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlRdnIndexTest.java
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlTableTest.java
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/TableData.java
Modified:
    directory/apacheds/branches/xdbm-refactoring/avl-partition/pom.xml
    directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
    directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
    directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/pom.xml
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java

Modified: directory/apacheds/branches/xdbm-refactoring/avl-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/avl-partition/pom.xml?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/pom.xml (original)
+++ directory/apacheds/branches/xdbm-refactoring/avl-partition/pom.xml Tue May 18 22:28:52 2010
@@ -58,13 +58,6 @@
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
-    
-    <dependency>
-      <artifactId>apacheds-xdbm-tools</artifactId>
-      <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java Tue May 18 22:28:52 2010
@@ -26,6 +26,8 @@ import java.util.Set;
 
 import org.apache.directory.server.xdbm.AbstractXdbmPartition;
 import org.apache.directory.server.xdbm.Index;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.search.impl.CursorBuilder;
 import org.apache.directory.server.xdbm.search.impl.DefaultOptimizer;
 import org.apache.directory.server.xdbm.search.impl.DefaultSearchEngine;
@@ -121,7 +123,7 @@ public class AvlPartition extends Abstra
      */
     public AvlStore<Entry> getStore()
     {
-        return ( AvlStore<Entry> ) store;
+        return (org.apache.directory.server.xdbm.impl.avl.AvlStore<Entry> ) store;
     }
 
 }

Modified: directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java Tue May 18 22:28:52 2010
@@ -23,9 +23,9 @@ import java.io.File;
 import java.util.Set;
 
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.avl.AvlIndex;
 import org.apache.directory.server.core.partition.avl.AvlPartition;
 import org.apache.directory.server.xdbm.Index;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.shared.ldap.entry.Entry;
 
 

Modified: directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java Tue May 18 22:28:52 2010
@@ -23,9 +23,9 @@ import java.io.File;
 import java.util.Set;
 
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.avl.AvlIndex;
 import org.apache.directory.server.core.partition.ldif.LdifPartition;
 import org.apache.directory.server.xdbm.Index;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.shared.ldap.entry.Entry;
 
 

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/pom.xml?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/pom.xml (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/pom.xml Tue May 18 22:28:52 2010
@@ -33,16 +33,15 @@
   
   <dependencies>
     <dependency>
-      <artifactId>apacheds-xdbm-base</artifactId>
+      <artifactId>apacheds-core-avl</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
-    
+
     <dependency>
-      <artifactId>apacheds-jdbm-store</artifactId>
+      <artifactId>apacheds-xdbm-base</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     
     <dependency>

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java (from r945891, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlIndex.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlIndex.java&r1=945891&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlIndex.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java Tue May 18 22:28:52 2010
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
 import java.io.File;

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java (from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java&r1=945840&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java Tue May 18 22:28:52 2010
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
 import java.util.Comparator;

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java (from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlRdnIndex.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlRdnIndex.java&r1=945840&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlRdnIndex.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java Tue May 18 22:28:52 2010
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
 import org.apache.directory.server.core.partition.impl.btree.LongComparator;

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java (from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java&r1=945840&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java Tue May 18 22:28:52 2010
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
 import java.io.File;
@@ -96,7 +96,7 @@ public class AvlStore<E> extends Abstrac
         }
         else if ( index instanceof AvlIndex<?, ?> )
         {
-            avlIndex = ( AvlIndex<?, E> ) index;
+            avlIndex = (org.apache.directory.server.xdbm.impl.avl.AvlIndex<?, E> ) index;
         }
         else
         {

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java (from r945891, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java&r1=945891&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java Tue May 18 22:28:52 2010
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
 import java.util.Comparator;

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java (from r945891, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTableDupsCursor.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTableDupsCursor.java&r1=945891&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTableDupsCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java Tue May 18 22:28:52 2010
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
 import org.apache.directory.server.core.avltree.AvlSingletonOrOrderedSetCursor;

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java (from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlRdnIndexTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlRdnIndexTest.java&r1=945840&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlRdnIndexTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java Tue May 18 22:28:52 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
 import static org.junit.Assert.assertEquals;
@@ -33,6 +33,7 @@ import org.apache.directory.server.const
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.ParentIdAndRdn;
+import org.apache.directory.server.xdbm.impl.avl.AvlRdnIndex;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java (from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java&r1=945840&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java Tue May 18 22:28:52 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
 import static org.junit.Assert.assertEquals;
@@ -41,6 +41,9 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.IndexNotFoundException;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlRdnIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java (from r945891, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlTableTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlTableTest.java&r1=945891&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlTableTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java Tue May 18 22:28:52 2010
@@ -17,11 +17,11 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
-import static org.apache.directory.server.core.partition.avl.TableData.injectDupsData;
-import static org.apache.directory.server.core.partition.avl.TableData.injectNoDupsData;
+import static org.apache.directory.server.xdbm.impl.avl.TableData.injectDupsData;
+import static org.apache.directory.server.xdbm.impl.avl.TableData.injectNoDupsData;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertTru
 
 import java.util.Comparator;
 
+import org.apache.directory.server.xdbm.impl.avl.AvlTable;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.junit.Before;

Copied: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java (from r945840, directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/TableData.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java?p2=directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java&p1=directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/TableData.java&r1=945840&r2=945933&rev=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/TableData.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java Tue May 18 22:28:52 2010
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.xdbm.impl.avl;
 
 
 import org.apache.directory.server.xdbm.Table;

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Tue May 18 22:28:52 2010
@@ -30,11 +30,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -129,14 +129,14 @@ public class AndCursorTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
         StoreUtils.loadExampleData( store, schemaManager );
 
         evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Tue May 18 22:28:52 2010
@@ -34,18 +34,18 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -129,15 +129,15 @@ public class GreaterEqTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.POSTALCODE_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.POSTALCODE_AT_OID ) );
 
         StoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Tue May 18 22:28:52 2010
@@ -34,10 +34,10 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
@@ -129,15 +129,15 @@ public class LessEqTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.POSTALCODE_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.POSTALCODE_AT_OID ) );
 
         StoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Tue May 18 22:28:52 2010
@@ -30,14 +30,13 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -48,7 +47,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer;
-import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.UuidSyntaxChecker;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 import org.junit.After;
@@ -129,14 +127,14 @@ public class NestedFilterTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
         StoreUtils.loadExampleData( store, schemaManager );
 
         evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Tue May 18 22:28:52 2010
@@ -30,15 +30,14 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.csn.CsnFactory;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -50,8 +49,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSidSyntaxChecker;
-import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.UuidSyntaxChecker;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 import org.junit.After;
@@ -129,14 +126,14 @@ public class NotCursorTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
         StoreUtils.loadExampleData( store, schemaManager );
 
         evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Tue May 18 22:28:52 2010
@@ -30,11 +30,11 @@ import java.io.File;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
@@ -121,14 +121,14 @@ public class OneLevelScopeTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( true );
 
-        store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
         StoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );
     }

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Tue May 18 22:28:52 2010
@@ -30,12 +30,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -128,14 +128,14 @@ public class OrCursorTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
         StoreUtils.loadExampleData( store, schemaManager );
 
         evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Tue May 18 22:28:52 2010
@@ -32,10 +32,10 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
@@ -116,14 +116,14 @@ public class PresenceTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
         StoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );
     }

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Tue May 18 22:28:52 2010
@@ -28,10 +28,10 @@ import static org.junit.Assert.fail;
 import java.io.File;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
@@ -112,14 +112,14 @@ public class SubstringTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( false );
 
-        store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
         StoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );
     }

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=945933&r1=945932&r2=945933&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Tue May 18 22:28:52 2010
@@ -31,11 +31,11 @@ import java.io.File;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.csn.CsnFactory;
@@ -121,14 +121,14 @@ public class SubtreeScopeTest
         wkdir.mkdirs();
 
         // initialize the store
-        store = new JdbmStore<Entry>();
+        store = new AvlStore<Entry>();
         store.setId( "example" );
         store.setCacheSize( 10 );
         store.setPartitionDir( wkdir );
         store.setSyncOnWrite( true );
 
-        store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
-        store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
+        store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
         StoreUtils.loadExampleData( store, schemaManager );
         LOG.debug( "Created new store" );
     }