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/05/19 22:00:59 UTC
svn commit: r946362 [1/2] - in /directory/apacheds/trunk: ./ all/
avl-partition/
avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/
avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/
core-annotations/sr...
Author: seelmann
Date: Wed May 19 20:00:56 2010
New Revision: 946362
URL: http://svn.apache.org/viewvc?rev=946362&view=rev
Log:
DIRSERVER-1505 (Merge XDBM modules): merged xdbm-refactoring branch back to trunk
Added:
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/
- copied from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/
- copied from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/
- copied from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/
- copied from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultTupleComparator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/ForwardIndexComparator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/ReverseIndexComparator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/ServerEntryCursorAdaptor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/TupleComparator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/Index.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/Index.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/MasterTable.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/MasterTable.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/Store.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/StoreUtils.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/StoreUtils.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/Table.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/Table.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/
- copied from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/
- copied from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java
directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/ForwardIndexEntryTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/ForwardIndexEntryTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/IndexNotFoundExceptionTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/IndexNotFoundExceptionTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/TupleTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/TupleTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/
- copied from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/
- copied from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java
- copied unchanged from r946347, directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java
Removed:
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlIndex.java
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlRdnIndex.java
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTable.java
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlTableDupsCursor.java
directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlTableTest.java
directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/TableData.java
directory/apacheds/trunk/xdbm-base/
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
Modified:
directory/apacheds/trunk/ (props changed)
directory/apacheds/trunk/all/pom.xml
directory/apacheds/trunk/avl-partition/ (props changed)
directory/apacheds/trunk/avl-partition/pom.xml
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
directory/apacheds/trunk/core-avl/pom.xml
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed)
directory/apacheds/trunk/default-config/src/main/resources/ (props changed)
directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed)
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ (props changed)
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (props changed)
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/ (props changed)
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (props changed)
directory/apacheds/trunk/jdbm-store/pom.xml
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
directory/apacheds/trunk/pom.xml
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (props changed)
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
directory/apacheds/trunk/test-framework/ (props changed)
directory/apacheds/trunk/xdbm-search/pom.xml
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
directory/apacheds/trunk/xdbm-tools/pom.xml
Propchange: directory/apacheds/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,2 +1,3 @@
/directory/apacheds/branches/apacheds-replication:749790-764110
/directory/apacheds/branches/apacheds-schema:806623-896441
+/directory/apacheds/branches/xdbm-refactoring:945827-946347
Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Wed May 19 20:00:56 2010
@@ -203,12 +203,6 @@
</dependency>
<dependency>
- <artifactId>apacheds-xdbm-base</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<artifactId>apacheds-xdbm-search</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
Propchange: directory/apacheds/trunk/avl-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,3 +1,4 @@
/directory/apacheds/branches/apacheds-replication/avl-partition:749790-764110
-/directory/apacheds/branches/apacheds-schema/avl-partition:806623-896441
-/directory/apacheds/trunk/avl-partition:806623-894866
+/directory/apacheds/branches/apacheds-schema/avl-partition:806623-809116
+/directory/apacheds/branches/xdbm-refactoring/avl-partition:945827-946347
+/directory/apacheds/trunk/avl-partition:498338-580500,806623-894866
Modified: directory/apacheds/trunk/avl-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/pom.xml?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/pom.xml (original)
+++ directory/apacheds/trunk/avl-partition/pom.xml Wed May 19 20:00:56 2010
@@ -58,13 +58,6 @@
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <artifactId>apacheds-xdbm-tools</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: 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/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java Wed May 19 20:00:56 2010
@@ -26,6 +26,8 @@ import java.util.Set;
import org.apache.directory.server.xdbm.AbstractXdbmPartition;
import org.apache.directory.server.xdbm.Index;
+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;
import org.apache.directory.server.xdbm.search.impl.DefaultOptimizer;
import org.apache.directory.server.xdbm.search.impl.DefaultSearchEngine;
@@ -121,7 +123,7 @@ public class AvlPartition extends Abstra
*/
public AvlStore<Entry> getStore()
{
- return ( AvlStore<Entry> ) store;
+ return (org.apache.directory.server.xdbm.impl.avl.AvlStore<Entry> ) store;
}
}
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=946362&r1=946361&r2=946362&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 Wed May 19 20:00:56 2010
@@ -23,9 +23,9 @@ import java.io.File;
import java.util.Set;
import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.avl.AvlIndex;
import org.apache.directory.server.core.partition.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/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java Wed May 19 20:00:56 2010
@@ -23,9 +23,9 @@ import java.io.File;
import java.util.Set;
import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.core.partition.avl.AvlIndex;
import org.apache.directory.server.core.partition.ldif.LdifPartition;
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-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/pom.xml?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/pom.xml (original)
+++ directory/apacheds/trunk/core-avl/pom.xml Wed May 19 20:00:56 2010
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <artifactId>apacheds-xdbm-base</artifactId>
+ <artifactId>apacheds-i18n</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java Wed May 19 20:00:56 2010
@@ -22,8 +22,8 @@ package org.apache.directory.server.core
import java.util.Comparator;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java Wed May 19 20:00:56 2010
@@ -19,8 +19,8 @@
*/
package org.apache.directory.server.core.avltree;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java Wed May 19 20:00:56 2010
@@ -20,8 +20,8 @@ package org.apache.directory.server.core
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
Modified: directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java (original)
+++ directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsCursorTest.java Wed May 19 20:00:56 2010
@@ -28,7 +28,7 @@ import static org.junit.Assert.fail;
import java.util.Comparator;
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
import org.junit.Before;
import org.junit.Test;
Propchange: directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,2 +1,3 @@
/directory/apacheds/branches/apacheds-replication/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:749790-764110
/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:806623-896441
+/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
Propchange: directory/apacheds/trunk/default-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -3,3 +3,4 @@
/directory/apacheds/branches/apacheds-replication/default-config/src/main/resources:749790-764110
/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/resources:806623-896441
/directory/apacheds/branches/apacheds-schema/default-config/src/main/resources:806623-896441
+/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
Propchange: directory/apacheds/trunk/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,3 +1,4 @@
/directory/apacheds/branches/apacheds-replication/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:749790-764110
/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:806623-896441
/directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
+/directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,3 +1,4 @@
/directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:749790-764110
-/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-896441
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-894866*
+/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-810034
+/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*
Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,2 +1,3 @@
/directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:749790-764110
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:806623-894866
+/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866
Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,3 +1,4 @@
/directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:749790-764110
-/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-896441
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-894866*
+/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-810034
+/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:945827-946347
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*
Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,3 +1,4 @@
/directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:749790-764110
-/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-896441
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-894866
+/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-810034
+/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866
Modified: directory/apacheds/trunk/jdbm-store/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/pom.xml?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-store/pom.xml Wed May 19 20:00:56 2010
@@ -61,10 +61,9 @@
</dependency>
<dependency>
- <artifactId>apacheds-xdbm-tools</artifactId>
+ <artifactId>apacheds-xdbm-search</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java Wed May 19 20:00:56 2010
@@ -21,9 +21,9 @@ package org.apache.directory.server.core
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import jdbm.helper.TupleBrowser;
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java Wed May 19 20:00:56 2010
@@ -24,10 +24,10 @@ import jdbm.btree.BTree;
import org.apache.directory.server.core.avltree.ArrayTree;
import org.apache.directory.server.core.avltree.ArrayTreeCursor;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Wed May 19 20:00:56 2010
@@ -35,8 +35,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexCursor;
-import org.apache.directory.server.xdbm.Tuple;
import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.entry.BinaryValue;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.MatchingRule;
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Wed May 19 20:00:56 2010
@@ -883,7 +883,7 @@ public class JdbmTable<K,V> implements T
}
- public Cursor<org.apache.directory.server.xdbm.Tuple<K,V>> cursor() throws Exception
+ public Cursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>> cursor() throws Exception
{
if ( allowsDuplicates )
{
@@ -895,23 +895,23 @@ public class JdbmTable<K,V> implements T
@SuppressWarnings("unchecked")
- public Cursor<org.apache.directory.server.xdbm.Tuple<K,V>> cursor( K key ) throws Exception
+ public Cursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>> cursor( K key ) throws Exception
{
if ( key == null )
{
- return new EmptyCursor<org.apache.directory.server.xdbm.Tuple<K,V>>();
+ return new EmptyCursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>>();
}
V raw = bt.find( key );
if ( null == raw )
{
- return new EmptyCursor<org.apache.directory.server.xdbm.Tuple<K,V>>();
+ return new EmptyCursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>>();
}
if ( ! allowsDuplicates )
{
- return new SingletonCursor<org.apache.directory.server.xdbm.Tuple<K,V>>( new org.apache.directory.server.xdbm.Tuple<K,V>( key, ( V ) raw ) );
+ return new SingletonCursor<org.apache.directory.shared.ldap.cursor.Tuple<K,V>>( new org.apache.directory.shared.ldap.cursor.Tuple<K,V>( key, ( V ) raw ) );
}
byte[] serialized = ( byte[] ) raw;
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java Wed May 19 20:00:56 2010
@@ -19,12 +19,12 @@
package org.apache.directory.server.core.partition.impl.btree.jdbm;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
import org.apache.directory.server.core.avltree.ArrayTree;
import org.apache.directory.server.core.avltree.ArrayTreeCursor;
import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
/**
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java Wed May 19 20:00:56 2010
@@ -20,9 +20,9 @@ package org.apache.directory.server.core
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import java.util.Comparator;
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java Wed May 19 20:00:56 2010
@@ -20,9 +20,9 @@ package org.apache.directory.server.core
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.AbstractTupleCursor;
+import org.apache.directory.shared.ldap.cursor.AbstractTupleCursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import java.io.IOException;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Wed May 19 20:00:56 2010
@@ -31,10 +31,10 @@ import jdbm.RecordManager;
import jdbm.helper.DefaultSerializer;
import jdbm.recman.BaseRecordManager;
-import org.apache.directory.server.xdbm.Tuple;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java Wed May 19 20:00:56 2010
@@ -32,10 +32,10 @@ import jdbm.helper.DefaultSerializer;
import jdbm.recman.BaseRecordManager;
import org.apache.directory.server.xdbm.Table;
-import org.apache.directory.server.xdbm.Tuple;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Wed May 19 20:00:56 2010
@@ -42,7 +42,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.IndexNotFoundException;
-import org.apache.directory.server.xdbm.tools.StoreUtils;
+import org.apache.directory.server.xdbm.StoreUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.Cursor;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Wed May 19 20:00:56 2010
@@ -33,9 +33,9 @@ import jdbm.helper.DefaultSerializer;
import jdbm.helper.IntegerSerializer;
import jdbm.recman.BaseRecordManager;
-import org.apache.directory.server.xdbm.Tuple;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java Wed May 19 20:00:56 2010
@@ -25,8 +25,8 @@ import static junit.framework.Assert.ass
import java.util.Comparator;
import org.apache.directory.server.core.avltree.ArrayTree;
-import org.apache.directory.server.xdbm.Tuple;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.junit.Before;
import org.junit.Test;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Wed May 19 20:00:56 2010
@@ -32,9 +32,9 @@ import jdbm.btree.BTree;
import jdbm.helper.DefaultSerializer;
import jdbm.recman.BaseRecordManager;
-import org.apache.directory.server.xdbm.Tuple;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Wed May 19 20:00:56 2010
@@ -31,10 +31,10 @@ import jdbm.RecordManager;
import jdbm.recman.BaseRecordManager;
import org.apache.directory.server.xdbm.Table;
-import org.apache.directory.server.xdbm.Tuple;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Wed May 19 20:00:56 2010
@@ -495,7 +495,6 @@
<module>jdbm</module>
<module>jdbm-store</module>
<module>jdbm-partition</module>
- <module>xdbm-base</module>
<module>xdbm-search</module>
<module>xdbm-tools</module>
<module>core</module>
Propchange: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,2 +1,3 @@
/directory/apacheds/branches/apacheds-replication/syncrepl/src/main/java/org/apache/directory/server/syncrepl/SyncReplConsumer.java:749790-764110
/directory/apacheds/branches/apacheds-schema/syncrepl/src/main/java/org/apache/directory/server/syncrepl/SyncReplConsumer.java:806623-896441
+/directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Wed May 19 20:00:56 2010
@@ -44,9 +44,9 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmMasterTable;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
import org.apache.directory.shared.ldap.MultiException;
import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java Wed May 19 20:00:56 2010
@@ -35,9 +35,9 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmMasterTable;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Tuple;
import org.apache.directory.server.xdbm.tools.IndexUtils;
import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
Propchange: directory/apacheds/trunk/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 20:00:56 2010
@@ -1,3 +1,4 @@
/directory/apacheds/branches/apacheds-replication/apacheds-test-framework:749790-764110
/directory/apacheds/branches/apacheds-replication/test-framework:749790-764110
/directory/apacheds/branches/apacheds-schema/test-framework:806623-896441
+/directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
Modified: directory/apacheds/trunk/xdbm-search/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/pom.xml?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-search/pom.xml Wed May 19 20:00:56 2010
@@ -33,23 +33,15 @@
<dependencies>
<dependency>
- <artifactId>apacheds-xdbm-base</artifactId>
+ <artifactId>apacheds-core-avl</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <artifactId>apacheds-jdbm-store</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
+
<dependency>
- <artifactId>apacheds-xdbm-tools</artifactId>
+ <artifactId>apacheds-core-api</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Wed May 19 20:00:56 2010
@@ -30,13 +30,13 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.IndexCursor;
import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.StoreUtils;
+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.Evaluator;
-import org.apache.directory.server.xdbm.tools.StoreUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.entry.Entry;
@@ -129,14 +129,14 @@ public class AndCursorTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<Entry>();
+ store = new AvlStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( false );
- store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Wed May 19 20:00:56 2010
@@ -34,18 +34,18 @@ import java.util.Set;
import java.util.UUID;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.tools.StoreUtils;
+import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.filter.GreaterEqNode;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -129,15 +129,15 @@ public class GreaterEqTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<Entry>();
+ store = new AvlStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( false );
- store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
- store.addIndex( new JdbmIndex( SchemaConstants.POSTALCODE_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.POSTALCODE_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
LOG.debug( "Created new store" );
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Wed May 19 20:00:56 2010
@@ -34,15 +34,15 @@ import java.util.Set;
import java.util.UUID;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.xdbm.tools.StoreUtils;
+import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.cursor.Tuple;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.StringValue;
@@ -129,15 +129,15 @@ public class LessEqTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<Entry>();
+ store = new AvlStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( false );
- store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
- store.addIndex( new JdbmIndex( SchemaConstants.POSTALCODE_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.POSTALCODE_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
LOG.debug( "Created new store" );
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Wed May 19 20:00:56 2010
@@ -30,13 +30,12 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
import org.apache.directory.server.xdbm.IndexCursor;
import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.server.xdbm.StoreUtils;
+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.Optimizer;
-import org.apache.directory.server.xdbm.tools.StoreUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -48,7 +47,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer;
-import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSyntaxChecker;
import org.apache.directory.shared.ldap.schema.syntaxCheckers.UuidSyntaxChecker;
import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
import org.junit.After;
@@ -129,14 +127,14 @@ public class NestedFilterTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<Entry>();
+ store = new AvlStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( false );
- store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Wed May 19 20:00:56 2010
@@ -30,15 +30,14 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.IndexCursor;
import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.StoreUtils;
+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.Evaluator;
-import org.apache.directory.server.xdbm.tools.StoreUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -50,8 +49,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSidSyntaxChecker;
-import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSyntaxChecker;
import org.apache.directory.shared.ldap.schema.syntaxCheckers.UuidSyntaxChecker;
import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
import org.junit.After;
@@ -129,14 +126,14 @@ public class NotCursorTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<Entry>();
+ store = new AvlStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( false );
- store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Wed May 19 20:00:56 2010
@@ -30,12 +30,12 @@ import java.io.File;
import java.util.UUID;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.tools.StoreUtils;
+import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.csn.CsnFactory;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
@@ -121,14 +121,14 @@ public class OneLevelScopeTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<Entry>();
+ store = new AvlStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( true );
- store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
LOG.debug( "Created new store" );
}
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Wed May 19 20:00:56 2010
@@ -30,14 +30,14 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.IndexCursor;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.StoreUtils;
+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.Evaluator;
-import org.apache.directory.server.xdbm.tools.StoreUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
@@ -128,14 +128,14 @@ public class OrCursorTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<Entry>();
+ store = new AvlStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( false );
- store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
evaluatorBuilder = new EvaluatorBuilder( store, schemaManager );
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=946362&r1=946361&r2=946362&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Wed May 19 20:00:56 2010
@@ -32,11 +32,11 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.tools.StoreUtils;
+import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.entry.Entry;
@@ -116,14 +116,14 @@ public class PresenceTest
wkdir.mkdirs();
// initialize the store
- store = new JdbmStore<Entry>();
+ store = new AvlStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
store.setPartitionDir( wkdir );
store.setSyncOnWrite( false );
- store.addIndex( new JdbmIndex( SchemaConstants.OU_AT_OID ) );
- store.addIndex( new JdbmIndex( SchemaConstants.CN_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.OU_AT_OID ) );
+ store.addIndex( new AvlIndex( SchemaConstants.CN_AT_OID ) );
StoreUtils.loadExampleData( store, schemaManager );
LOG.debug( "Created new store" );
}