You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2010/06/04 12:19:20 UTC
svn commit: r951350 - in /directory/apacheds/trunk: ./ all/ avl-partition/
core-annotations/
core-annotations/src/main/java/org/apache/directory/server/core/factory/
core-annotations/src/test/java/org/apache/directory/server/core/factory/
jdbm-partitio...
Author: seelmann
Date: Fri Jun 4 10:19:20 2010
New Revision: 951350
URL: http://svn.apache.org/viewvc?rev=951350&view=rev
Log:
o moved AvlPartition to xdbm-search module
o removed avl-partition module
o moved AbstractXdbmPartition to its own package to avoid cyclic package dependencies (detected by JDepend)
Added:
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/avl/
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java
- copied, changed from r951322, directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
- copied, changed from r951322, directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
Removed:
directory/apacheds/trunk/avl-partition/
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
Modified:
directory/apacheds/trunk/all/pom.xml
directory/apacheds/trunk/core-annotations/pom.xml
directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
directory/apacheds/trunk/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
directory/apacheds/trunk/ldif-partition/pom.xml
directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/apacheds/trunk/pom.xml
Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=951350&r1=951349&r2=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Fri Jun 4 10:19:20 2010
@@ -31,11 +31,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-avl-partition</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core</artifactId>
</dependency>
Modified: directory/apacheds/trunk/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/pom.xml?rev=951350&r1=951349&r2=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Fri Jun 4 10:19:20 2010
@@ -34,11 +34,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-avl-partition</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core</artifactId>
</dependency>
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=951350&r1=951349&r2=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java Fri Jun 4 10:19:20 2010
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.Set;
import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.avl.AvlPartition;
+import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
import org.apache.directory.shared.ldap.entry.Entry;
Modified: directory/apacheds/trunk/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java?rev=951350&r1=951349&r2=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java (original)
+++ directory/apacheds/trunk/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceAnnotationTest.java Fri Jun 4 10:19:20 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.annotations.CreateIndex;
import org.apache.directory.server.core.annotations.CreatePartition;
import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.avl.AvlPartition;
+import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.junit.Test;
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=951350&r1=951349&r2=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Fri Jun 4 10:19:20 2010
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.xdbm.AbstractXdbmPartition;
+import org.apache.directory.server.core.partition.impl.xdbm.AbstractXdbmPartition;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.search.impl.CursorBuilder;
import org.apache.directory.server.xdbm.search.impl.DefaultOptimizer;
Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=951350&r1=951349&r2=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Fri Jun 4 10:19:20 2010
@@ -33,11 +33,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-avl-partition</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core</artifactId>
</dependency>
Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=951350&r1=951349&r2=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Fri Jun 4 10:19:20 2010
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.avl.AvlPartition;
+import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.Index;
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=951350&r1=951349&r2=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Fri Jun 4 10:19:20 2010
@@ -112,7 +112,6 @@
<module>core-constants</module>
<module>core-integ</module>
<module>core-avl</module>
- <module>avl-partition</module>
<module>ldif-partition</module>
<module>protocol-shared</module>
<module>protocol-ntp</module>
@@ -173,12 +172,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-avl-partition</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-benchmarks</artifactId>
<version>${project.version}</version>
</dependency>
Copied: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java (from r951322, directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java?p2=directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java&p1=directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java&r1=951322&r2=951350&rev=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java Fri Jun 4 10:19:20 2010
@@ -17,14 +17,14 @@
* under the License.
*
*/
-package org.apache.directory.server.core.partition.avl;
+package org.apache.directory.server.core.partition.impl.avl;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.directory.server.xdbm.AbstractXdbmPartition;
+import org.apache.directory.server.core.partition.impl.xdbm.AbstractXdbmPartition;
import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
import org.apache.directory.server.xdbm.impl.avl.AvlStore;
import org.apache.directory.server.xdbm.search.impl.CursorBuilder;
Copied: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java (from r951322, directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java?p2=directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java&p1=directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java&r1=951322&r2=951350&rev=951350&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java Fri Jun 4 10:19:20 2010
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.server.xdbm;
+package org.apache.directory.server.core.partition.impl.xdbm;
import java.util.Iterator;
@@ -33,6 +33,10 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
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.IndexNotFoundException;
+import org.apache.directory.server.xdbm.Store;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
import org.apache.directory.shared.ldap.exception.LdapException;