activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1445633 - in /activemq/trunk: ./ activemq-all/ activemq-amq-store/ activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/ activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/reader/ activ...
Date Wed, 13 Feb 2013 14:47:44 GMT
Author: chirino
Date: Wed Feb 13 14:47:40 2013
New Revision: 1445633

URL: http://svn.apache.org/r1445633
Log:
Remove deprecated modules.  Converted many AMQ store tests to be LevelDB tests.

Added:
    activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreFactory.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupLevelDBStoreTest.java
      - copied, changed from r1445631, activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/async/NioDataFileAppenderTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBDurableTopicTest.java
      - copied, changed from r1445631, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBStoreQueueTest.java
      - copied, changed from r1445631, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java
      - copied, changed from r1445631, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDurableSubscriptionTest.java
Removed:
    activemq/trunk/activemq-amq-store/pom.xml
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/AMQJournalTool.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/AMQJournalToolCommand.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/CustomResourceLoader.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/Entry.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/MessageBodyFormatter.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQReader.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/console/command/store/amq/reader/MessageLocation.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/BytesMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/CommandMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/ContainerId.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/IndexMBean.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/ListContainer.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/MapContainer.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/Marshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/MessageAckWithLocation.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/MessageIdMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/MessageMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/ObjectMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/RuntimeStoreException.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/Store.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/StoreEntry.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/StoreFactory.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/StoreLocation.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/StringMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/DataManager.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/StoreLockedExcpetion.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/ControlFile.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/DataFile.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/DataFileAccessor.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/DataFileAccessorPool.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/DataFileAppender.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/DataManagerFacade.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/JournalFacade.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/Location.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/NIODataFileAppender.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyDataFile.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/async/package.html
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ContainerCollectionSupport.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySet.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ContainerEntrySetIterator.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySet.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ContainerKeySetIterator.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ContainerListIterator.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ContainerMapEntry.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollection.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ContainerValueCollectionIterator.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/container/package.html
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/data/DataFile.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/data/DataItem.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/data/Item.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/data/RedoListener.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/data/SyncDataFileReader.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/data/SyncDataFileWriter.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/BadMagicException.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedList.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/Index.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/IndexItem.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/RedoStoreIndexItem.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/VMIndex.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/VMIndexLinkedList.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashBin.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashEntry.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashIndex.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashIndexMBean.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashPage.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashPageInfo.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/hash/package.html
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/package.html
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreeEntry.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreeIndex.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreePage.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreePageEntry.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/index/tree/package.html
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/impl/package.html
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/kaha/package.html
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/ReferenceStoreAdapter.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/AMQJournalTool.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/AMQJournalToolCommand.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapterFactory.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/AMQTopicMessageStore.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/AMQTransactionStore.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/AMQTx.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/AMQTxOperation.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/CommandLineSupport.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/CustomResourceLoader.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/Entry.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/MessageBodyFormatter.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/package.html
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/reader/AMQIterator.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/reader/AMQReader.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/amq/reader/MessageLocation.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/AMQTxMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/AtomicIntegerMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/ConsumerMessageRef.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/ConsumerMessageRefMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/IntegerMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStore.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/KahaTopicMessageStore.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/KahaTopicReferenceStore.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransaction.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransactionStore.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/ReferenceRecord.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/ReferenceRecordMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/StoreEntryMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubAck.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubAckMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubContainer.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/TransactionMarshaller.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/TxCommand.java
    activemq/trunk/activemq-amq-store/src/main/java/org/apache/activemq/store/kahadaptor/package.html
    activemq/trunk/activemq-amq-store/src/main/resources/META-INF/services/org.apache.activemq.console.command.Command
    activemq/trunk/activemq-amq-store/src/main/resources/org/apache/activemq/store/amq/help.txt
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/console/command/AMQJournalToolTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/ListContainerTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/LoadTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/Loader.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/MapContainerTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/StoreTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/VolumeTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/async/DataFileAppenderTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/async/JournalImplTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/async/LocationTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/async/NioDataFileAppenderTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/index/DiskIndexLinkedListTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/index/IndexBenchmark.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/index/VMIndexLinkedListTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/index/hash/HashIndexBenchMark.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/index/hash/HashTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/index/tree/TreeTest.java
    activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/store/amq/reader/AMQReaderTest.java
    activemq/trunk/activemq-amq-store/src/test/resources/org/apache/activemq/store/amq/reader/data/data-1
    activemq/trunk/activemq-amq-store/src/test/resources/org/apache/activemq/store/amq/reader/data/data-2
    activemq/trunk/activemq-amq-store/src/test/resources/org/apache/activemq/store/amq/reader/data/data-3
    activemq/trunk/activemq-amq-store/src/test/resources/org/apache/activemq/store/amq/reader/data/data-4
    activemq/trunk/activemq-amq-store/src/test/resources/org/apache/activemq/store/amq/reader/data/data-5
    activemq/trunk/activemq-amq-store/src/test/resources/org/apache/activemq/store/amq/reader/data/data-6
    activemq/trunk/activemq-amq-store/src/test/resources/org/apache/activemq/store/amq/reader/data/data-7
    activemq/trunk/activemq-amq-store/src/test/resources/org/apache/activemq/store/amq/reader/data/data-8
    activemq/trunk/activemq-amq-store/src/test/resources/org/apache/activemq/store/amq/reader/data/data-9
    activemq/trunk/activemq-blueprint/pom.xml
    activemq/trunk/activemq-blueprint/src/main/resources/OSGI-INF/blueprint/activemq-blueprint.xml
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/store/TransactionStoreTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupAMQStoreTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/AMQStoreDurableTopicTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/JournalKahaDurableTopicTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/JournalKahaQueueTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQStoreDurableSubscriptionTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDurableSubscriptionTest.java
    activemq/trunk/activemq-xmpp/pom.xml
    activemq/trunk/activemq-xmpp/src/main/appended-resources/META-INF/LICENSE
    activemq/trunk/activemq-xmpp/src/main/appended-resources/META-INF/NOTICE
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/ProtocolConverter.java
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormatFactory.java
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/Handler.java
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/HandlerRegistry.java
    activemq/trunk/activemq-xmpp/src/main/resources/META-INF/services/org/apache/activemq/transport/xmpp
    activemq/trunk/activemq-xmpp/src/main/resources/META-INF/services/org/apache/activemq/wireformat/xmpp
    activemq/trunk/activemq-xmpp/src/main/resources/activity.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/address.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/amp-errors.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/amp-feature.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/amp.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/bind.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/dialback.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/disco-info.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/disco-items.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/iq-auth.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/iq-gateway.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/iq-last.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/iq-oob.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/iq-pass.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/iq-private.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/iq-time.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/iq-version.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/jabber-client.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/jabber-server.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/muc-admin.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/muc-unique.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/muc-user.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/muc.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/roster.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/rosternotes.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/rosterx.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/sasl.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/session.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/stanzaerror.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/streamerror.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/streams.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/tls.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/xml.xsd
    activemq/trunk/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppBroker.java
    activemq/trunk/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppTest.java
    activemq/trunk/activemq-xmpp/src/test/resources/example-xmpp.xml
    activemq/trunk/activemq-xmpp/src/test/resources/log4j.properties
Modified:
    activemq/trunk/activemq-all/pom.xml
    activemq/trunk/activemq-osgi/pom.xml
    activemq/trunk/activemq-spring/pom.xml
    activemq/trunk/activemq-unit-tests/pom.xml
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJournalNoDuplicateTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1866.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/QueueConnectionMemoryTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/common-bin.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=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-all/pom.xml (original)
+++ activemq/trunk/activemq-all/pom.xml Wed Feb 13 14:47:40 2013
@@ -61,10 +61,6 @@
     <!-- Stores -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-amq-store</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-kahadb-store</artifactId>
     </dependency>
     <dependency>

Added: activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreFactory.java?rev=1445633&view=auto
==============================================================================
--- activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreFactory.java (added)
+++ activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/LevelDBStoreFactory.java Wed Feb 13 14:47:40 2013
@@ -0,0 +1,208 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.leveldb;
+
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.PersistenceAdapterFactory;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * A factory which can create configured LevelDBStore objects.
+ */
+public class LevelDBStoreFactory implements PersistenceAdapterFactory {
+
+    private int asyncBufferSize = 1024*1024*4;
+    private File directory = new File("LevelDB");
+    private int flushDelay = 1000*5;
+    private int indexBlockRestartInterval = 16;
+    private int indexBlockSize = 4 * 1024;
+    private long indexCacheSize = 1024 * 1024 * 256L;
+    private String indexCompression = "snappy";
+    private String indexFactory = "org.fusesource.leveldbjni.JniDBFactory, org.iq80.leveldb.impl.Iq80DBFactory";
+    private int indexMaxOpenFiles = 1000;
+    private int indexWriteBufferSize = 1024*1024*6;
+    private String logCompression = "none";
+    private File logDirectory;
+    private long logSize = 1024 * 1024 * 100;
+    private boolean monitorStats;
+    private boolean paranoidChecks;
+    private boolean sync = true;
+    private boolean verifyChecksums;
+
+
+    @Override
+    public PersistenceAdapter createPersistenceAdapter() throws IOException {
+        LevelDBStore store = new LevelDBStore();
+        store.setVerifyChecksums(verifyChecksums);
+        store.setAsyncBufferSize(asyncBufferSize);
+        store.setDirectory(directory);
+        store.setFlushDelay(flushDelay);
+        store.setIndexBlockRestartInterval(indexBlockRestartInterval);
+        store.setIndexBlockSize(indexBlockSize);
+        store.setIndexCacheSize(indexCacheSize);
+        store.setIndexCompression(indexCompression);
+        store.setIndexFactory(indexFactory);
+        store.setIndexMaxOpenFiles(indexMaxOpenFiles);
+        store.setIndexWriteBufferSize(indexWriteBufferSize);
+        store.setLogCompression(logCompression);
+        store.setLogDirectory(logDirectory);
+        store.setLogSize(logSize);
+        store.setMonitorStats(monitorStats);
+        store.setParanoidChecks(paranoidChecks);
+        store.setSync(sync);
+        return store;
+    }
+
+    public int getAsyncBufferSize() {
+        return asyncBufferSize;
+    }
+
+    public void setAsyncBufferSize(int asyncBufferSize) {
+        this.asyncBufferSize = asyncBufferSize;
+    }
+
+    public File getDirectory() {
+        return directory;
+    }
+
+    public void setDirectory(File directory) {
+        this.directory = directory;
+    }
+
+    public int getFlushDelay() {
+        return flushDelay;
+    }
+
+    public void setFlushDelay(int flushDelay) {
+        this.flushDelay = flushDelay;
+    }
+
+    public int getIndexBlockRestartInterval() {
+        return indexBlockRestartInterval;
+    }
+
+    public void setIndexBlockRestartInterval(int indexBlockRestartInterval) {
+        this.indexBlockRestartInterval = indexBlockRestartInterval;
+    }
+
+    public int getIndexBlockSize() {
+        return indexBlockSize;
+    }
+
+    public void setIndexBlockSize(int indexBlockSize) {
+        this.indexBlockSize = indexBlockSize;
+    }
+
+    public long getIndexCacheSize() {
+        return indexCacheSize;
+    }
+
+    public void setIndexCacheSize(long indexCacheSize) {
+        this.indexCacheSize = indexCacheSize;
+    }
+
+    public String getIndexCompression() {
+        return indexCompression;
+    }
+
+    public void setIndexCompression(String indexCompression) {
+        this.indexCompression = indexCompression;
+    }
+
+    public String getIndexFactory() {
+        return indexFactory;
+    }
+
+    public void setIndexFactory(String indexFactory) {
+        this.indexFactory = indexFactory;
+    }
+
+    public int getIndexMaxOpenFiles() {
+        return indexMaxOpenFiles;
+    }
+
+    public void setIndexMaxOpenFiles(int indexMaxOpenFiles) {
+        this.indexMaxOpenFiles = indexMaxOpenFiles;
+    }
+
+    public int getIndexWriteBufferSize() {
+        return indexWriteBufferSize;
+    }
+
+    public void setIndexWriteBufferSize(int indexWriteBufferSize) {
+        this.indexWriteBufferSize = indexWriteBufferSize;
+    }
+
+    public String getLogCompression() {
+        return logCompression;
+    }
+
+    public void setLogCompression(String logCompression) {
+        this.logCompression = logCompression;
+    }
+
+    public File getLogDirectory() {
+        return logDirectory;
+    }
+
+    public void setLogDirectory(File logDirectory) {
+        this.logDirectory = logDirectory;
+    }
+
+    public long getLogSize() {
+        return logSize;
+    }
+
+    public void setLogSize(long logSize) {
+        this.logSize = logSize;
+    }
+
+    public boolean isMonitorStats() {
+        return monitorStats;
+    }
+
+    public void setMonitorStats(boolean monitorStats) {
+        this.monitorStats = monitorStats;
+    }
+
+    public boolean isParanoidChecks() {
+        return paranoidChecks;
+    }
+
+    public void setParanoidChecks(boolean paranoidChecks) {
+        this.paranoidChecks = paranoidChecks;
+    }
+
+    public boolean isSync() {
+        return sync;
+    }
+
+    public void setSync(boolean sync) {
+        this.sync = sync;
+    }
+
+    public boolean isVerifyChecksums() {
+        return verifyChecksums;
+    }
+
+    public void setVerifyChecksums(boolean verifyChecksums) {
+        this.verifyChecksums = verifyChecksums;
+    }
+
+}

Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Wed Feb 13 14:47:40 2013
@@ -65,10 +65,6 @@
       <version>${project.version}</version>
       <classifier>uber</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-amq-store</artifactId>
-    </dependency>
 
     <!-- Additional protocol impls -->
     <dependency>

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Wed Feb 13 14:47:40 2013
@@ -64,13 +64,6 @@
       <artifactId>activemq-kahadb-store</artifactId>
       <optional>true</optional>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-amq-store</artifactId>
-      <optional>true</optional>
-    </dependency>
-    -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
@@ -206,7 +199,6 @@
                 <include>${basedir}/../activemq-broker/src/main/java</include>
                 <include>${basedir}/../activemq-leveldb-store/src/main/java</include>
                 <include>${basedir}/../activemq-jdbc-store/src/main/java</include>
-                <include>${basedir}/../activemq-amq-store/src/main/java</include>
                 <include>${basedir}/../activemq-kahadb-store/src/main/java</include>
                 <include>${basedir}/../activemq-mqtt/src/main/java</include>
                 <include>${basedir}/../activemq-stomp/src/main/java</include>

Modified: activemq/trunk/activemq-unit-tests/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/pom.xml?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/pom.xml (original)
+++ activemq/trunk/activemq-unit-tests/pom.xml Wed Feb 13 14:47:40 2013
@@ -52,10 +52,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-amq-store</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-leveldb-store</artifactId>
     </dependency>
     <dependency>

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java Wed Feb 13 14:47:40 2013
@@ -34,7 +34,6 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
 import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
 import org.apache.activemq.store.leveldb.LevelDBPersistenceAdapter;
@@ -183,9 +182,6 @@ public abstract class TestSupport extend
     public PersistenceAdapter setPersistenceAdapter(BrokerService broker, PersistenceAdapterChoice choice) throws IOException {
         PersistenceAdapter adapter = null;
         switch (choice) {
-        case AMQ:
-            adapter = new AMQPersistenceAdapter();
-            break;
         case JDBC:
             adapter = new JDBCPersistenceAdapter();
             break;

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.java Wed Feb 13 14:47:40 2013
@@ -22,7 +22,7 @@ import java.net.URI;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 
 
 public class QueueMasterSlaveSingleUrlTest extends QueueMasterSlaveTestSupport {
@@ -48,7 +48,7 @@ public class QueueMasterSlaveSingleUrlTe
     }
     
     private void configureSharedPersistenceAdapter(BrokerService broker) throws Exception {
-       AMQPersistenceAdapter adapter = new AMQPersistenceAdapter();
+       LevelDBStore adapter = new LevelDBStore();
        adapter.setDirectory(new File("shared"));
        broker.setPersistenceAdapter(adapter); 
     }

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJournalNoDuplicateTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJournalNoDuplicateTest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJournalNoDuplicateTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJournalNoDuplicateTest.java Wed Feb 13 14:47:40 2013
@@ -21,8 +21,8 @@ import java.io.File;
 
 import org.apache.activeio.journal.active.JournalImpl;
 import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.store.journal.JournalPersistenceAdapter;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
 
 /**
  * @author gtully
@@ -37,9 +37,9 @@ public class StoreQueueCursorJournalNoDu
         File journalDir = new File(dataFileDir, "journal").getCanonicalFile();
         JournalImpl journal = new JournalImpl(journalDir, 3, 1024 * 1024 * 20);
 
-        KahaPersistenceAdapter kahaAdaptor = new KahaPersistenceAdapter();
-        kahaAdaptor.setDirectory(dataFileDir);
-        JournalPersistenceAdapter journalAdaptor = new JournalPersistenceAdapter(journal, kahaAdaptor, broker.getTaskRunnerFactory());
+        LevelDBStore store = new LevelDBStore();
+        store.setDirectory(dataFileDir);
+        JournalPersistenceAdapter journalAdaptor = new JournalPersistenceAdapter(journal, store, broker.getTaskRunnerFactory());
         journalAdaptor.setMaxCheckpointWorkers(1);
 
         broker.setPersistenceAdapter(journalAdaptor);

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1866.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1866.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1866.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ1866.java Wed Feb 13 14:47:40 2013
@@ -33,7 +33,7 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,8 +61,7 @@ public class AMQ1866 extends TestCase {
     protected void setUp() throws Exception {
         // Start an embedded broker up.
         brokerService = new BrokerService();
-        AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter();
-        adaptor.setIndexBinSize(4096);
+        LevelDBStore adaptor = new LevelDBStore();
         brokerService.setPersistenceAdapter(adaptor);
         brokerService.deleteAllMessages();
 

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java Wed Feb 13 14:47:40 2013
@@ -41,7 +41,7 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.RegionBroker;
 import org.apache.activemq.broker.util.LoggingBrokerPlugin;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.usage.MemoryUsage;
 import org.apache.activemq.usage.SystemUsage;
 import org.slf4j.Logger;
@@ -105,9 +105,9 @@ public class AMQ2149Test extends AutoFai
     }
     
     protected void configurePersistenceAdapter(BrokerService brokerService) throws Exception {
-        AMQPersistenceAdapterFactory persistenceFactory = new AMQPersistenceAdapterFactory();
-        persistenceFactory.setDataDirectory(dataDirFile);
-        brokerService.setPersistenceFactory(persistenceFactory);
+        LevelDBStore persistenceFactory = new LevelDBStore();
+        persistenceFactory.setDirectory(dataDirFile);
+        brokerService.setPersistenceAdapter(persistenceFactory);
     }
 
     public void setUp() throws Exception {
@@ -284,35 +284,6 @@ public class AMQ2149Test extends AutoFai
         verifyStats(false);
     }
 
-    // no need to run this unless there are some issues with the others
-    public void noProblem_testOrderWithRestartAndVMIndex() throws Exception {
-        createBroker(new Configurer() {
-            public void configure(BrokerService broker) throws Exception {
-                AMQPersistenceAdapterFactory persistenceFactory =
-                    (AMQPersistenceAdapterFactory) broker.getPersistenceFactory();
-                persistenceFactory.setPersistentIndex(false);
-                broker.deleteAllMessages();     
-            }
-        });
-        
-        final Timer timer = new Timer();
-        schedualRestartTask(timer, new Configurer() {
-            public void configure(BrokerService broker) throws Exception {
-                AMQPersistenceAdapterFactory persistenceFactory =
-                    (AMQPersistenceAdapterFactory) broker.getPersistenceFactory();
-                persistenceFactory.setPersistentIndex(false);
-            }
-        });
-        
-        try {
-            verifyOrderedMessageReceipt();
-        } finally {
-            timer.cancel();
-        }
-        verifyStats(true);
-    }
-
-
     public void testOrderWithRestart() throws Exception {
         createBroker(new Configurer() {
             public void configure(BrokerService broker) throws Exception {
@@ -385,39 +356,6 @@ public class AMQ2149Test extends AutoFai
         verifyStats(true);
     }
 
-
-    // no need to run this unless there are issues with the other restart tests
-  
-    public void eaiserToRepoduce_testOrderWithRestartWithForceRecover() throws Exception {
-        createBroker(new Configurer() {
-            public void configure(BrokerService broker) throws Exception {
-                AMQPersistenceAdapterFactory persistenceFactory =
-                    (AMQPersistenceAdapterFactory) broker.getPersistenceFactory();
-                persistenceFactory.setForceRecoverReferenceStore(true);
-                broker.setPlugins(plugins);
-                broker.deleteAllMessages();     
-            }
-        });
-        
-        final Timer timer = new Timer();
-        schedualRestartTask(timer, new Configurer() {
-            public void configure(BrokerService broker) throws Exception {
-                AMQPersistenceAdapterFactory persistenceFactory =
-                    (AMQPersistenceAdapterFactory) broker.getPersistenceFactory();
-                persistenceFactory.setForceRecoverReferenceStore(true);
-                broker.setPlugins(plugins);
-            }
-        });
-        
-        try {
-            verifyOrderedMessageReceipt();
-        } finally {
-            timer.cancel();
-        }
-        
-        verifyStats(true);
-    }
-
     private void verifyStats(boolean brokerRestarts) throws Exception {
         RegionBroker regionBroker = (RegionBroker) broker.getRegionBroker();
         

Copied: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupLevelDBStoreTest.java (from r1445631, activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/async/NioDataFileAppenderTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupLevelDBStoreTest.java?p2=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupLevelDBStoreTest.java&p1=activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/async/NioDataFileAppenderTest.java&r1=1445631&r2=1445633&rev=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-amq-store/src/test/java/org/apache/activemq/kaha/impl/async/NioDataFileAppenderTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupLevelDBStoreTest.java Wed Feb 13 14:47:40 2013
@@ -14,12 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.kaha.impl.async;
+package org.apache.activemq.bugs;
 
-public class NioDataFileAppenderTest extends DataFileAppenderTest {
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.leveldb.LevelDBStore;
 
+
+public class SparseAckReplayAfterStoreCleanupLevelDBStoreTest extends AMQ2832Test {
     @Override
-    protected void configure(AsyncDataManager dataManager) {
-        dataManager.setUseNio(true);
+    protected void configurePersistence(BrokerService brokerService, boolean deleteAllOnStart) throws Exception {
+        LevelDBStore store = new LevelDBStore();
+        store.setFlushDelay(0);
+        brokerService.setPersistenceAdapter(store);
     }
 }

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java Wed Feb 13 14:47:40 2013
@@ -16,6 +16,14 @@
  */
 package org.apache.activemq.bugs;
 
+import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.Connection;
 import java.io.File;
 import java.text.DateFormat;
 import java.util.Date;
@@ -24,17 +32,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.jms.Connection;
-
-import junit.framework.TestCase;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
-import org.apache.activemq.store.kahadb.KahaDBStore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class VerifySteadyEnqueueRate extends TestCase {
 
     private static final Logger LOG = LoggerFactory.getLogger(VerifySteadyEnqueueRate.class);
@@ -44,7 +41,6 @@ public class VerifySteadyEnqueueRate ext
     private BrokerService broker;
     final boolean useTopic = false;
 
-    private final boolean useAMQPStore = false;
     protected static final String payload = new String(new byte[24]);
 
     @Override
@@ -134,39 +130,21 @@ public class VerifySteadyEnqueueRate ext
         broker.setPersistent(true);
         broker.setUseJmx(true);
 
-        if (useAMQPStore) {
-            AMQPersistenceAdapterFactory factory = (AMQPersistenceAdapterFactory) broker
-                    .getPersistenceFactory();
-            // ensure there are a bunch of data files but multiple entries in
-            // each
-            // factory.setMaxFileLength(1024 * 20);
-            // speed up the test case, checkpoint an cleanup early and often
-            // factory.setCheckpointInterval(500);
-            factory.setCleanupInterval(1000 * 60 * 30);
-            factory.setSyncOnWrite(false);
-
-            // int indexBinSize=262144; // good for 6M
-            int indexBinSize = 1024;
-            factory.setIndexMaxBinSize(indexBinSize * 2);
-            factory.setIndexBinSize(indexBinSize);
-            factory.setIndexPageSize(192 * 20);
-        } else {
-            KahaDBStore kaha = new KahaDBStore();
-            kaha.setDirectory(new File("target/activemq-data/kahadb"));
-            // The setEnableJournalDiskSyncs(false) setting is a little dangerous right now, as I have not verified
-            // what happens if the index is updated but a journal update is lost.
-            // Index is going to be in consistent, but can it be repaired?
-            kaha.setEnableJournalDiskSyncs(false);
-            // Using a bigger journal file size makes he take fewer spikes as it is not switching files as often.
-            kaha.setJournalMaxFileLength(1024*1024*100);
-
-            // small batch means more frequent and smaller writes
-            kaha.setIndexWriteBatchSize(100);
-            // do the index write in a separate thread
-            kaha.setEnableIndexWriteAsync(true);
+        KahaDBStore kaha = new KahaDBStore();
+        kaha.setDirectory(new File("target/activemq-data/kahadb"));
+        // The setEnableJournalDiskSyncs(false) setting is a little dangerous right now, as I have not verified
+        // what happens if the index is updated but a journal update is lost.
+        // Index is going to be in consistent, but can it be repaired?
+        kaha.setEnableJournalDiskSyncs(false);
+        // Using a bigger journal file size makes he take fewer spikes as it is not switching files as often.
+        kaha.setJournalMaxFileLength(1024*1024*100);
+
+        // small batch means more frequent and smaller writes
+        kaha.setIndexWriteBatchSize(100);
+        // do the index write in a separate thread
+        kaha.setEnableIndexWriteAsync(true);
 
-            broker.setPersistenceAdapter(kaha);
-        }
+        broker.setPersistenceAdapter(kaha);
 
         broker.addConnector("tcp://localhost:0").setName("Default");
         broker.start();

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsClient.java Wed Feb 13 14:47:40 2013
@@ -16,20 +16,16 @@
  */
 package org.apache.activemq.bugs.amq1974;
 
-import java.io.File;
-import java.net.URISyntaxException;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.network.DiscoveryNetworkConnector;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
 import org.apache.activemq.transport.discovery.simple.SimpleDiscoveryAgent;
 
+import javax.jms.*;
+import java.io.File;
+import java.net.URISyntaxException;
+
 public class TryJmsClient
 {
     private final BrokerService broker = new BrokerService();
@@ -47,9 +43,9 @@ public class TryJmsClient
 
         broker.getSystemUsage().getMemoryUsage().setLimit(10 * 1024 * 1024);
 
-        KahaPersistenceAdapter persist = new KahaPersistenceAdapter();
+        LevelDBStore persist = new LevelDBStore();
         persist.setDirectory(new File("/tmp/broker2"));
-        persist.setMaxDataFileLength(20 * 1024 * 1024);
+        persist.setLogSize(20 * 1024 * 1024);
         broker.setPersistenceAdapter(persist);
 
         String brokerUrl = "tcp://localhost:4501";

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/amq1974/TryJmsManager.java Wed Feb 13 14:47:40 2013
@@ -15,20 +15,17 @@
  * limitations under the License.
  */
 package org.apache.activemq.bugs.amq1974;
-import java.io.File;
-import java.net.URISyntaxException;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
+
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.network.DiscoveryNetworkConnector;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
 import org.apache.activemq.transport.discovery.simple.SimpleDiscoveryAgent;
 
+import javax.jms.*;
+import java.io.File;
+import java.net.URISyntaxException;
+
 public class TryJmsManager {
 
     private final BrokerService broker = new BrokerService();
@@ -46,9 +43,9 @@ public class TryJmsManager {
 
         broker.getSystemUsage().getMemoryUsage().setLimit(10 * 1024 * 1024);
 
-        KahaPersistenceAdapter persist = new KahaPersistenceAdapter();
+        LevelDBStore persist = new LevelDBStore();
         persist.setDirectory(new File("/tmp/broker1"));
-        persist.setMaxDataFileLength(20 * 1024 * 1024);
+        persist.setLogSize(20 * 1024 * 1024);
         broker.setPersistenceAdapter(persist);
 
         String brokerUrl = "tcp://localhost:4500";

Copied: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBDurableTopicTest.java (from r1445631, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBDurableTopicTest.java?p2=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBDurableTopicTest.java&p1=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java&r1=1445631&r2=1445633&rev=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBDurableTopicTest.java Wed Feb 13 14:47:40 2013
@@ -17,12 +17,12 @@ revision 946600 * Licensed to the Apache
 package org.apache.activemq.perf;
 
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 
 /**
  * 
  */
-public class KahaDurableTopicTest extends SimpleDurableTopicTest {
+public class LevelDBDurableTopicTest extends SimpleDurableTopicTest {
 
     /*
      * protected BrokerService createBroker() throws Exception{ Resource
@@ -34,8 +34,8 @@ public class KahaDurableTopicTest extend
 
     @Override
     protected void configureBroker(BrokerService answer,String uri) throws Exception {
-        KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter();
-        answer.setPersistenceAdapter(adaptor);
+        LevelDBStore store = new LevelDBStore();
+        answer.setPersistenceAdapter(store);
         answer.setDeleteAllMessagesOnStartup(true);
         answer.addConnector(uri);
        

Copied: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBStoreQueueTest.java (from r1445631, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBStoreQueueTest.java?p2=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBStoreQueueTest.java&p1=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java&r1=1445631&r2=1445633&rev=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/LevelDBStoreQueueTest.java Wed Feb 13 14:47:40 2013
@@ -19,18 +19,18 @@ package org.apache.activemq.perf;
 import java.io.File;
 
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 
 /**
  * 
  */
-public class AMQStoreQueueTest extends SimpleQueueTest {
+public class LevelDBStoreQueueTest extends SimpleQueueTest {
 
     protected void configureBroker(BrokerService answer,String uri) throws Exception {
 
         File dataFileDir = new File("target/test-amq-data/perfTest/amq");
 
-        AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter();
+        LevelDBStore adaptor = new LevelDBStore();
         adaptor.setDirectory(dataFileDir);
 
         answer.setPersistenceAdapter(adaptor);

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/QueueConnectionMemoryTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/QueueConnectionMemoryTest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/QueueConnectionMemoryTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/QueueConnectionMemoryTest.java Wed Feb 13 14:47:40 2013
@@ -22,7 +22,7 @@ import javax.jms.JMSException;
 import javax.jms.Session;
 
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,7 +53,7 @@ public class QueueConnectionMemoryTest e
 
     @Override
     protected void configureBroker(BrokerService answer,String uri) throws Exception {
-        KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter();
+        LevelDBStore adaptor = new LevelDBStore();
         answer.setPersistenceAdapter(adaptor);
         answer.addConnector(uri);
         answer.setDeleteAllMessagesOnStartup(true);

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java Wed Feb 13 14:47:40 2013
@@ -16,13 +16,14 @@
  */
 package org.apache.activemq.perf;
 
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.leveldb.LevelDBStoreFactory;
+
 import javax.jms.ConnectionFactory;
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
 import javax.jms.JMSException;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
 
 /**
  * 
@@ -38,13 +39,11 @@ public class SimpleDurableTopicTest exte
         playloadSize = 1024;
         super.setUp();
     }
-    
+
+
     @Override
     protected void configureBroker(BrokerService answer,String uri) throws Exception {
-        AMQPersistenceAdapterFactory persistenceFactory = new AMQPersistenceAdapterFactory();
-        persistenceFactory.setMaxFileLength(1024*16);
-        persistenceFactory.setPersistentIndex(true);
-        persistenceFactory.setCleanupInterval(10000);
+        LevelDBStoreFactory persistenceFactory = new LevelDBStoreFactory();
         answer.setPersistenceFactory(persistenceFactory);
         //answer.setDeleteAllMessagesOnStartup(true);
         answer.addConnector(uri);

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java Wed Feb 13 14:47:40 2013
@@ -45,8 +45,7 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
 import org.apache.activemq.util.ThreadTracker;
 import org.junit.After;
@@ -850,7 +849,7 @@ public class DurableSubProcessConcurrent
     }
 
     private enum Persistence {
-        MEMORY, AMQ, KAHA, KAHADB
+        MEMORY, LEVELDB, KAHADB
     }
 
     private void startBroker() throws Exception {
@@ -871,28 +870,17 @@ public class DurableSubProcessConcurrent
             broker.setPersistent(false);
             break;
 
-        case AMQ:
-            File amqData = new File("activemq-data/" + getName() + "-amq");
+        case LEVELDB:
+            File amqData = new File("activemq-data/" + getName() + "-leveldb");
             if (deleteAllMessages)
                 delete(amqData);
 
             broker.setPersistent(true);
-            AMQPersistenceAdapter amq = new AMQPersistenceAdapter();
+            LevelDBStore amq = new LevelDBStore();
             amq.setDirectory(amqData);
             broker.setPersistenceAdapter(amq);
             break;
 
-        case KAHA:
-            File kahaData = new File("activemq-data/" + getName() + "-kaha");
-            if (deleteAllMessages)
-                delete(kahaData);
-
-            broker.setPersistent(true);
-            KahaPersistenceAdapter kaha = new KahaPersistenceAdapter();
-            kaha.setDirectory(kahaData);
-            broker.setPersistenceAdapter(kaha);
-            break;
-
         case KAHADB:
             File kahadbData = new File("activemq-data/" + getName() + "-kahadb");
             if (deleteAllMessages)

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessWithRestartTest.java Wed Feb 13 14:47:40 2013
@@ -42,8 +42,7 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
 import org.junit.After;
 import org.junit.Before;
@@ -753,7 +752,7 @@ public class DurableSubProcessWithRestar
     }
 
     private enum Persistence {
-        MEMORY, AMQ, KAHA, KAHADB
+        MEMORY, LEVELDB, KAHADB
     }
 
     private void startBroker() throws Exception {
@@ -774,28 +773,17 @@ public class DurableSubProcessWithRestar
             broker.setPersistent(false);
             break;
 
-        case AMQ:
-            File amqData = new File("activemq-data/" + getName() + "-amq");
+        case LEVELDB:
+            File datadir = new File("activemq-data/" + getName() + "-leveldb");
             if (deleteAllMessages)
-                delete(amqData);
+                delete(datadir);
 
             broker.setPersistent(true);
-            AMQPersistenceAdapter amq = new AMQPersistenceAdapter();
-            amq.setDirectory(amqData);
+            LevelDBStore amq = new LevelDBStore();
+            amq.setDirectory(datadir);
             broker.setPersistenceAdapter(amq);
             break;
 
-        case KAHA:
-            File kahaData = new File("activemq-data/" + getName() + "-kaha");
-            if (deleteAllMessages)
-                delete(kahaData);
-
-            broker.setPersistent(true);
-            KahaPersistenceAdapter kaha = new KahaPersistenceAdapter();
-            kaha.setDirectory(kahaData);
-            broker.setPersistenceAdapter(kaha);
-            break;
-
         case KAHADB:
             File kahadbData = new File("activemq-data/" + getName() + "-kahadb");
             if (deleteAllMessages)

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java Wed Feb 13 14:47:40 2013
@@ -16,22 +16,7 @@
  */
 package org.apache.activemq.usecases;
 
-import static org.apache.activemq.TestSupport.getDestination;
-import static org.apache.activemq.TestSupport.getDestinationStatistics;
-
-import java.io.File;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
 import junit.framework.Test;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.CombinationTestSupport;
 import org.apache.activemq.broker.BrokerService;
@@ -41,11 +26,18 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.util.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.jms.*;
+import java.io.File;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.apache.activemq.TestSupport.getDestination;
+import static org.apache.activemq.TestSupport.getDestinationStatistics;
+
 public class ExpiredMessagesTest extends CombinationTestSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(ExpiredMessagesTest.class);
@@ -299,9 +291,8 @@ public class ExpiredMessagesTest extends
         BrokerService broker = new BrokerService();
         broker.setBrokerName("localhost");
         broker.setDestinations(new ActiveMQDestination[]{destination});
-        AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter();
+        LevelDBStore adaptor = new LevelDBStore();
         adaptor.setDirectory(new File("target/expiredtest-data/"));
-        adaptor.setForceRecoverReferenceStore(true);
         broker.setPersistenceAdapter(adaptor);
 
         PolicyEntry defaultPolicy = new PolicyEntry();

Copied: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java (from r1445631, activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDurableSubscriptionTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java?p2=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java&p1=activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDurableSubscriptionTest.java&r1=1445631&r2=1445633&rev=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/KahaDurableSubscriptionTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/LevelDBDurableSubscriptionTest.java Wed Feb 13 14:47:40 2013
@@ -18,24 +18,20 @@ package org.apache.activemq.usecases;
 
 import java.io.File;
 import java.io.IOException;
+
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
 
 /**
  * 
  */
-public class KahaDurableSubscriptionTest extends DurableSubscriptionTestSupport {
+public class LevelDBDurableSubscriptionTest extends DurableSubscriptionTestSupport {
 
     protected PersistenceAdapter createPersistenceAdapter() throws IOException {
-        File dataDir = new File("target/test-data/durableKaha");
-        KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter();
+        File dataDir = new File("target/test-data/durableLevelDB");
+        LevelDBStore adaptor = new LevelDBStore();
         adaptor.setDirectory(dataDir);
         return adaptor;
     }
 
-
-    public void testDurableSubscriptionRetroactive() throws Exception {
-        // nop
-    }
-
 }

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java Wed Feb 13 14:47:40 2013
@@ -26,7 +26,7 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 
 public class ManagedDurableSubscriptionTest extends org.apache.activemq.TestSupport {
 
@@ -71,7 +71,7 @@ public class ManagedDurableSubscriptionT
         broker = BrokerFactory.createBroker("broker:(vm://localhost)");
         broker.setKeepDurableSubsActive(false);
         broker.setPersistent(true);
-        KahaPersistenceAdapter persistenceAdapter = new KahaPersistenceAdapter();
+        LevelDBStore persistenceAdapter = new LevelDBStore();
         persistenceAdapter.setDirectory(new File("activemq-data/" + getName()));
         broker.setPersistenceAdapter(persistenceAdapter);
         broker.setUseJmx(true);

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java Wed Feb 13 14:47:40 2013
@@ -34,8 +34,8 @@ import javax.jms.Topic;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
 import org.apache.activemq.util.IdGenerator;
 
 public class ReliableReconnectTest extends org.apache.activemq.TestSupport {
@@ -81,10 +81,6 @@ public class ReliableReconnectTest exten
             broker.setDeleteAllMessagesOnStartup(deleteOnStart);
            
             broker.setUseJmx(false);
-            PersistenceAdapter adaptor = broker.getPersistenceAdapter();
-            if (adaptor instanceof AMQPersistenceAdapter) {
-                ((AMQPersistenceAdapter)adaptor).setDisableLocking(true);
-            }
             broker.addConnector(DEFAULT_BROKER_URL);
             broker.start();
         } catch (Exception e) {

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.java Wed Feb 13 14:47:40 2013
@@ -20,14 +20,14 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.activemq.leveldb.LevelDBStore;
 
 
 public class ThreeBrokerVirtualTopicNetworkAMQPATest extends ThreeBrokerVirtualTopicNetworkTest {
     
      protected void configurePersistenceAdapter(BrokerService broker) throws IOException {
         File dataFileDir = new File("target/test-amq-data/amq/" + broker.getBrokerName());
-        AMQPersistenceAdapter adapter = new AMQPersistenceAdapter();
+        LevelDBStore adapter = new LevelDBStore();
         adapter.setDirectory(dataFileDir);
         broker.setPersistenceAdapter(adapter);
     }

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Wed Feb 13 14:47:40 2013
@@ -77,10 +77,6 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-amq-store</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-kahadb-store</artifactId>
     </dependency>
     <dependency>

Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Wed Feb 13 14:47:40 2013
@@ -149,7 +149,6 @@
         <include>${pom.groupId}:activemq-leveldb-store</include>
         <include>${pom.groupId}:activemq-log4j-appender</include>
         <include>${pom.groupId}:activemq-pool</include>
-        <include>${pom.groupId}:activemq-xmpp</include>
         <include>${pom.groupId}:activemq-spring</include>
         <include>${pom.groupId}:activeio-core</include>
         <include>commons-beanutils:commons-beanutils</include>
@@ -175,9 +174,6 @@
         <include>org.springframework:spring-oxm</include>
         <include>org.springframework:spring-tx</include>
         <include>com.thoughtworks.xstream:xstream</include>
-        <include>xpp3:xpp3</include>
-        <include>org.codehaus.woodstox:woodstox-core-asl</include>
-        <include>org.codehaus.woodstox:stax2-api</include>
         <include>org.codehaus.jettison:jettison</include>
         <include>org.apache.velocity:velocity</include>
         <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.josql</include>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1445633&r1=1445632&r2=1445633&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Wed Feb 13 14:47:40 2013
@@ -217,7 +217,6 @@
     <module>activemq-amqp</module>
 
     <module>activemq-kahadb-store</module>
-    <module>activemq-amq-store</module>
     <module>activemq-jdbc-store</module>
     <module>activemq-leveldb-store</module>
 
@@ -227,7 +226,6 @@
     <module>activemq-console</module>
     <module>activemq-fileserver</module>
     <module>activemq-jaas</module>
-    <!-- <module>activemq-blueprint</module> -->
     <module>activemq-karaf</module>
     <module>activemq-karaf-itest</module>
     <module>activemq-openwire-generator</module>
@@ -241,7 +239,6 @@
     <module>activemq-web</module>
     <module>activemq-web-demo</module>
     <module>activemq-web-console</module>
-    <!-- <module>activemq-xmpp</module> -->
     <module>activemq-itests-spring31</module>
     <module>assembly</module>
     <module>activemq-log4j-appender</module>



Mime
View raw message