directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r760072 - in /directory/apacheds/branches/apacheds-replication/xdbm-base: ./ src/main/java/org/apache/directory/server/core/partition/impl/btree/ src/main/java/org/apache/directory/server/xdbm/
Date Mon, 30 Mar 2009 18:00:04 GMT
Author: elecharny
Date: Mon Mar 30 18:00:03 2009
New Revision: 760072

URL: http://svn.apache.org/viewvc?rev=760072&view=rev
Log:
Changed the code to compile with Cursor in shared

Modified:
    directory/apacheds/branches/apacheds-replication/xdbm-base/pom.xml
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java
    directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/pom.xml?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/pom.xml (original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/pom.xml Mon Mar 30 18:00:03
2009
@@ -41,9 +41,9 @@
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>apacheds-core-cursor</artifactId>
-        <version>${pom.version}</version>
+        <groupId>org.apache.directory.shared</groupId>
+        <version>${org.apache.directory.shared.version}</version>
+        <artifactId>shared-cursor</artifactId>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
Mon Mar 30 18:00:03 2009
@@ -20,13 +20,19 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
-import org.apache.directory.server.xdbm.*;
-import org.apache.directory.server.core.cursor.ClosureMonitor;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.CursorIterator;
 
 import java.util.Iterator;
 
+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.ReverseIndexEntry;
+import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.server.xdbm.TupleCursor;
+import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.CursorIterator;
+
 
 /**
  * A Cursor which adapts an underlying Tuple based Cursor to one which returns

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
Mon Mar 30 18:00:03 2009
@@ -19,10 +19,10 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
-import org.apache.directory.server.core.cursor.AbstractCursor;
 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 java.util.Arrays;
 import java.util.List;

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
Mon Mar 30 18:00:03 2009
@@ -20,12 +20,12 @@
 package org.apache.directory.server.xdbm;
 
 
-import org.apache.directory.server.core.cursor.ClosureMonitor;
-import org.apache.directory.server.core.cursor.CursorIterator;
-import org.apache.directory.server.core.cursor.DefaultClosureMonitor;
-
 import java.util.Iterator;
 
+import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
+import org.apache.directory.shared.ldap.cursor.CursorIterator;
+import org.apache.directory.shared.ldap.cursor.DefaultClosureMonitor;
+
 
 /**
  * An abstract TupleCursor.

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractTupleCursor.java
Mon Mar 30 18:00:03 2009
@@ -20,12 +20,12 @@
 package org.apache.directory.server.xdbm;
 
 
-import org.apache.directory.server.core.cursor.ClosureMonitor;
-import org.apache.directory.server.core.cursor.CursorIterator;
-import org.apache.directory.server.core.cursor.DefaultClosureMonitor;
-
 import java.util.Iterator;
 
+import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
+import org.apache.directory.shared.ldap.cursor.CursorIterator;
+import org.apache.directory.shared.ldap.cursor.DefaultClosureMonitor;
+
 
 /**
  * An abstract TupleCursor.

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
Mon Mar 30 18:00:03 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.directory.server.xdbm;
 
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Index.java
Mon Mar 30 18:00:03 2009
@@ -22,8 +22,8 @@
 
 import java.io.File;
 
+import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.server.core.cursor.Cursor;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
Mon Mar 30 18:00:03 2009
@@ -19,8 +19,9 @@
  */
 package org.apache.directory.server.xdbm;
 
+import org.apache.directory.shared.ldap.cursor.Cursor;
+
 
-import org.apache.directory.server.core.cursor.Cursor;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
Mon Mar 30 18:00:03 2009
@@ -18,8 +18,9 @@
  */
 package org.apache.directory.server.xdbm;
 
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+
 
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Table.java
Mon Mar 30 18:00:03 2009
@@ -20,10 +20,11 @@
 package org.apache.directory.server.xdbm;
 
 
-import org.apache.directory.server.core.cursor.Cursor;
 
 import java.util.Comparator;
 
+import org.apache.directory.shared.ldap.cursor.Cursor;
+
 
 /**
  * A wrapper interface around BTree implementations used to abstract away

Modified: directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java?rev=760072&r1=760071&r2=760072&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java
(original)
+++ directory/apacheds/branches/apacheds-replication/xdbm-base/src/main/java/org/apache/directory/server/xdbm/TupleCursor.java
Mon Mar 30 18:00:03 2009
@@ -19,8 +19,9 @@
  */
 package org.apache.directory.server.xdbm;
 
+import org.apache.directory.shared.ldap.cursor.Cursor;
+
 
-import org.apache.directory.server.core.cursor.Cursor;
 
 
 /**



Mime
View raw message