activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1406369 [1/2] - in /activemq/trunk: activemq-core/src/main/java/org/apache/activemq/broker/ activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/ activemq-core/src/main/java/org/apache/activemq/broker/scheduler/ activemq-c...
Date Tue, 06 Nov 2012 22:04:31 GMT
Author: chirino
Date: Tue Nov  6 22:04:26 2012
New Revision: 1406369

URL: http://svn.apache.org/viewvc?rev=1406369&view=rev
Log:
Move the kahadb disk IO classes under org.apache.activemq.store.kahadb.  Drop redundant util classes.

Added:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndex.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeIndex.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeNode.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeVisitor.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeVisitor.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashBin.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashBin.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashIndex.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashIndex.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/Index.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/Index.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListIndex.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListIndex.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListNode.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFile.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFile.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessorPool.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/FileAppender.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/FileAppender.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Journal.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Location.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Location.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyDataFile.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyJournal.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReplicationTarget.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/package.html
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/package.html
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/package.html
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/package.html
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Page.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Page.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/PageFile.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/PageFile.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Transaction.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Transaction.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/BytesMarshaller.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/CommandLineSupport.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/CommandLineSupport.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayInputStream.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayOutputStream.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DiskBenchmark.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DiskBenchmark.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/IntegerMarshaller.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNode.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNode.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNodeList.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNodeList.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LocationMarshaller.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LocationMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LongMarshaller.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LongMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Marshaller.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Marshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/ObjectMarshaller.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Scheduler.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Scheduler.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SchedulerTimerTask.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Sequence.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Sequence.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SequenceSet.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SequenceSet.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/StringMarshaller.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/StringMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/VariableMarshaller.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/VariableMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LFUCache.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LFUCache.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LockFile.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LockFile.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexBenchMark.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexBenchMark.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexTest.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexBenchmark.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexBenchmark.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexTestSupport.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexTestSupport.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/ListIndexTest.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/ListIndexTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/journal/
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/journal/JournalTest.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/journal/JournalTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/page/
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/page/PageFileTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/util/
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/util/SequenceSetTest.java
      - copied, changed from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/SequenceSetTest.java
Removed:
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeIndex.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeNode.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeVisitor.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashBin.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashIndex.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/Index.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListIndex.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListNode.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFile.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/FileAppender.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Journal.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Location.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/package.html
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/package.html
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Page.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/PageFile.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Transaction.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ByteArrayInputStream.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ByteArrayOutputStream.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ByteSequence.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/CommandLineSupport.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DiskBenchmark.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/HexSupport.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IOExceptionSupport.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IOHelper.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IntrospectionSupport.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LFUCache.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LRUCache.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNode.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNodeList.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LocationMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LockFile.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LongMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Marshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Scheduler.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Sequence.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SequenceSet.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/StringMarshaller.java
    activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/VariableMarshaller.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexBenchmark.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexTestSupport.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/ListIndexTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/journal/JournalTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/page/PageFileTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/DataByteArrayInputStreamTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/DataByteArrayOutputStreamTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/SequenceSetTest.java
Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobImpl.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobListener.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobLocation.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobScheduler.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerFacade.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBTransactionStore.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempMessageDatabase.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PList.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListEntry.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListStore.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/PBMesssagesTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Tue Nov  6 22:04:26 2012
@@ -1933,7 +1933,7 @@ public class BrokerService implements Se
                 if (usage.getTempUsage().getStore() != null) {
                     maxJournalFileSize = usage.getTempUsage().getStore().getJournalMaxFileLength();
                 } else {
-                    maxJournalFileSize = org.apache.kahadb.journal.Journal.DEFAULT_MAX_FILE_LENGTH;
+                    maxJournalFileSize = org.apache.activemq.store.kahadb.disk.journal.Journal.DEFAULT_MAX_FILE_LENGTH;
                 }
 
                 if (storeLimit < maxJournalFileSize) {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java Tue Nov  6 22:04:26 2012
@@ -39,7 +39,7 @@ import org.apache.activemq.usage.UsageLi
 import org.apache.activemq.wireformat.WireFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
 
 /**
  * persist pending messages pending message (messages awaiting dispatch to a

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobImpl.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobImpl.java Tue Nov  6 22:04:26 2012
@@ -19,7 +19,7 @@ package org.apache.activemq.broker.sched
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
 
 
 public class JobImpl implements Job {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobListener.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobListener.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobListener.java Tue Nov  6 22:04:26 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.broker.scheduler;
 
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
 
 public interface JobListener {
     

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobLocation.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobLocation.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobLocation.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobLocation.java Tue Nov  6 22:04:26 2012
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.kahadb.journal.Location;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
 
 class JobLocation {
    

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobScheduler.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobScheduler.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobScheduler.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobScheduler.java Tue Nov  6 22:04:26 2012
@@ -17,7 +17,7 @@
 package org.apache.activemq.broker.scheduler;
 
 import java.util.List;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
 
 public interface JobScheduler {
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerFacade.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerFacade.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerFacade.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerFacade.java Tue Nov  6 22:04:26 2012
@@ -18,7 +18,7 @@ package org.apache.activemq.broker.sched
 
 import java.util.Collections;
 import java.util.List;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
 
 public class JobSchedulerFacade implements JobScheduler {
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java Tue Nov  6 22:04:26 2012
@@ -33,12 +33,12 @@ import org.apache.activemq.util.ServiceS
 import org.apache.activemq.util.ServiceSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.kahadb.index.BTreeIndex;
-import org.apache.kahadb.journal.Location;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.LongMarshaller;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.index.BTreeIndex;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.store.kahadb.disk.util.LongMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
 
 class JobSchedulerImpl extends ServiceSupport implements Runnable, JobScheduler {
     private static final Logger LOG = LoggerFactory.getLogger(JobSchedulerImpl.class);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java Tue Nov  6 22:04:26 2012
@@ -19,17 +19,17 @@ package org.apache.activemq.broker.sched
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.kahadb.index.BTreeIndex;
-import org.apache.kahadb.journal.Journal;
-import org.apache.kahadb.journal.Location;
-import org.apache.kahadb.page.Page;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.IntegerMarshaller;
-import org.apache.kahadb.util.LockFile;
-import org.apache.kahadb.util.StringMarshaller;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.index.BTreeIndex;
+import org.apache.activemq.store.kahadb.disk.journal.Journal;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
+import org.apache.activemq.store.kahadb.disk.page.Page;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.store.kahadb.disk.util.IntegerMarshaller;
+import org.apache.activemq.util.LockFile;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java Tue Nov  6 22:04:26 2012
@@ -39,7 +39,7 @@ import org.apache.activemq.util.TypeConv
 import org.apache.activemq.wireformat.WireFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
 
 public class SchedulerBroker extends BrokerFilter implements JobListener {
     private static final Logger LOG = LoggerFactory.getLogger(SchedulerBroker.class);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/SharedFileLocker.java Tue Nov  6 22:04:26 2012
@@ -19,7 +19,7 @@ package org.apache.activemq.store;
 import org.apache.activemq.broker.AbstractLocker;
 import org.apache.activemq.store.kahadb.MessageDatabase;
 import org.apache.activemq.util.ServiceStopper;
-import org.apache.kahadb.util.LockFile;
+import org.apache.activemq.util.LockFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java Tue Nov  6 22:04:26 2012
@@ -68,8 +68,8 @@ import org.apache.activemq.util.ThreadPo
 import org.apache.activemq.wireformat.WireFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.kahadb.journal.Location;
-import org.apache.kahadb.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
 
 public class KahaDBStore extends MessageDatabase implements PersistenceAdapter {
     static final Logger LOG = LoggerFactory.getLogger(KahaDBStore.class);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java Tue Nov  6 22:04:26 2012
@@ -72,26 +72,26 @@ import org.apache.activemq.util.Callback
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.kahadb.index.BTreeIndex;
-import org.apache.kahadb.index.BTreeVisitor;
-import org.apache.kahadb.index.ListIndex;
-import org.apache.kahadb.journal.DataFile;
-import org.apache.kahadb.journal.Journal;
-import org.apache.kahadb.journal.Location;
-import org.apache.kahadb.page.Page;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.DataByteArrayInputStream;
-import org.apache.kahadb.util.DataByteArrayOutputStream;
-import org.apache.kahadb.util.LocationMarshaller;
-import org.apache.kahadb.util.LockFile;
-import org.apache.kahadb.util.LongMarshaller;
-import org.apache.kahadb.util.Marshaller;
-import org.apache.kahadb.util.Sequence;
-import org.apache.kahadb.util.SequenceSet;
-import org.apache.kahadb.util.StringMarshaller;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.index.BTreeIndex;
+import org.apache.activemq.store.kahadb.disk.index.BTreeVisitor;
+import org.apache.activemq.store.kahadb.disk.index.ListIndex;
+import org.apache.activemq.store.kahadb.disk.journal.DataFile;
+import org.apache.activemq.store.kahadb.disk.journal.Journal;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
+import org.apache.activemq.store.kahadb.disk.page.Page;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.util.DataByteArrayInputStream;
+import org.apache.activemq.util.DataByteArrayOutputStream;
+import org.apache.activemq.store.kahadb.disk.util.LocationMarshaller;
+import org.apache.activemq.util.LockFile;
+import org.apache.activemq.store.kahadb.disk.util.LongMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.Marshaller;
+import org.apache.activemq.store.kahadb.disk.util.Sequence;
+import org.apache.activemq.store.kahadb.disk.util.SequenceSet;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -1740,7 +1740,7 @@ public abstract class MessageDatabase ex
         // Figure out the next key using the last entry in the destination.
         rc.orderIndex.configureLast(tx);
 
-        rc.locationIndex.setKeyMarshaller(org.apache.kahadb.util.LocationMarshaller.INSTANCE);
+        rc.locationIndex.setKeyMarshaller(org.apache.activemq.store.kahadb.disk.util.LocationMarshaller.INSTANCE);
         rc.locationIndex.setValueMarshaller(LongMarshaller.INSTANCE);
         rc.locationIndex.load(tx);
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBTransactionStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBTransactionStore.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBTransactionStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBTransactionStore.java Tue Nov  6 22:04:26 2012
@@ -44,10 +44,10 @@ import org.apache.activemq.store.kahadb.
 import org.apache.activemq.store.kahadb.data.KahaPrepareCommand;
 import org.apache.activemq.store.kahadb.data.KahaTraceCommand;
 import org.apache.activemq.util.IOHelper;
-import org.apache.kahadb.journal.Journal;
-import org.apache.kahadb.journal.Location;
-import org.apache.kahadb.util.DataByteArrayInputStream;
-import org.apache.kahadb.util.DataByteArrayOutputStream;
+import org.apache.activemq.store.kahadb.disk.journal.Journal;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
+import org.apache.activemq.util.DataByteArrayInputStream;
+import org.apache.activemq.util.DataByteArrayOutputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java Tue Nov  6 22:04:26 2012
@@ -57,8 +57,8 @@ import org.apache.activemq.usage.MemoryU
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.wireformat.WireFormat;
-import org.apache.kahadb.journal.Location;
-import org.apache.kahadb.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
 
 public class TempKahaDBStore extends TempMessageDatabase implements PersistenceAdapter {
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempMessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempMessageDatabase.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempMessageDatabase.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempMessageDatabase.java Tue Nov  6 22:04:26 2012
@@ -41,13 +41,12 @@ import org.apache.activemq.store.kahadb.
 import org.apache.activemq.util.ByteSequence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.kahadb.index.BTreeIndex;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.LongMarshaller;
-import org.apache.kahadb.util.Marshaller;
-import org.apache.kahadb.util.StringMarshaller;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.index.BTreeIndex;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.LongMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
 
 public class TempMessageDatabase {
 

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndex.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeIndex.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndex.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndex.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeIndex.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeIndex.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndex.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -25,10 +25,10 @@ import java.util.concurrent.atomic.Atomi
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.kahadb.page.Page;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.Marshaller;
+import org.apache.activemq.store.kahadb.disk.page.Page;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.Marshaller;
 
 /**
  * BTreeIndex represents a Variable Magnitude B+Tree in a Page File.

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeNode.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeNode.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeNode.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeNode.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -26,10 +26,10 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Map.Entry;
 
-import org.apache.kahadb.index.BTreeIndex.Prefixer;
-import org.apache.kahadb.page.Page;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.index.BTreeIndex.Prefixer;
+import org.apache.activemq.store.kahadb.disk.page.Page;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
 
 
 /**

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeVisitor.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeVisitor.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeVisitor.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeVisitor.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeVisitor.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/BTreeVisitor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/BTreeVisitor.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
 
 import java.util.List;
 

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashBin.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashBin.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashBin.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashBin.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashBin.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashBin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashBin.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -22,9 +22,9 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.kahadb.page.Page;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.page.Page;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
 
 /**
  * Bin in a HashIndex

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashIndex.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashIndex.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashIndex.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashIndex.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashIndex.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/HashIndex.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/HashIndex.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -26,11 +26,11 @@ import java.util.concurrent.atomic.Atomi
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.kahadb.page.Page;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.Marshaller;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.page.Page;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.Marshaller;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
 
 /**
  * BTree implementation

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/Index.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/Index.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/Index.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/Index.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/Index.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/Index.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/Index.java Tue Nov  6 22:04:26 2012
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.Marshaller;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.Marshaller;
 
 /**
  * Simpler than a Map

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListIndex.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListIndex.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListIndex.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListIndex.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListIndex.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListIndex.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListIndex.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -23,11 +23,11 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.kahadb.index.ListNode.ListIterator;
-import org.apache.kahadb.page.Page;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.Marshaller;
+import org.apache.activemq.store.kahadb.disk.index.ListNode.ListIterator;
+import org.apache.activemq.store.kahadb.disk.page.Page;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.Marshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListNode.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListNode.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/index/ListNode.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -23,12 +23,12 @@ import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 
-import org.apache.kahadb.page.Page;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.LinkedNode;
-import org.apache.kahadb.util.LinkedNodeList;
-import org.apache.kahadb.util.Marshaller;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.page.Page;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.LinkedNode;
+import org.apache.activemq.store.kahadb.disk.util.LinkedNodeList;
+import org.apache.activemq.store.kahadb.disk.util.Marshaller;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
 
 /**
  * The ListNode class represents a node in the List object graph. It is stored

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/CallerBufferingDataFileAppender.java Tue Nov  6 22:04:26 2012
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.zip.Adler32;
 import java.util.zip.Checksum;
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.DataByteArrayOutputStream;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.store.kahadb.disk.util.DataByteArrayOutputStream;
 
 /**
  * An optimized writer to do batch appends to a data file. This object is thread

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFile.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFile.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFile.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFile.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFile.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFile.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFile.java Tue Nov  6 22:04:26 2012
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import org.apache.kahadb.util.IOHelper;
-import org.apache.kahadb.util.LinkedNode;
-import org.apache.kahadb.util.SequenceSet;
+import org.apache.activemq.util.IOHelper;
+import org.apache.activemq.store.kahadb.disk.util.LinkedNode;
+import org.apache.activemq.store.kahadb.disk.util.SequenceSet;
 
 /**
  * DataFile

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessor.java Tue Nov  6 22:04:26 2012
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.Map;
 
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
 
 /**
  * Optimized Store reader and updater. Single threaded and synchronous. Use in

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessorPool.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessorPool.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessorPool.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAccessorPool.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
 import java.io.IOException;
 import java.util.ArrayList;

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAppender.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAppender.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAppender.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -25,9 +25,9 @@ import java.util.concurrent.atomic.Atomi
 import java.util.zip.Adler32;
 import java.util.zip.Checksum;
 
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.DataByteArrayOutputStream;
-import org.apache.kahadb.util.LinkedNodeList;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.store.kahadb.disk.util.DataByteArrayOutputStream;
+import org.apache.activemq.store.kahadb.disk.util.LinkedNodeList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/FileAppender.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/FileAppender.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/FileAppender.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/FileAppender.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/FileAppender.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/FileAppender.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/FileAppender.java Tue Nov  6 22:04:26 2012
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
 
 import java.io.IOException;
 

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Journal.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Journal.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Journal.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -36,15 +36,15 @@ import java.util.concurrent.atomic.Atomi
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.zip.Adler32;
 import java.util.zip.Checksum;
-import org.apache.kahadb.util.LinkedNode;
+import org.apache.activemq.store.kahadb.disk.util.LinkedNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.DataByteArrayInputStream;
-import org.apache.kahadb.util.DataByteArrayOutputStream;
-import org.apache.kahadb.util.LinkedNodeList;
-import org.apache.kahadb.util.SchedulerTimerTask;
-import org.apache.kahadb.util.Sequence;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.util.DataByteArrayInputStream;
+import org.apache.activemq.util.DataByteArrayOutputStream;
+import org.apache.activemq.store.kahadb.disk.util.LinkedNodeList;
+import org.apache.activemq.store.kahadb.disk.util.SchedulerTimerTask;
+import org.apache.activemq.store.kahadb.disk.util.Sequence;
 
 /**
  * Manages DataFiles

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Location.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Location.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Location.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Location.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Location.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/Location.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Location.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
 import java.io.DataInput;
 import java.io.DataOutput;

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyDataFile.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyDataFile.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyDataFile.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyDataFile.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
 import java.io.File;
 import java.io.IOException;

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyJournal.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyJournal.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyJournal.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReadOnlyJournal.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
 import java.io.File;
 import java.io.FilenameFilter;

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReplicationTarget.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReplicationTarget.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReplicationTarget.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/ReplicationTarget.java Tue Nov  6 22:04:26 2012
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
 
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
 
 public interface ReplicationTarget {
 

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/package.html (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/package.html?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/journal/package.html&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/journal/package.html&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/package.html (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/package.html?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/package.html&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/package.html&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Page.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Page.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Page.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Page.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Page.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Page.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Page.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.page;
+package org.apache.activemq.store.kahadb.disk.page;
 
 import java.io.DataInput;
 import java.io.DataOutput;

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/PageFile.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/PageFile.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/PageFile.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/PageFile.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/PageFile.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/PageFile.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/PageFile.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.page;
+package org.apache.activemq.store.kahadb.disk.page;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -42,14 +42,14 @@ import java.util.concurrent.atomic.Atomi
 import java.util.zip.Adler32;
 import java.util.zip.Checksum;
 
-import org.apache.kahadb.util.DataByteArrayOutputStream;
-import org.apache.kahadb.util.IOExceptionSupport;
-import org.apache.kahadb.util.IOHelper;
-import org.apache.kahadb.util.IntrospectionSupport;
-import org.apache.kahadb.util.LFUCache;
-import org.apache.kahadb.util.LRUCache;
-import org.apache.kahadb.util.Sequence;
-import org.apache.kahadb.util.SequenceSet;
+import org.apache.activemq.util.DataByteArrayOutputStream;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.IOHelper;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.LFUCache;
+import org.apache.activemq.util.LRUCache;
+import org.apache.activemq.store.kahadb.disk.util.Sequence;
+import org.apache.activemq.store.kahadb.disk.util.SequenceSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Transaction.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Transaction.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Transaction.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Transaction.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Transaction.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/page/Transaction.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/page/Transaction.java Tue Nov  6 22:04:26 2012
@@ -14,10 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.page;
+package org.apache.activemq.store.kahadb.disk.page;
 
-import org.apache.kahadb.page.PageFile.PageWrite;
-import org.apache.kahadb.util.*;
+import org.apache.activemq.store.kahadb.disk.page.PageFile.PageWrite;
+import org.apache.activemq.store.kahadb.disk.util.*;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.store.kahadb.disk.util.DataByteArrayInputStream;
+import org.apache.activemq.store.kahadb.disk.util.DataByteArrayOutputStream;
+import org.apache.activemq.util.IOHelper;
 
 import java.io.*;
 import java.util.Iterator;
@@ -432,8 +436,8 @@ public class Transaction implements Iter
     }
 
     /**
-     * @see org.apache.kahadb.page.Transaction#load(org.apache.kahadb.page.Page,
-     *      org.apache.kahadb.util.Marshaller)
+     * @see org.apache.activemq.store.kahadb.disk.page.Transaction#load(org.apache.activemq.store.kahadb.disk.page.Page,
+     *      org.apache.activemq.store.kahadb.disk.util.Marshaller)
      */
     public InputStream openInputStream(final Page p) throws IOException {
 
@@ -702,7 +706,7 @@ public class Transaction implements Iter
 
     protected File getTempFile() {
         if (txFile == null) {
-            txFile = new File(getPageFile().getDirectory(), IOHelper.toFileSystemSafeName("tx-"+ Long.toString(getWriteTransactionId()) + "-" + Long.toString(System.currentTimeMillis()) + ".tmp"));
+            txFile = new File(getPageFile().getDirectory(), IOHelper.toFileSystemSafeName("tx-" + Long.toString(getWriteTransactionId()) + "-" + Long.toString(System.currentTimeMillis()) + ".tmp"));
         }
        return txFile;
     }

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/BytesMarshaller.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/BytesMarshaller.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/BytesMarshaller.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/BytesMarshaller.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/BytesMarshaller.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/BytesMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/BytesMarshaller.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
 
 import java.io.DataInput;
 import java.io.DataOutput;

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/CommandLineSupport.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/CommandLineSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/CommandLineSupport.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/CommandLineSupport.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/CommandLineSupport.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/CommandLineSupport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/CommandLineSupport.java Tue Nov  6 22:04:26 2012
@@ -15,7 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
+
+import org.apache.activemq.util.IntrospectionSupport;
 
 import java.util.ArrayList;
 
@@ -72,7 +74,7 @@ public class CommandLineSupport {
 				}
 				
 				String propName = convertOptionToPropertyName(name);
-				if( !IntrospectionSupport.setProperty(target, propName, value) ) {					
+				if( !IntrospectionSupport.setProperty(target, propName, value) ) {
 					rc.add(args[i]);
 					continue;
 				}

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayInputStream.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayInputStream.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayInputStream.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayInputStream.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
+
+import org.apache.activemq.util.ByteSequence;
 
 import java.io.DataInput;
 import java.io.IOException;

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayOutputStream.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayOutputStream.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayOutputStream.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DataByteArrayOutputStream.java Tue Nov  6 22:04:26 2012
@@ -14,14 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
+
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.util.ByteSequence;
 
 import java.io.DataOutput;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UTFDataFormatException;
 
-import org.apache.kahadb.page.PageFile;
 
 /**
  * Optimized ByteArrayOutputStream

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DiskBenchmark.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DiskBenchmark.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DiskBenchmark.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DiskBenchmark.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DiskBenchmark.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/DiskBenchmark.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/DiskBenchmark.java Tue Nov  6 22:04:26 2012
@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/IntegerMarshaller.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/IntegerMarshaller.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/IntegerMarshaller.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/IntegerMarshaller.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
 
 import java.io.DataInput;
 import java.io.DataOutput;

Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNode.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNode.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNode.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNode.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNode.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNode.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNode.java Tue Nov  6 22:04:26 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
 
 /**
  * Provides a base class for you to extend when you want object to maintain a



Mime
View raw message