directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r945891 - in /directory: apacheds/branches/xdbm-refactoring/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ apacheds/branches/xdbm-refactoring/avl-partition/src/test/java/org/apache/directory/server/core/partitio...
Date Tue, 18 May 2010 21:16:47 GMT
Author: seelmann
Date: Tue May 18 21:16:45 2010
New Revision: 945891

URL: http://svn.apache.org/viewvc?rev=945891&view=rev
Log:
Part for DIRSERVER-1505 (Merge XDBM modules):
o move Tuple, TupleCursor, AbstractTupleCursor, and TupleRenderer from xdbm-base to shared-cursor
o remove dependency xdbm-base from avl-core
o add dependency xdbm-base to jdbm-store

Added:
    directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/AbstractTupleCursor.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java
    directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/Tuple.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java
    directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleCursor.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java
    directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleRenderer.java
      - copied, changed from r945840, directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java
Removed:
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java
Modified:
    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/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/AvlTableTest.java
    directory/apacheds/branches/xdbm-refactoring/core-avl/pom.xml
    directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
    directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java
    directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
    directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/pom.xml
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
    directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
    directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
    directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ForwardIndexEntryTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java
    directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/TupleTest.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

Modified: 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/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlIndex.java?rev=945891&r1=945890&r2=945891&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/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlIndex.java Tue May 18 21:16:45 2010
@@ -27,8 +27,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexCursor;
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.LdapComparator;

Modified: 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/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java?rev=945891&r1=945890&r2=945891&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/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java Tue May 18 21:16:45 2010
@@ -32,10 +32,10 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.avltree.LinkedAvlMapNode;
 import org.apache.directory.server.core.avltree.SingletonOrOrderedSet;
 import org.apache.directory.server.xdbm.Table;
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.cursor.SingletonCursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 
 
 /**

Modified: 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/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTableDupsCursor.java?rev=945891&r1=945890&r2=945891&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/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTableDupsCursor.java Tue May 18 21:16:45 2010
@@ -24,11 +24,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.avltree.AvlTree;
 import org.apache.directory.server.core.avltree.AvlTreeCursor;
 import org.apache.directory.server.core.avltree.SingletonOrOrderedSet;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.cursor.SingletonCursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: 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/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlTableTest.java?rev=945891&r1=945890&r2=945891&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/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlTableTest.java Tue May 18 21:16:45 2010
@@ -29,8 +29,8 @@ import static org.junit.Assert.assertTru
 
 import java.util.Comparator;
 
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: directory/apacheds/branches/xdbm-refactoring/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-avl/pom.xml?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/core-avl/pom.xml (original)
+++ directory/apacheds/branches/xdbm-refactoring/core-avl/pom.xml Tue May 18 21:16:45 2010
@@ -34,7 +34,7 @@
 
   <dependencies>
     <dependency>
-      <artifactId>apacheds-xdbm-base</artifactId>
+      <artifactId>apacheds-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>

Modified: directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java Tue May 18 21:16:45 2010
@@ -22,8 +22,8 @@ package org.apache.directory.server.core
 
 import java.util.Comparator;
 
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 

Modified: directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java Tue May 18 21:16:45 2010
@@ -19,8 +19,8 @@
  */
 package org.apache.directory.server.core.avltree;
 
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 

Modified: directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java Tue May 18 21:16:45 2010
@@ -20,8 +20,8 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 

Modified: directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java Tue May 18 21:16:45 2010
@@ -28,7 +28,7 @@ import static org.junit.Assert.fail;
 
 import java.util.Comparator;
 
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.junit.Before;
 import org.junit.Test;

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/pom.xml?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/pom.xml (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/pom.xml Tue May 18 21:16:45 2010
@@ -61,6 +61,12 @@
     </dependency>
 
     <dependency>
+      <artifactId>apacheds-xdbm-base</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
       <artifactId>apacheds-xdbm-tools</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java Tue May 18 21:16:45 2010
@@ -21,9 +21,9 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 
 import jdbm.helper.TupleBrowser;
 

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java Tue May 18 21:16:45 2010
@@ -24,10 +24,10 @@ import jdbm.btree.BTree;
 
 import org.apache.directory.server.core.avltree.ArrayTree;
 import org.apache.directory.server.core.avltree.ArrayTreeCursor;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Tue May 18 21:16:45 2010
@@ -35,8 +35,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexCursor;
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.MatchingRule;

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Tue May 18 21:16:45 2010
@@ -881,7 +881,7 @@ public class JdbmTable<K,V> implements T
     }
 
 
-    public Cursor<org.apache.directory.server.xdbm.Tuple<K,V>> cursor() throws Exception
+    public Cursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>> cursor() throws Exception
     {
         if ( allowsDuplicates )
         {
@@ -893,23 +893,23 @@ public class JdbmTable<K,V> implements T
 
 
     @SuppressWarnings("unchecked")
-    public Cursor<org.apache.directory.server.xdbm.Tuple<K,V>> cursor( K key ) throws Exception
+    public Cursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>> cursor( K key ) throws Exception
     {
         if ( key == null )
         {
-            return new EmptyCursor<org.apache.directory.server.xdbm.Tuple<K,V>>();
+            return new EmptyCursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>>();
         }
 
         Object raw = bt.find( key );
 
         if ( null == raw )
         {
-            return new EmptyCursor<org.apache.directory.server.xdbm.Tuple<K,V>>();
+            return new EmptyCursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>>();
         }
 
         if ( ! allowsDuplicates )
         {
-            return new SingletonCursor<org.apache.directory.server.xdbm.Tuple<K,V>>( new org.apache.directory.server.xdbm.Tuple<K,V>( key, ( V ) raw ) );
+            return new SingletonCursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>>( new org.apache.directory.shared.ldap.cursor.Tuple<K,V>( key, ( V ) raw ) );
         }
 
         byte[] serialized = ( byte[] ) raw;

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java Tue May 18 21:16:45 2010
@@ -19,12 +19,12 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
 import org.apache.directory.server.core.avltree.ArrayTree;
 import org.apache.directory.server.core.avltree.ArrayTreeCursor;
 import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 
 
 /**

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java Tue May 18 21:16:45 2010
@@ -20,9 +20,9 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 
 import java.util.Comparator;
 

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java Tue May 18 21:16:45 2010
@@ -20,9 +20,9 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 
 import java.io.IOException;
 

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Tue May 18 21:16:45 2010
@@ -31,10 +31,10 @@ import jdbm.RecordManager;
 import jdbm.helper.DefaultSerializer;
 import jdbm.recman.BaseRecordManager;
 
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java Tue May 18 21:16:45 2010
@@ -32,10 +32,10 @@ import jdbm.helper.DefaultSerializer;
 import jdbm.recman.BaseRecordManager;
 
 import org.apache.directory.server.xdbm.Table;
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;

Modified: directory/apacheds/branches/xdbm-refactoring/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/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Tue May 18 21:16:45 2010
@@ -33,9 +33,9 @@ import jdbm.helper.DefaultSerializer;
 import jdbm.helper.IntegerSerializer;
 import jdbm.recman.BaseRecordManager;
 
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;

Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java Tue May 18 21:16:45 2010
@@ -25,8 +25,8 @@ import static junit.framework.Assert.ass
 import java.util.Comparator;
 
 import org.apache.directory.server.core.avltree.ArrayTree;
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: directory/apacheds/branches/xdbm-refactoring/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/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Tue May 18 21:16:45 2010
@@ -32,9 +32,9 @@ import jdbm.btree.BTree;
 import jdbm.helper.DefaultSerializer;
 import jdbm.recman.BaseRecordManager;
 
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;

Modified: directory/apacheds/branches/xdbm-refactoring/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/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Tue May 18 21:16:45 2010
@@ -31,10 +31,10 @@ import jdbm.RecordManager;
 import jdbm.recman.BaseRecordManager;
 
 import org.apache.directory.server.xdbm.Table;
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;

Modified: directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Tue May 18 21:16:45 2010
@@ -44,9 +44,9 @@ import org.apache.directory.server.core.
 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.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.MultiException;
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;

Modified: directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java Tue May 18 21:16:45 2010
@@ -35,9 +35,9 @@ import org.apache.directory.server.core.
 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.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.tools.IndexUtils;
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Tue May 18 21:16:45 2010
@@ -26,12 +26,12 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.ReverseIndexEntry;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.TupleCursor;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.CursorIterator;
+import org.apache.directory.shared.ldap.cursor.Tuple;
+import org.apache.directory.shared.ldap.cursor.TupleCursor;
 
 
 /**

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java Tue May 18 21:16:45 2010
@@ -21,9 +21,9 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.shared.ldap.NotImplementedException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.server.xdbm.Tuple;
 
 import java.util.NoSuchElementException;
 import java.util.regex.Pattern;

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java Tue May 18 21:16:45 2010
@@ -23,10 +23,10 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.cursor.AbstractCursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 
 
 /**

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java Tue May 18 21:16:45 2010
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.server.xdbm;
 
+import org.apache.directory.shared.ldap.cursor.Tuple;
+
 
 /**
  * An index id value pair based on a Tuple which can optionally reference the

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java Tue May 18 21:16:45 2010
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.server.xdbm;
 
+import org.apache.directory.shared.ldap.cursor.Tuple;
+
 
 /**
  * Interface for index entries.

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java Tue May 18 21:16:45 2010
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.server.xdbm;
 
+import org.apache.directory.shared.ldap.cursor.Tuple;
+
 
 /**
  * An index id value pair which can optionally reference the indexed obj

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java Tue May 18 21:16:45 2010
@@ -23,6 +23,7 @@ package org.apache.directory.server.xdbm
 import java.util.Comparator;
 
 import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
 
 
 /**

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ForwardIndexEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ForwardIndexEntryTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ForwardIndexEntryTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ForwardIndexEntryTest.java Tue May 18 21:16:45 2010
@@ -25,6 +25,7 @@ import static junit.framework.Assert.ass
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.junit.Before;

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java Tue May 18 21:16:45 2010
@@ -25,6 +25,7 @@ import static junit.framework.Assert.ass
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.junit.Before;

Modified: directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/TupleTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/TupleTest.java?rev=945891&r1=945890&r2=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/TupleTest.java (original)
+++ directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/test/java/org/apache/directory/server/xdbm/TupleTest.java Tue May 18 21:16:45 2010
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertNul
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.shared.ldap.cursor.Tuple;
 import org.junit.Test;
 
 

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=945891&r1=945890&r2=945891&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 21:16:45 2010
@@ -38,11 +38,11 @@ import org.apache.directory.server.core.
 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.Tuple;
 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;

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=945891&r1=945890&r2=945891&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 21:16:45 2010
@@ -38,11 +38,11 @@ import org.apache.directory.server.core.
 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.Tuple;
 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.Entry;
 import org.apache.directory.shared.ldap.entry.StringValue;

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=945891&r1=945890&r2=945891&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 21:16:45 2010
@@ -34,10 +34,10 @@ import org.apache.directory.server.core.
 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.Tuple;
 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;

Copied: directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/AbstractTupleCursor.java (from r945840, directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/AbstractTupleCursor.java?p2=directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/AbstractTupleCursor.java&p1=directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java&r1=945840&r2=945891&rev=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java (original)
+++ directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/AbstractTupleCursor.java Tue May 18 21:16:45 2010
@@ -17,15 +17,12 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm;
+package org.apache.directory.shared.ldap.cursor;
 
 
 import java.util.Iterator;
 
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
-import org.apache.directory.shared.ldap.cursor.CursorIterator;
-import org.apache.directory.shared.ldap.cursor.DefaultClosureMonitor;
 
 
 /**

Copied: directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/Tuple.java (from r945840, directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/Tuple.java?p2=directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/Tuple.java&p1=directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java&r1=945840&r2=945891&rev=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java (original)
+++ directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/Tuple.java Tue May 18 21:16:45 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm;
+package org.apache.directory.shared.ldap.cursor;
 
 
 /**
@@ -163,7 +163,7 @@ public class Tuple<K, V>
         {
             return false;
         }
-        Tuple<?, ?> other = ( Tuple<?, ?> ) obj;
+        Tuple<?, ?> other = (org.apache.directory.shared.ldap.cursor.Tuple<?, ?> ) obj;
         if ( key == null )
         {
             if ( other.key != null )

Copied: directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleCursor.java (from r945840, directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleCursor.java?p2=directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleCursor.java&p1=directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java&r1=945840&r2=945891&rev=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java (original)
+++ directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleCursor.java Tue May 18 21:16:45 2010
@@ -17,10 +17,9 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm;
+package org.apache.directory.shared.ldap.cursor;
 
 
-import org.apache.directory.shared.ldap.cursor.Cursor;
 
 
 /**

Copied: directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleRenderer.java (from r945840, directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleRenderer.java?p2=directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleRenderer.java&p1=directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java&r1=945840&r2=945891&rev=945891&view=diff
==============================================================================
--- directory/apacheds/branches/xdbm-refactoring/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java (original)
+++ directory/shared/branches/xdbm-refactoring/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/TupleRenderer.java Tue May 18 21:16:45 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.xdbm;
+package org.apache.directory.shared.ldap.cursor;
 
 
 /**



Mime
View raw message