directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r763014 [2/2] - in /directory/apacheds/branches/ldif-partition: ./ bootstrap-extract/ bootstrap-partition/ bootstrap-plugin/ bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ core-integ/src/test/java/org/apac...
Date Tue, 07 Apr 2009 22:30:48 GMT
Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmMasterTableTest.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmMasterTableTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmMasterTableTest.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmMasterTableTest.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
@@ -26,6 +26,8 @@
 import org.junit.After;
 import org.junit.Test;
 import static org.junit.Assert.*;
+
+import org.apache.directory.server.core.partition.jdbm.JdbmMasterTable;
 import org.apache.directory.server.schema.bootstrap.*;
 import org.apache.directory.server.schema.registries.*;
 import org.apache.directory.server.schema.SerializableComparator;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmStoreTest.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmStoreTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmStoreTest.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmStoreTest.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
@@ -41,6 +41,8 @@
 import org.apache.directory.server.core.entry.ServerModification;
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
 import org.apache.directory.server.core.entry.ServerAttribute;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmStore;
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmTableNoDuplicatesTest.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmTableNoDuplicatesTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmTableNoDuplicatesTest.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmTableNoDuplicatesTest.java Tue Apr  7 22:30:44 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
@@ -27,6 +27,7 @@
 import static org.junit.Assert.*;
 
 import org.apache.directory.server.xdbm.Table;
+import org.apache.directory.server.core.partition.jdbm.JdbmTable;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.registries.ComparatorRegistry;
 import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescription;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmTableWithDuplicatesTest.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmTableWithDuplicatesTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmTableWithDuplicatesTest.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/JdbmTableWithDuplicatesTest.java Tue Apr  7 22:30:44 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
@@ -29,6 +29,7 @@
 import org.apache.directory.server.xdbm.Table;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.core.cursor.Cursor;
+import org.apache.directory.server.core.partition.jdbm.JdbmTable;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.registries.ComparatorRegistry;
 import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescription;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyBTreeCursorTest.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyBTreeCursorTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyBTreeCursorTest.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyBTreeCursorTest.java Tue Apr  7 22:30:44 2009
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
+import org.apache.directory.server.core.partition.jdbm.KeyBTreeCursor;
 import org.junit.*;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyCursorTest.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyCursorTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyCursorTest.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyCursorTest.java Tue Apr  7 22:30:44 2009
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
+import org.apache.directory.server.core.partition.jdbm.KeyBTreeCursor;
 import org.junit.*;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyTupleAvlCursorTest.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursorTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyTupleAvlCursorTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyTupleAvlCursorTest.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursorTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursorTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyTupleAvlCursorTest.java Tue Apr  7 22:30:44 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
@@ -27,6 +27,7 @@
 import org.apache.directory.server.core.avltree.AvlTree;
 import org.apache.directory.server.core.avltree.AvlTreeImpl;
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
+import org.apache.directory.server.core.partition.jdbm.KeyTupleAvlCursor;
 import org.apache.directory.server.xdbm.Tuple;
 import org.junit.Before;
 import org.junit.Test;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyTupleBTreeCursorTest.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyTupleBTreeCursorTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyTupleBTreeCursorTest.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/KeyTupleBTreeCursorTest.java Tue Apr  7 22:30:44 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import static junit.framework.Assert.assertEquals;
@@ -35,6 +35,9 @@
 import jdbm.recman.BaseRecordManager;
 
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
+import org.apache.directory.server.core.partition.jdbm.DupsContainer;
+import org.apache.directory.server.core.partition.jdbm.JdbmTable;
+import org.apache.directory.server.core.partition.jdbm.KeyTupleBTreeCursor;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.registries.ComparatorRegistry;
 import org.apache.directory.server.xdbm.Tuple;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/LessEqTest.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/LessEqTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/LessEqTest.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/LessEqTest.java Tue Apr  7 22:30:44 2009
@@ -17,18 +17,20 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
+import org.apache.directory.server.xdbm.search.impl.LessEqCursor;
+import org.apache.directory.server.xdbm.search.impl.LessEqEvaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.server.schema.registries.*;
 import org.apache.directory.server.schema.bootstrap.*;
 import org.apache.directory.server.schema.SerializableComparator;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmStore;
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/MockComparatorRegistry.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/MockComparatorRegistry.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/MockComparatorRegistry.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/MockComparatorRegistry.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.apache.directory.server.schema.registries.ComparatorRegistry;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NestedFilterTest.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NestedFilterTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NestedFilterTest.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NestedFilterTest.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import java.io.File;
@@ -25,8 +25,8 @@
 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.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmStore;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.bootstrap.ApacheSchema;
@@ -43,6 +43,9 @@
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.Optimizer;
+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.EvaluatorBuilder;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.ExprNode;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoDupsCursorTest.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoDupsCursorTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoDupsCursorTest.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoDupsCursorTest.java Tue Apr  7 22:30:44 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
@@ -25,6 +25,7 @@
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
+import org.apache.directory.server.core.partition.jdbm.JdbmTable;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.registries.ComparatorRegistry;
 import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescription;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoEqMatchAttribute.java (from r762916, directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoEqMatchAttribute.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoEqMatchAttribute.java&p1=directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoEqMatchAttribute.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.jdbm;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.apache.directory.shared.ldap.schema.AttributeType;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoMatchingRuleAttributeType.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NoMatchingRuleAttributeType.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoMatchingRuleAttributeType.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoMatchingRuleAttributeType.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NoMatchingRuleAttributeType.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NoMatchingRuleAttributeType.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NoMatchingRuleAttributeType.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.apache.directory.shared.ldap.schema.AttributeType;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NotCursorTest.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NotCursorTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NotCursorTest.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/NotCursorTest.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import static org.junit.Assert.*;
@@ -28,8 +28,8 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
-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.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmStore;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.bootstrap.ApacheSchema;
@@ -47,6 +47,10 @@
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.Evaluator;
+import org.apache.directory.server.xdbm.search.impl.CursorBuilder;
+import org.apache.directory.server.xdbm.search.impl.EvaluatorBuilder;
+import org.apache.directory.server.xdbm.search.impl.NotCursor;
+import org.apache.directory.server.xdbm.search.impl.SubstringEvaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.ExprNode;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OneLevelScopeTest.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OneLevelScopeTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OneLevelScopeTest.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OneLevelScopeTest.java Tue Apr  7 22:30:44 2009
@@ -17,19 +17,21 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexEntry;
+import org.apache.directory.server.xdbm.search.impl.OneLevelScopeCursor;
+import org.apache.directory.server.xdbm.search.impl.OneLevelScopeEvaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.server.schema.registries.*;
 import org.apache.directory.server.schema.bootstrap.*;
 import org.apache.directory.server.schema.SerializableComparator;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmStore;
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OrCursorTest.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OrCursorTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OrCursorTest.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OrCursorTest.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import static org.junit.Assert.*;
@@ -31,8 +31,8 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
-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.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmStore;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.bootstrap.ApacheSchema;
@@ -51,6 +51,11 @@
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.Evaluator;
+import org.apache.directory.server.xdbm.search.impl.CursorBuilder;
+import org.apache.directory.server.xdbm.search.impl.EvaluatorBuilder;
+import org.apache.directory.server.xdbm.search.impl.OrCursor;
+import org.apache.directory.server.xdbm.search.impl.SubstringCursor;
+import org.apache.directory.server.xdbm.search.impl.SubstringEvaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.filter.ExprNode;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OrderingOnlyMatchingRuleAttributeType.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrderingOnlyMatchingRuleAttributeType.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OrderingOnlyMatchingRuleAttributeType.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OrderingOnlyMatchingRuleAttributeType.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrderingOnlyMatchingRuleAttributeType.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrderingOnlyMatchingRuleAttributeType.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/OrderingOnlyMatchingRuleAttributeType.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.apache.directory.shared.ldap.schema.*;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/PresenceTest.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/PresenceTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/PresenceTest.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/PresenceTest.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
@@ -26,9 +26,11 @@
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.bootstrap.*;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
+import org.apache.directory.server.xdbm.search.impl.PresenceCursor;
+import org.apache.directory.server.xdbm.search.impl.PresenceEvaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
-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.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmStore;
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/SubstringTest.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/SubstringTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/SubstringTest.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/SubstringTest.java Tue Apr  7 22:30:44 2009
@@ -17,18 +17,20 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
+import org.apache.directory.server.xdbm.search.impl.SubstringCursor;
+import org.apache.directory.server.xdbm.search.impl.SubstringEvaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.server.schema.registries.*;
 import org.apache.directory.server.schema.bootstrap.*;
 import org.apache.directory.server.schema.SerializableComparator;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmStore;
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;

Copied: directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/SubtreeScopeTest.java (from r762916, directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/SubtreeScopeTest.java?p2=directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/SubtreeScopeTest.java&p1=directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/branches/ldif-partition/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/jdbm/SubtreeScopeTest.java Tue Apr  7 22:30:44 2009
@@ -17,19 +17,21 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm.search.impl;
+package org.apache.directory.server.core.partition.jdbm;
 
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexEntry;
+import org.apache.directory.server.xdbm.search.impl.SubtreeScopeCursor;
+import org.apache.directory.server.xdbm.search.impl.SubtreeScopeEvaluator;
 import org.apache.directory.server.xdbm.tools.StoreUtils;
 import org.apache.directory.server.schema.registries.*;
 import org.apache.directory.server.schema.bootstrap.*;
 import org.apache.directory.server.schema.SerializableComparator;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmStore;
 import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;

Modified: directory/apacheds/branches/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/pom.xml?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/pom.xml (original)
+++ directory/apacheds/branches/ldif-partition/pom.xml Tue Apr  7 22:30:44 2009
@@ -336,6 +336,7 @@
   <modules>
     <module>all</module>
     <module>jdbm</module>
+    <module>jdbm-partition</module>
     <module>bootstrap-extract</module>
     <module>bootstrap-partition</module>
     <module>bootstrap-plugin</module>
@@ -343,7 +344,6 @@
     <module>schema-bootstrap</module>
     <module>utils</module>
     <module>schema-registries</module>
-    <module>jdbm-store</module>
     <module>xdbm-base</module>
     <module>xdbm-search</module>
     <module>xdbm-tools</module>
@@ -362,7 +362,6 @@
     <module>core-avl</module>
     <module>avl-partition</module>
     <module>ldif-partition</module>
-    <module>jdbm-partition</module>
     <module>protocol-shared</module>
     <module>protocol-ntp</module>
     <module>protocol-ldap</module>

Modified: directory/apacheds/branches/ldif-partition/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-kerberos/pom.xml?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/branches/ldif-partition/protocol-kerberos/pom.xml Tue Apr  7 22:30:44 2009
@@ -41,18 +41,27 @@
       <artifactId>apacheds-kerberos-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-unit</artifactId>
       <version>${pom.version}</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-bootstrap-partition</artifactId>
       <version>${pom.version}</version>
       <scope>test</scope>
     </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-jdbm-partition</artifactId>
+      <version>${pom.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java Tue Apr  7 22:30:44 2009
@@ -25,8 +25,8 @@
 import org.apache.directory.server.core.interceptor.Interceptor;
 import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmPartition;
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.server.unit.AbstractServerTest;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java Tue Apr  7 22:30:44 2009
@@ -36,12 +36,12 @@
 import org.apache.directory.server.core.interceptor.context.ListSuffixOperationContext;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.partition.impl.btree.XdbmPartition;
-import org.apache.directory.server.core.partition.impl.btree.gui.PartitionFrame;
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapService;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.server.ldap.gui.SessionsFrame;
+import org.apache.directory.server.xdbm.XdbmPartition;
+import org.apache.directory.server.xdbm.tools.ui.PartitionFrame;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;

Modified: directory/apacheds/branches/ldif-partition/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/pom.xml?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/pom.xml (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/pom.xml Tue Apr  7 22:30:44 2009
@@ -88,6 +88,13 @@
       <version>${pom.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-jdbm-partition</artifactId>
+      <version>${pom.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java Tue Apr  7 22:30:44 2009
@@ -31,8 +31,8 @@
 import org.apache.directory.server.core.interceptor.Interceptor;
 import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmPartition;
 import org.apache.directory.server.integ.LdapServerFactory;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 import org.apache.directory.server.integ.SiRunner;

Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/kerberos/PasswordPolicyServiceIT.java Tue Apr  7 22:30:44 2009
@@ -31,8 +31,8 @@
 import org.apache.directory.server.core.interceptor.Interceptor;
 import org.apache.directory.server.core.kerberos.PasswordPolicyInterceptor;
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmPartition;
 import org.apache.directory.server.integ.LdapServerFactory;
 import org.apache.directory.server.integ.SiRunner;
 import org.apache.directory.server.ldap.LdapService;

Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Tue Apr  7 22:30:44 2009
@@ -57,7 +57,7 @@
 import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler;
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.jdbm.JdbmPartition;
 import org.apache.directory.shared.asn1.util.Asn1StringUtils;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.MutableControl;

Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Tue Apr  7 22:30:44 2009
@@ -46,8 +46,8 @@
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.core.integ.annotations.Factory;
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmPartition;
 import org.apache.directory.server.integ.LdapServerFactory;
 import org.apache.directory.server.integ.SiRunner;
 import org.apache.directory.server.ldap.LdapService;

Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java Tue Apr  7 22:30:44 2009
@@ -43,8 +43,8 @@
 import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.core.integ.annotations.Factory;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmPartition;
 import org.apache.directory.server.integ.LdapServerFactory;
 import org.apache.directory.server.integ.SiRunner;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;

Modified: directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java (original)
+++ directory/apacheds/branches/ldif-partition/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java Tue Apr  7 22:30:44 2009
@@ -28,8 +28,8 @@
 import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.core.integ.annotations.Factory;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmPartition;
 import org.apache.directory.server.integ.LdapServerFactory;
 import org.apache.directory.server.integ.SiRunner;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;

Modified: directory/apacheds/branches/ldif-partition/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-tools/pom.xml?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-tools/pom.xml (original)
+++ directory/apacheds/branches/ldif-partition/server-tools/pom.xml Tue Apr  7 22:30:44 2009
@@ -51,6 +51,12 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-jdbm-partition</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-api</artifactId>
       <version>${pom.version}</version>
     </dependency>

Modified: directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original)
+++ directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Tue Apr  7 22:30:44 2009
@@ -45,9 +45,9 @@
 import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.impl.DefaultDirectoryService;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmMasterTable;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmMasterTable;
+import org.apache.directory.server.core.partition.jdbm.JdbmPartition;
 import org.apache.directory.server.core.schema.PartitionSchemaLoader;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.bootstrap.ApacheSchema;

Modified: directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java (original)
+++ directory/apacheds/branches/ldif-partition/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java Tue Apr  7 22:30:44 2009
@@ -41,9 +41,9 @@
 import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.impl.DefaultDirectoryService;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmMasterTable;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.jdbm.JdbmMasterTable;
+import org.apache.directory.server.core.partition.jdbm.JdbmPartition;
 import org.apache.directory.server.core.schema.PartitionSchemaLoader;
 import org.apache.directory.server.schema.SerializableComparator;
 import org.apache.directory.server.schema.bootstrap.ApacheSchema;

Modified: directory/apacheds/branches/ldif-partition/xbean-spring/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xbean-spring/pom.xml?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xbean-spring/pom.xml (original)
+++ directory/apacheds/branches/ldif-partition/xbean-spring/pom.xml Tue Apr  7 22:30:44 2009
@@ -69,7 +69,7 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-jdbm-store</artifactId>
+      <artifactId>apacheds-jdbm-partition</artifactId>
       <version>${pom.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>

Modified: directory/apacheds/branches/ldif-partition/xdbm-base/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-base/pom.xml?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-base/pom.xml (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-base/pom.xml Tue Apr  7 22:30:44 2009
@@ -40,22 +40,30 @@
         <artifactId>apacheds-schema-registries</artifactId>
         <version>${pom.version}</version>
       </dependency>
+      
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>apacheds-core-cursor</artifactId>
         <version>${pom.version}</version>
       </dependency>
+      
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>apacheds-core-entry</artifactId>
         <version>${pom.version}</version>
       </dependency>
 
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>apacheds-core-entry</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>apacheds-core-entry</artifactId>
+        <version>${pom.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>apacheds-core-api</artifactId>
+        <version>${pom.version}</version>
+      </dependency>
   </dependencies>
 </project>
 

Copied: directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ServerEntryCursorAdaptor.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ServerEntryCursorAdaptor.java?p2=directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ServerEntryCursorAdaptor.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ServerEntryCursorAdaptor.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm;
 
 
 import java.util.Iterator;
@@ -27,8 +27,6 @@
 import org.apache.directory.server.core.cursor.CursorIterator;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.xdbm.IndexCursor;
-import org.apache.directory.server.xdbm.IndexEntry;
 
 
 /**

Copied: directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/XdbmPartition.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/XdbmPartition.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/XdbmPartition.java?p2=directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/XdbmPartition.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/XdbmPartition.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/XdbmPartition.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-base/src/main/java/org/apache/directory/server/xdbm/XdbmPartition.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm;
 
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
@@ -36,9 +36,7 @@
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.impl.btree.gui.PartitionViewer;
 import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.server.xdbm.*;
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.search.SearchEngine;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -300,13 +298,6 @@
     public abstract boolean isInitialized();
 
 
-    public void inspect() throws Exception
-    {
-        PartitionViewer viewer = new PartitionViewer( this, registries );
-        viewer.execute();
-    }
-
-
     ////////////////////
     // public abstract methods
 

Modified: directory/apacheds/branches/ldif-partition/xdbm-search/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-search/pom.xml?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-search/pom.xml (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-search/pom.xml Tue Apr  7 22:30:44 2009
@@ -44,13 +44,6 @@
     </dependency>
     
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-jdbm-store</artifactId>
-      <version>${pom.version}</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-xdbm-tools</artifactId>
       <version>${pom.version}</version>

Modified: directory/apacheds/branches/ldif-partition/xdbm-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/pom.xml?rev=763014&r1=763013&r2=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/xdbm-tools/pom.xml (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/pom.xml Tue Apr  7 22:30:44 2009
@@ -41,6 +41,12 @@
       <artifactId>apacheds-xdbm-base</artifactId>
       <version>${pom.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-api</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
   </dependencies>
 
   <packaging>jar</packaging>

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/ASTNode.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/ASTNode.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/ASTNode.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/ASTNode.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.util.ArrayList;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AboutDialog.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AboutDialog.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AboutDialog.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AboutDialog.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AboutDialog.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AboutDialog.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AboutDialog.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.awt.BorderLayout;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AddEntryDialog.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AddEntryDialog.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AddEntryDialog.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AddEntryDialog.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.awt.Frame;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AnnotatedFilterTreeDialog.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AnnotatedFilterTreeDialog.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AnnotatedFilterTreeDialog.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AnnotatedFilterTreeDialog.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AnnotatedFilterTreeDialog.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AnnotatedFilterTreeDialog.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AnnotatedFilterTreeDialog.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.awt.Frame;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AttributesTableModel.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AttributesTableModel.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AttributesTableModel.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/AttributesTableModel.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.util.ArrayList;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/EntryDialog.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryDialog.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/EntryDialog.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/EntryDialog.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryDialog.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryDialog.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/EntryDialog.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.awt.Frame;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/EntryNode.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/EntryNode.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/EntryNode.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/EntryNode.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.util.ArrayList;
@@ -30,10 +30,10 @@
 import javax.swing.tree.TreeNode;
 
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.partition.impl.btree.XdbmPartition;
 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.XdbmPartition;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.xdbm.search.SearchEngine;
 import org.apache.directory.shared.ldap.filter.ExprNode;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/FilterDialog.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/FilterDialog.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/FilterDialog.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/FilterDialog.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/FilterDialog.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/FilterDialog.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/FilterDialog.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.awt.BorderLayout;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/IndexDialog.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/IndexDialog.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/IndexDialog.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/IndexDialog.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.awt.Color;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/PartitionFrame.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/PartitionFrame.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/PartitionFrame.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/PartitionFrame.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.awt.BorderLayout;
@@ -62,10 +62,10 @@
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
-import org.apache.directory.server.core.partition.impl.btree.XdbmPartition;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
+import org.apache.directory.server.xdbm.XdbmPartition;
 import org.apache.directory.server.schema.registries.Registries;
 
 import org.apache.directory.shared.ldap.filter.ExprNode;

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/PartitionViewer.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/PartitionViewer.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/PartitionViewer.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/PartitionViewer.java Tue Apr  7 22:30:44 2009
@@ -17,14 +17,14 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
 
-import org.apache.directory.server.core.partition.impl.btree.XdbmPartition;
 import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.server.xdbm.XdbmPartition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/SearchResultDialog.java (from r762916, directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/SearchResultDialog.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/SearchResultDialog.java?p2=directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/SearchResultDialog.java&p1=directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/SearchResultDialog.java&r1=762916&r2=763014&rev=763014&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/SearchResultDialog.java (original)
+++ directory/apacheds/branches/ldif-partition/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/ui/SearchResultDialog.java Tue Apr  7 22:30:44 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree.gui;
+package org.apache.directory.server.xdbm.tools.ui;
 
 
 import java.awt.Frame;



Mime
View raw message