You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/11/06 23:03:18 UTC
svn commit: r1406368 [1/3] - in /activemq/trunk: ./ activemq-all/
activemq-core/ activemq-core/src/main/java/org/apache/kahadb/
activemq-core/src/main/java/org/apache/kahadb/index/
activemq-core/src/main/java/org/apache/kahadb/journal/ activemq-core/sr...
Author: chirino
Date: Tue Nov 6 22:03:14 2012
New Revision: 1406368
URL: http://svn.apache.org/viewvc?rev=1406368&view=rev
Log:
Merged the kahadb module into activemq-core since it's the only known user of the module. Will allow us to eliminate dup util classes.
Added:
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeIndex.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeNode.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeVisitor.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeVisitor.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashBin.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/HashBin.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashIndex.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/Index.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/Index.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListIndex.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/ListIndex.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListNode.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/ListNode.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFile.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/FileAppender.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/FileAppender.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Journal.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Location.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Location.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/package.html
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/package.html
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/package.html
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/package.html
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Page.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/Page.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/PageFile.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Transaction.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ByteArrayInputStream.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/ByteArrayInputStream.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ByteArrayOutputStream.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/ByteArrayOutputStream.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ByteSequence.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/ByteSequence.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/CommandLineSupport.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/CommandLineSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DiskBenchmark.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/DiskBenchmark.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/HexSupport.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/HexSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IOExceptionSupport.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/IOExceptionSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IOHelper.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/IOHelper.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IntrospectionSupport.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/IntrospectionSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LFUCache.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LFUCache.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LRUCache.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LRUCache.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNode.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LinkedNode.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNodeList.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LinkedNodeList.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LocationMarshaller.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LocationMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LockFile.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LockFile.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LongMarshaller.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Marshaller.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Scheduler.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/Scheduler.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Sequence.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/Sequence.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SequenceSet.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/StringMarshaller.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/VariableMarshaller.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/VariableMarshaller.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexTest.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/HashIndexTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexBenchmark.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/IndexBenchmark.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexTestSupport.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/IndexTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/ListIndexTest.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/ListIndexTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/journal/
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/journal/JournalTest.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/journal/JournalTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/page/
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/page/PageFileTest.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/page/PageFileTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/DataByteArrayInputStreamTest.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/util/DataByteArrayInputStreamTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/DataByteArrayOutputStreamTest.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/util/DataByteArrayOutputStreamTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/SequenceSetTest.java
- copied, changed from r1406355, activemq/trunk/kahadb/src/test/java/org/apache/kahadb/util/SequenceSetTest.java
Removed:
activemq/trunk/kahadb/README
activemq/trunk/kahadb/pom.xml
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeVisitor.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/HashBin.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/Index.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/ListIndex.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/ListNode.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/FileAppender.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Location.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/package.html
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/package.html
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/Page.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/ByteArrayInputStream.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/ByteArrayOutputStream.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/ByteSequence.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/CommandLineSupport.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/DiskBenchmark.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/HexSupport.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/IOExceptionSupport.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/IOHelper.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/IntrospectionSupport.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LFUCache.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LRUCache.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LinkedNode.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LinkedNodeList.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LocationMarshaller.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LockFile.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/Scheduler.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/Sequence.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/util/VariableMarshaller.java
activemq/trunk/kahadb/src/main/resources/META-INF/services/org/apache/activemq/transport/kdbr
activemq/trunk/kahadb/src/main/resources/META-INF/services/org/apache/activemq/wireformat/kdbr
activemq/trunk/kahadb/src/test/eclipse-resources/log4j.properties
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/HashIndexTest.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/IndexBenchmark.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/IndexTestSupport.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/index/ListIndexTest.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/journal/JournalTest.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/page/PageFileTest.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/util/DataByteArrayInputStreamTest.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/util/DataByteArrayOutputStreamTest.java
activemq/trunk/kahadb/src/test/java/org/apache/kahadb/util/SequenceSetTest.java
activemq/trunk/kahadb/src/test/resources/log4j.properties
Modified:
activemq/trunk/activemq-all/pom.xml
activemq/trunk/activemq-core/pom.xml
activemq/trunk/assembly/pom.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-all/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-all/pom.xml?rev=1406368&r1=1406367&r2=1406368&view=diff
==============================================================================
--- activemq/trunk/activemq-all/pom.xml (original)
+++ activemq/trunk/activemq-all/pom.xml Tue Nov 6 22:03:14 2012
@@ -46,10 +46,6 @@
<artifactId>activemq-optional</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>kahadb</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>