Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 56562 invoked from network); 25 Mar 2008 00:53:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Mar 2008 00:53:09 -0000 Received: (qmail 51578 invoked by uid 500); 25 Mar 2008 00:53:03 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 51532 invoked by uid 500); 25 Mar 2008 00:53:03 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 51515 invoked by uid 99); 25 Mar 2008 00:53:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Mar 2008 17:53:03 -0700 X-ASF-Spam-Status: No, hits=-1999.6 required=10.0 tests=ALL_TRUSTED,SUBJECT_FUZZY_TION X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Mar 2008 00:52:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D5E641A9842; Mon, 24 Mar 2008 17:52:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r640657 [1/2] - in /directory/sandbox/akarasulu/bigbang/apacheds: bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ btree-base/s... Date: Tue, 25 Mar 2008 00:52:28 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080325005236.D5E641A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Mon Mar 24 17:52:12 2008 New Revision: 640657 URL: http://svn.apache.org/viewvc?rev=640657&view=rev Log: renaming packages in btree-base Added: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java (contents, props changed) - copied, changed from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexEntry.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java (contents, props changed) - copied, changed from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java - copied, changed from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEntry.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java (contents, props changed) - copied, changed from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java (contents, props changed) - copied, changed from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java (contents, props changed) - copied, changed from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexEntry.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java - copied, changed from r640651, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/store/Store.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Table.java (contents, props changed) - copied, changed from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java (contents, props changed) - copied, changed from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java (contents, props changed) - copied, changed from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleRenderer.java Removed: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexEntry.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEntry.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexEntry.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleRenderer.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/store/ Modified: directory/sandbox/akarasulu/bigbang/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeTupleEnumerationTest.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexCursor.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java directory/sandbox/akarasulu/bigbang/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java directory/sandbox/akarasulu/bigbang/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/dumpcmd/DumpCommandExecutor.java directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/DIRSERVER951ITest.java directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/KeyDerivationServiceITest.java directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java directory/sandbox/akarasulu/bigbang/apacheds/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java directory/sandbox/akarasulu/bigbang/apacheds/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexUtils.java Modified: directory/sandbox/akarasulu/bigbang/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Mon Mar 24 17:52:12 2008 @@ -27,8 +27,8 @@ import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerModification; -import org.apache.directory.server.core.partition.impl.btree.Index; -import org.apache.directory.server.core.partition.impl.btree.IndexNotFoundException; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexNotFoundException; 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.schema.SerializableComparator; Modified: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java Mon Mar 24 17:52:12 2008 @@ -20,6 +20,8 @@ package org.apache.directory.server.core.partition.impl.btree; +import org.apache.directory.server.xdbm.IndexEntry; + import javax.naming.NamingException; Modified: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java Mon Mar 24 17:52:12 2008 @@ -20,6 +20,9 @@ package org.apache.directory.server.core.partition.impl.btree; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.IndexEntry; + import java.util.HashMap; import java.util.Map; import java.util.NoSuchElementException; Modified: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java Mon Mar 24 17:52:12 2008 @@ -21,6 +21,9 @@ import org.apache.directory.shared.ldap.NotImplementedException; +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/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java Mon Mar 24 17:52:12 2008 @@ -21,6 +21,7 @@ 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 java.util.Arrays; Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java (from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexEntry.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexEntry.java&r1=640646&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexEntry.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java Mon Mar 24 17:52:12 2008 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.server.core.partition.impl.btree; +package org.apache.directory.server.xdbm; /** Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Mon Mar 24 17:52:12 2008 @@ -0,0 +1,4 @@ +Rev +Revision +Date +Id Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java (from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java&r1=640646&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java Mon Mar 24 17:52:12 2008 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.server.core.partition.impl.btree; +package org.apache.directory.server.xdbm; import java.io.File; Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Index.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Mon Mar 24 17:52:12 2008 @@ -0,0 +1,4 @@ +Rev +Revision +Date +Id Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java (from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEntry.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEntry.java&r1=640646&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEntry.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java Mon Mar 24 17:52:12 2008 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.server.core.partition.impl.btree; +package org.apache.directory.server.xdbm; /** Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java (from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java&r1=640646&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java Mon Mar 24 17:52:12 2008 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.server.core.partition.impl.btree; +package org.apache.directory.server.xdbm; import javax.naming.NamingException; Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java ------------------------------------------------------------------------------ svn:executable = * Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Mon Mar 24 17:52:12 2008 @@ -0,0 +1,4 @@ +Rev +Revision +Date +Id Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java (from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java&r1=640646&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java Mon Mar 24 17:52:12 2008 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.server.core.partition.impl.btree; +package org.apache.directory.server.xdbm; /** Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Mon Mar 24 17:52:12 2008 @@ -0,0 +1,4 @@ +Rev +Revision +Date +Id Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java (from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexEntry.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexEntry.java&r1=640646&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexEntry.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java Mon Mar 24 17:52:12 2008 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.server.core.partition.impl.btree; +package org.apache.directory.server.xdbm; /** Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Mon Mar 24 17:52:12 2008 @@ -0,0 +1,4 @@ +Rev +Revision +Date +Id Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java (from r640651, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/store/Store.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/store/Store.java&r1=640651&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/store/Store.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java Mon Mar 24 17:52:12 2008 @@ -17,15 +17,15 @@ * under the License. * */ -package org.apache.directory.server.xdbm.store; +package org.apache.directory.server.xdbm; import org.apache.directory.server.schema.registries.OidRegistry; import org.apache.directory.server.schema.registries.AttributeTypeRegistry; import org.apache.directory.server.schema.registries.Registries; -import org.apache.directory.server.core.partition.impl.btree.IndexNotFoundException; -import org.apache.directory.server.core.partition.impl.btree.IndexEntry; -import org.apache.directory.server.core.partition.impl.btree.Index; +import org.apache.directory.server.xdbm.IndexNotFoundException; +import org.apache.directory.server.xdbm.IndexEntry; +import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.name.LdapDN; @@ -42,13 +42,60 @@ /** - * TODO doc me! + * Represents an entry store based on the Table, Index, and MasterTable + * database structure. * * @author Apache Directory Project * @version $$Rev$$ */ public interface Store { + /* + * W H Y H A V E A S T O R E I N T E R F A C E ? + * ------------------------------------------------------ + * + * Some may question why we have this Store interface when the Partition + * interface abstracts away partition implementation details in the server + * core. This is due to a complicated chicken and egg problem with the + * additional need to abstract stores for the SearchEngine. This way the + * SearchEngine and it's default implementation can be independent of the + * Partition interface. Once this is achieved the default SearchEngine + * implementation can be removed from the core. This will allow for + * better modularization, with the ability to easily substitute new + * SearchEngine implementations into ApacheDS. + * + * + * H I S T O R Y + * ------------- + * + * Originally the JdbmStore class came about due to a cyclic dependency. + * The bootstrap-partition module is created by the bootstrap-plugin + * module. The core depends on the bootstrap-partition module to + * bootstrap the server. The bootstrap-partition module depends on the + * bootstrap-plugin which builds a JdbmStore stuffing it with all the + * information needed for the server to bootstrap. The bootstrap-plugin + * hence must be built before it can generate the bootstrap-partition and + * it cannot have a dependency on the core. We could not use the + * JdbmPartition because it depends on the Partition interface and this + * is an integral part of the core. If we did then there would be a + * cyclic dependency between modules in the apacheds pom. To avoid this + * the JdbmStore class was created and the guts of the JDBM partition were + * put into the jdbm-store module. This jdbm-store module does not depend + * on core and can be used by the bootstrap-plugin to build the + * bootstrap-partition. + * + * Hence it's project dependencies that drove the creation of the + * JdbmStore class. Later we realized, the default SeachEngine used by + * all Table, Index, MasterTable scheme based partitions depends on + * BTreePartition which depends on Partition. We would like to remove + * this search engine out of the core so it can easily be swapped out, + * but most importantly so we can have the search depend on any kind of + * store. There's no reason why the SearchEngine should depend on a + * Partition (store with search capabilities) when it just needs a simple + * store and it's indices to conduct search operations. + */ + + void setWorkingDirectory( File workingDirectory ); Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Table.java (from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Table.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Table.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java&r1=640646&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Table.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Table.java Mon Mar 24 17:52:12 2008 @@ -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.core.cursor.Cursor; Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Table.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Table.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Mon Mar 24 17:52:12 2008 @@ -0,0 +1,4 @@ +Rev +Revision +Date +Id Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java (from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java&r1=640646&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java Mon Mar 24 17:52:12 2008 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.server.core.partition.impl.btree; +package org.apache.directory.server.xdbm; /** Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Tuple.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Mon Mar 24 17:52:12 2008 @@ -0,0 +1,4 @@ +Rev +Revision +Date +Id Copied: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java (from r640646, directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleRenderer.java) URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleRenderer.java&r1=640646&r2=640657&rev=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleRenderer.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java Mon Mar 24 17:52:12 2008 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.server.core.partition.impl.btree; +package org.apache.directory.server.xdbm; /** Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/TupleRenderer.java ------------------------------------------------------------------------------ --- svn:keywords (added) +++ svn:keywords Mon Mar 24 17:52:12 2008 @@ -0,0 +1,4 @@ +Rev +Revision +Date +Id Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Mon Mar 24 17:52:12 2008 @@ -31,7 +31,7 @@ import org.apache.directory.server.core.integ.annotations.Factory; import org.apache.directory.server.core.integ.annotations.CleanupLevel; import org.apache.directory.server.core.partition.Partition; -import org.apache.directory.server.core.partition.impl.btree.Index; +import org.apache.directory.server.xdbm.Index; 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.shared.ldap.exception.LdapNameNotFoundException; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java Mon Mar 24 17:52:12 2008 @@ -31,7 +31,7 @@ import org.apache.directory.server.core.integ.Level; import org.apache.directory.server.core.integ.annotations.Factory; import org.apache.directory.server.core.integ.annotations.CleanupLevel; -import org.apache.directory.server.core.partition.impl.btree.Index; +import org.apache.directory.server.xdbm.Index; 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.shared.ldap.message.AttributeImpl; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Mon Mar 24 17:52:12 2008 @@ -52,7 +52,7 @@ 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.BTreePartition; -import org.apache.directory.server.core.partition.impl.btree.Index; +import org.apache.directory.server.xdbm.Index; 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.referral.ReferralInterceptor; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Mar 24 17:52:12 2008 @@ -47,7 +47,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.interceptor.context.UnbindOperationContext; -import org.apache.directory.server.core.partition.impl.btree.Index; +import org.apache.directory.server.xdbm.Index; 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.tree.BranchNode; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Mon Mar 24 17:52:12 2008 @@ -40,6 +40,9 @@ 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.ForwardIndexEntry; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexNotFoundException; import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException; import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException; import org.apache.directory.shared.ldap.message.AttributesImpl; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Mon Mar 24 17:52:12 2008 @@ -35,6 +35,8 @@ import org.apache.directory.server.core.entry.ServerSearchResult; import org.apache.directory.server.core.enumeration.SearchResultEnumeration; import org.apache.directory.server.schema.registries.Registries; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java Mon Mar 24 17:52:12 2008 @@ -41,6 +41,7 @@ import org.apache.directory.shared.ldap.filter.ScopeNode; import org.apache.directory.shared.ldap.filter.SimpleNode; import org.apache.directory.shared.ldap.filter.SubstringNode; +import org.apache.directory.server.xdbm.Index; /** Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java Mon Mar 24 17:52:12 2008 @@ -31,6 +31,8 @@ import org.apache.directory.shared.ldap.filter.ScopeNode; import org.apache.directory.shared.ldap.message.AliasDerefMode; import org.apache.directory.shared.ldap.name.LdapDN; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.IndexEntry; /** Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java Mon Mar 24 17:52:12 2008 @@ -20,6 +20,9 @@ package org.apache.directory.server.core.partition.impl.btree; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.IndexEntry; + import java.util.HashMap; import java.util.Map; import java.util.NoSuchElementException; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java Mon Mar 24 17:52:12 2008 @@ -23,6 +23,7 @@ import javax.naming.NamingException; import org.apache.directory.shared.ldap.filter.ExprNode; +import org.apache.directory.server.xdbm.IndexEntry; /** Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java Mon Mar 24 17:52:12 2008 @@ -26,6 +26,9 @@ import javax.naming.NamingException; import org.apache.directory.server.schema.registries.AttributeTypeRegistry; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.shared.ldap.NotImplementedException; import org.apache.directory.shared.ldap.filter.AndNode; import org.apache.directory.shared.ldap.filter.ApproximateNode; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java Mon Mar 24 17:52:12 2008 @@ -23,6 +23,7 @@ import javax.naming.NamingException; import org.apache.directory.server.schema.registries.Registries; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.shared.ldap.filter.AndNode; import org.apache.directory.shared.ldap.filter.BranchNode; import org.apache.directory.shared.ldap.filter.ExprNode; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java Mon Mar 24 17:52:12 2008 @@ -29,6 +29,8 @@ import javax.naming.directory.Attributes; import org.apache.directory.server.schema.registries.Registries; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.shared.ldap.NotImplementedException; import org.apache.directory.shared.ldap.filter.ApproximateNode; import org.apache.directory.shared.ldap.filter.EqualityNode; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java Mon Mar 24 17:52:12 2008 @@ -27,6 +27,9 @@ import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.ScopeNode; import org.apache.directory.shared.ldap.util.SingletonEnumeration; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexEntry; /** @@ -228,7 +231,7 @@ * Returns true if the candidate with id is a descendant of the base, * false otherwise. * - * @see org.apache.directory.server.core.partition.impl.btree.IndexAssertion#assertCandidate(IndexEntry) + * @see org.apache.directory.server.core.partition.impl.btree.IndexAssertion#assertCandidate(org.apache.directory.server.xdbm.IndexEntry) */ public boolean assertCandidate( IndexEntry entry ) throws NamingException { Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java Mon Mar 24 17:52:12 2008 @@ -26,6 +26,8 @@ import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.ScopeNode; import org.apache.directory.shared.ldap.message.AliasDerefMode; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexEntry; /** @@ -52,7 +54,7 @@ /** - * @see org.apache.directory.server.core.partition.impl.btree.Evaluator#evaluate(ExprNode, IndexEntry) + * @see org.apache.directory.server.core.partition.impl.btree.Evaluator#evaluate(ExprNode, org.apache.directory.server.xdbm.IndexEntry) */ public boolean evaluate( ExprNode node, IndexEntry entry ) throws NamingException { Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java Mon Mar 24 17:52:12 2008 @@ -27,6 +27,9 @@ import javax.naming.NamingException; import org.apache.directory.server.schema.registries.AttributeTypeRegistry; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.SubstringNode; import org.apache.directory.shared.ldap.schema.AttributeType; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java Mon Mar 24 17:52:12 2008 @@ -30,6 +30,8 @@ import javax.naming.directory.Attributes; import org.apache.directory.server.schema.registries.Registries; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.SubstringNode; import org.apache.directory.shared.ldap.schema.AttributeType; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java Mon Mar 24 17:52:12 2008 @@ -33,9 +33,9 @@ import javax.swing.tree.TreeNode; import org.apache.directory.server.core.partition.impl.btree.BTreePartition; -import org.apache.directory.server.core.partition.impl.btree.ForwardIndexEntry; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.core.partition.impl.btree.SearchEngine; -import org.apache.directory.server.core.partition.impl.btree.IndexEntry; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.name.LdapDN; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java Mon Mar 24 17:52:12 2008 @@ -44,10 +44,10 @@ import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; -import org.apache.directory.server.core.partition.impl.btree.Index; -import org.apache.directory.server.core.partition.impl.btree.IndexEntry; -import org.apache.directory.server.core.partition.impl.btree.ForwardIndexEntry; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.core.cursor.Cursor; +import org.apache.directory.server.xdbm.ForwardIndexEntry; +import org.apache.directory.server.xdbm.Index; import org.apache.directory.shared.ldap.util.ExceptionUtils; import org.apache.directory.shared.ldap.NotImplementedException; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Mon Mar 24 17:52:12 2008 @@ -65,8 +65,8 @@ import org.apache.directory.server.core.entry.ServerEntryUtils; import org.apache.directory.server.core.interceptor.context.AddOperationContext; import org.apache.directory.server.core.partition.impl.btree.BTreePartition; -import org.apache.directory.server.core.partition.impl.btree.Index; -import org.apache.directory.server.core.partition.impl.btree.IndexEntry; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Mon Mar 24 17:52:12 2008 @@ -36,8 +36,8 @@ import org.apache.directory.server.core.partition.impl.btree.DefaultSearchEngine; import org.apache.directory.server.core.partition.impl.btree.ExpressionEnumerator; import org.apache.directory.server.core.partition.impl.btree.ExpressionEvaluator; -import org.apache.directory.server.core.partition.impl.btree.Index; -import org.apache.directory.server.core.partition.impl.btree.IndexNotFoundException; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexNotFoundException; import org.apache.directory.server.core.partition.impl.btree.NoOpOptimizer; import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeTupleEnumerationTest.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeTupleEnumerationTest.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeTupleEnumerationTest.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeTupleEnumerationTest.java Mon Mar 24 17:52:12 2008 @@ -29,7 +29,7 @@ import jdbm.btree.BTree; import jdbm.recman.BaseRecordManager; -import org.apache.directory.server.core.partition.impl.btree.Tuple; +import org.apache.directory.server.xdbm.Tuple; import org.apache.directory.shared.ldap.util.LongComparator; //import org.apache.directory.shared.ldap.util.BigIntegerComparator; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java Mon Mar 24 17:52:12 2008 @@ -26,7 +26,7 @@ import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import org.apache.directory.server.core.partition.impl.btree.Tuple; +import org.apache.directory.server.xdbm.Tuple; import org.apache.directory.server.core.partition.impl.btree.TupleComparator; import org.apache.directory.server.schema.SerializableComparator; import org.apache.directory.shared.ldap.util.ArrayEnumeration; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java Mon Mar 24 17:52:12 2008 @@ -26,7 +26,7 @@ import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import org.apache.directory.server.core.partition.impl.btree.Tuple; +import org.apache.directory.server.xdbm.Tuple; import org.apache.directory.server.core.partition.impl.btree.TupleComparator; import org.apache.directory.server.schema.SerializableComparator; import org.apache.directory.shared.ldap.util.ArrayEnumeration; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java Mon Mar 24 17:52:12 2008 @@ -26,8 +26,8 @@ import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import org.apache.directory.server.core.partition.impl.btree.Tuple; -import org.apache.directory.server.core.partition.impl.btree.TupleRenderer; +import org.apache.directory.server.xdbm.Tuple; +import org.apache.directory.server.xdbm.TupleRenderer; import org.apache.directory.server.schema.SerializableComparator; import org.apache.directory.shared.ldap.util.ArrayEnumeration; import org.apache.directory.shared.ldap.util.LongComparator; Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java Mon Mar 24 17:52:12 2008 @@ -24,7 +24,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.partition.impl.btree.Index; +import org.apache.directory.server.xdbm.Index; 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.schema.SerializableComparator; Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java Mon Mar 24 17:52:12 2008 @@ -22,7 +22,7 @@ import org.apache.directory.server.core.cursor.InvalidCursorPositionException; import org.apache.directory.server.core.cursor.AbstractCursor; -import org.apache.directory.server.core.partition.impl.btree.Tuple; +import org.apache.directory.server.xdbm.Tuple; import jdbm.helper.TupleBrowser; import java.io.IOException; Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java Mon Mar 24 17:52:12 2008 @@ -8,7 +8,7 @@ import org.apache.directory.server.core.cursor.AbstractCursor; 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.Tuple; +import org.apache.directory.server.xdbm.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexCursor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexCursor.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexCursor.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/IndexCursor.java Mon Mar 24 17:52:12 2008 @@ -20,10 +20,9 @@ package org.apache.directory.server.core.partition.impl.btree.jdbm; -import org.apache.directory.server.core.partition.impl.btree.IndexEntry; -import org.apache.directory.server.core.partition.impl.btree.Tuple; -import org.apache.directory.server.core.partition.impl.btree.ForwardIndexEntry; -import org.apache.directory.server.core.partition.impl.btree.ReverseIndexEntry; +import org.apache.directory.server.xdbm.Tuple; +import org.apache.directory.server.xdbm.IndexEntry; +import org.apache.directory.server.xdbm.*; import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.core.cursor.CursorIterator; Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Mon Mar 24 17:52:12 2008 @@ -27,11 +27,13 @@ import org.apache.directory.server.core.partition.impl.btree.*; import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.schema.SerializableComparator; +import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexEntry; +import org.apache.directory.server.xdbm.Tuple; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.util.SynchronizedLRUMap; import javax.naming.NamingException; -import javax.naming.directory.Attributes; import java.io.File; import java.io.IOException; @@ -219,7 +221,7 @@ /** - * @see org.apache.directory.server.core.partition.impl.btree.Index#getAttribute() + * @see org.apache.directory.server.xdbm.Index#getAttribute() */ public AttributeType getAttribute() { @@ -357,7 +359,7 @@ /** - * @see Index#count() + * @see org.apache.directory.server.xdbm.Index#count() */ public int count() throws IOException { @@ -381,7 +383,7 @@ /** - * @see org.apache.directory.server.core.partition.impl.btree.Index#lessThanCount(java.lang.Object) + * @see org.apache.directory.server.xdbm.Index#lessThanCount(java.lang.Object) */ public int lessThanCount( K attrVal ) throws Exception { @@ -404,7 +406,7 @@ /** - * @see Index#reverseLookup(Long) + * @see org.apache.directory.server.xdbm.Index#reverseLookup(Long) */ public K reverseLookup( Long id ) throws Exception { @@ -515,7 +517,7 @@ /** - * @see Index#hasGreaterOrEqual(Object, Long) + * @see org.apache.directory.server.xdbm.Index#hasGreaterOrEqual(Object, Long) */ public boolean hasGreaterOrEqual( K attrVal, Long id ) throws Exception { @@ -524,7 +526,7 @@ /** - * @see Index#hasLessOrEqual(Object, Long) + * @see org.apache.directory.server.xdbm.Index#hasLessOrEqual(Object, Long) */ public boolean hasLessOrEqual( K attrVal, Long id ) throws Exception { @@ -538,7 +540,7 @@ /** - * @see Index#close() + * @see org.apache.directory.server.xdbm.Index#close() */ public synchronized void close() throws IOException { Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java Mon Mar 24 17:52:12 2008 @@ -24,7 +24,7 @@ import jdbm.helper.LongSerializer; import jdbm.helper.StringComparator; import jdbm.helper.Serializer; -import org.apache.directory.server.core.partition.impl.btree.MasterTable; +import org.apache.directory.server.xdbm.MasterTable; import org.apache.directory.server.schema.SerializableComparator; import java.io.IOException; Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Mon Mar 24 17:52:12 2008 @@ -34,7 +34,8 @@ import org.apache.directory.server.schema.registries.AttributeTypeRegistry; import org.apache.directory.server.schema.registries.OidRegistry; import org.apache.directory.server.schema.registries.Registries; -import org.apache.directory.server.xdbm.store.Store; +import org.apache.directory.server.xdbm.Store; +import org.apache.directory.server.xdbm.*; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Mon Mar 24 17:52:12 2008 @@ -28,9 +28,8 @@ import org.apache.directory.server.core.cursor.Cursor; import org.apache.directory.server.core.cursor.EmptyCursor; import org.apache.directory.server.core.cursor.SingletonCursor; -import org.apache.directory.server.core.partition.impl.btree.*; -import org.apache.directory.server.core.partition.impl.btree.Tuple; import org.apache.directory.server.schema.SerializableComparator; +import org.apache.directory.server.xdbm.*; import org.apache.directory.shared.ldap.util.SynchronizedLRUMap; import java.io.IOException; @@ -258,7 +257,7 @@ /** - * @see org.apache.directory.server.core.partition.impl.btree.Table#isDupsEnabled() + * @see org.apache.directory.server.xdbm.Table#isDupsEnabled() */ public boolean isDupsEnabled() { @@ -267,7 +266,7 @@ /** - * @see org.apache.directory.server.core.partition.impl.btree.Table#getName() + * @see org.apache.directory.server.xdbm.Table#getName() */ public String getName() { @@ -276,7 +275,7 @@ /** - * @see org.apache.directory.server.core.partition.impl.btree.Table#getRenderer() + * @see org.apache.directory.server.xdbm.Table#getRenderer() */ public TupleRenderer getRenderer() { @@ -325,7 +324,7 @@ /** - * @see Table#count(java.lang.Object) + * @see org.apache.directory.server.xdbm.Table#count(java.lang.Object) */ public int count( K key ) throws IOException { @@ -357,7 +356,7 @@ /** - * @see org.apache.directory.server.core.partition.impl.btree.Table#count() + * @see org.apache.directory.server.xdbm.Table#count() */ public int count() throws IOException { @@ -469,7 +468,7 @@ /** - * @see Table#hasGreaterOrEqual(Object) + * @see org.apache.directory.server.xdbm.Table#hasGreaterOrEqual(Object) */ public boolean hasGreaterOrEqual( K key ) throws IOException { @@ -543,7 +542,7 @@ /** - * @see org.apache.directory.server.core.partition.impl.btree.Table#has(java.lang.Object, + * @see org.apache.directory.server.xdbm.Table#has(java.lang.Object, * java.lang.Object) */ public boolean has( K key, V value ) throws IOException @@ -580,7 +579,7 @@ /** - * @see org.apache.directory.server.core.partition.impl.btree.Table#put(java.lang.Object, + * @see org.apache.directory.server.xdbm.Table#put(java.lang.Object, * java.lang.Object) */ @SuppressWarnings("unchecked") @@ -643,7 +642,7 @@ /** - * @see Table#remove(java.lang.Object, + * @see org.apache.directory.server.xdbm.Table#remove(java.lang.Object, * java.lang.Object) */ public V remove( K key, V value ) throws IOException @@ -756,7 +755,7 @@ } - public Cursor> cursor() throws Exception + public Cursor> cursor() throws Exception { if ( allowsDuplicates ) { @@ -767,24 +766,24 @@ } - public Cursor> cursor( K key ) throws Exception + public Cursor> cursor( K key ) throws Exception { if ( key == null ) { - return new EmptyCursor>(); + return new EmptyCursor>(); } Object raw = bt.find( key ); if ( null == raw ) { - return new EmptyCursor>(); + return new EmptyCursor>(); } if ( ! allowsDuplicates ) { //noinspection unchecked - return new SingletonCursor>( new Tuple( key, ( V ) raw ) ); + return new SingletonCursor>( new org.apache.directory.server.xdbm.Tuple( key, ( V ) raw ) ); } byte[] serialized = ( byte[] ) raw; Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java?rev=640657&r1=640656&r2=640657&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java Mon Mar 24 17:52:12 2008 @@ -21,7 +21,7 @@ import org.apache.directory.server.core.cursor.AbstractCursor; import org.apache.directory.server.core.cursor.InvalidCursorPositionException; -import org.apache.directory.server.core.partition.impl.btree.Tuple; +import org.apache.directory.server.xdbm.Tuple; import org.apache.directory.server.core.avltree.AvlTree; import org.apache.directory.server.core.avltree.AvlTreeCursor;