From 715010a1eabea3783e5f85a9730ff9cc41755803 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Tue, 6 Nov 2012 22:03:14 +0000 Subject: [PATCH] Merged the kahadb module into activemq-core since it's the only known user of the module. Will allow us to eliminate dup util classes. git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406368 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-all/pom.xml | 4 - activemq-core/pom.xml | 790 +++++++++--------- .../org/apache/kahadb/index/BTreeIndex.java | 0 .../org/apache/kahadb/index/BTreeNode.java | 0 .../org/apache/kahadb/index/BTreeVisitor.java | 0 .../java/org/apache/kahadb/index/HashBin.java | 0 .../org/apache/kahadb/index/HashIndex.java | 0 .../java/org/apache/kahadb/index/Index.java | 0 .../org/apache/kahadb/index/ListIndex.java | 0 .../org/apache/kahadb/index/ListNode.java | 0 .../CallerBufferingDataFileAppender.java | 0 .../org/apache/kahadb/journal/DataFile.java | 0 .../kahadb/journal/DataFileAccessor.java | 0 .../kahadb/journal/DataFileAccessorPool.java | 0 .../kahadb/journal/DataFileAppender.java | 0 .../apache/kahadb/journal/FileAppender.java | 0 .../org/apache/kahadb/journal/Journal.java | 0 .../org/apache/kahadb/journal/Location.java | 0 .../kahadb/journal/ReadOnlyDataFile.java | 0 .../kahadb/journal/ReadOnlyJournal.java | 0 .../kahadb/journal/ReplicationTarget.java | 0 .../org/apache/kahadb/journal/package.html | 0 .../main/java/org/apache/kahadb/package.html | 0 .../java/org/apache/kahadb/page/Page.java | 0 .../java/org/apache/kahadb/page/PageFile.java | 0 .../org/apache/kahadb/page/Transaction.java | 0 .../kahadb/util/ByteArrayInputStream.java | 0 .../kahadb/util/ByteArrayOutputStream.java | 0 .../org/apache/kahadb/util/ByteSequence.java | 0 .../apache/kahadb/util/BytesMarshaller.java | 0 .../kahadb/util/CommandLineSupport.java | 0 .../kahadb/util/DataByteArrayInputStream.java | 0 .../util/DataByteArrayOutputStream.java | 0 .../org/apache/kahadb/util/DiskBenchmark.java | 0 .../org/apache/kahadb/util/HexSupport.java | 0 .../kahadb/util/IOExceptionSupport.java | 0 .../java/org/apache/kahadb/util/IOHelper.java | 0 .../apache/kahadb/util/IntegerMarshaller.java | 0 .../kahadb/util/IntrospectionSupport.java | 0 .../java/org/apache/kahadb/util/LFUCache.java | 0 .../java/org/apache/kahadb/util/LRUCache.java | 0 .../org/apache/kahadb/util/LinkedNode.java | 0 .../apache/kahadb/util/LinkedNodeList.java | 0 .../kahadb/util/LocationMarshaller.java | 0 .../java/org/apache/kahadb/util/LockFile.java | 0 .../apache/kahadb/util/LongMarshaller.java | 0 .../org/apache/kahadb/util/Marshaller.java | 0 .../apache/kahadb/util/ObjectMarshaller.java | 0 .../org/apache/kahadb/util/Scheduler.java | 0 .../kahadb/util/SchedulerTimerTask.java | 0 .../java/org/apache/kahadb/util/Sequence.java | 0 .../org/apache/kahadb/util/SequenceSet.java | 0 .../apache/kahadb/util/StringMarshaller.java | 0 .../kahadb/util/VariableMarshaller.java | 0 .../kahadb/index/BTreeIndexBenchMark.java | 0 .../apache/kahadb/index/BTreeIndexTest.java | 0 .../kahadb/index/HashIndexBenchMark.java | 0 .../apache/kahadb/index/HashIndexTest.java | 0 .../apache/kahadb/index/IndexBenchmark.java | 0 .../apache/kahadb/index/IndexTestSupport.java | 0 .../apache/kahadb/index/ListIndexTest.java | 0 .../apache/kahadb/journal/JournalTest.java | 0 .../org/apache/kahadb/page/PageFileTest.java | 0 .../util/DataByteArrayInputStreamTest.java | 0 .../util/DataByteArrayOutputStreamTest.java | 0 .../apache/kahadb/util/SequenceSetTest.java | 0 assembly/pom.xml | 4 - kahadb/README | 24 - kahadb/pom.xml | 97 --- .../org/apache/activemq/transport/kdbr | 17 - .../org/apache/activemq/wireformat/kdbr | 17 - .../test/eclipse-resources/log4j.properties | 36 - kahadb/src/test/resources/log4j.properties | 36 - pom.xml | 6 - 74 files changed, 393 insertions(+), 638 deletions(-) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/index/BTreeIndex.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/index/BTreeNode.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/index/BTreeVisitor.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/index/HashBin.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/index/HashIndex.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/index/Index.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/index/ListIndex.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/index/ListNode.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/DataFile.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/DataFileAppender.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/FileAppender.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/Journal.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/Location.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/journal/package.html (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/package.html (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/page/Page.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/page/PageFile.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/page/Transaction.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/ByteArrayInputStream.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/ByteArrayOutputStream.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/ByteSequence.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/BytesMarshaller.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/CommandLineSupport.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/DiskBenchmark.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/HexSupport.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/IOExceptionSupport.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/IOHelper.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/IntrospectionSupport.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/LFUCache.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/LRUCache.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/LinkedNode.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/LinkedNodeList.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/LocationMarshaller.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/LockFile.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/LongMarshaller.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/Marshaller.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/Scheduler.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/Sequence.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/SequenceSet.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/StringMarshaller.java (100%) rename {kahadb => activemq-core}/src/main/java/org/apache/kahadb/util/VariableMarshaller.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/index/HashIndexTest.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/index/IndexBenchmark.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/index/IndexTestSupport.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/index/ListIndexTest.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/journal/JournalTest.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/page/PageFileTest.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/util/DataByteArrayInputStreamTest.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/util/DataByteArrayOutputStreamTest.java (100%) rename {kahadb => activemq-core}/src/test/java/org/apache/kahadb/util/SequenceSetTest.java (100%) delete mode 100644 kahadb/README delete mode 100755 kahadb/pom.xml delete mode 100644 kahadb/src/main/resources/META-INF/services/org/apache/activemq/transport/kdbr delete mode 100644 kahadb/src/main/resources/META-INF/services/org/apache/activemq/wireformat/kdbr delete mode 100644 kahadb/src/test/eclipse-resources/log4j.properties delete mode 100644 kahadb/src/test/resources/log4j.properties diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml index 918135a44b..7cd815a884 100644 --- a/activemq-all/pom.xml +++ b/activemq-all/pom.xml @@ -45,10 +45,6 @@ ${project.groupId} activemq-optional - - ${project.groupId} - kahadb - org.apache.geronimo.specs geronimo-annotation_1.0_spec diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml index 8e90cfd7d8..f02f50cbdc 100755 --- a/activemq-core/pom.xml +++ b/activemq-core/pom.xml @@ -62,6 +62,7 @@ org.apache.activemq*;version=${project.version};-noimport:=true, + org.apache.kahadb*;version=${project.version};-noimport:=true, '=META-INF.services.org.apache.xbean.spring.http.activemq.apache.org.schema';-noimport:=true * @@ -85,11 +86,6 @@ activeio-core true - - org.apache.activemq - kahadb - false - org.apache.activemq.protobuf activemq-protobuf @@ -743,408 +739,408 @@ org/apache/activemq/openwire/v*/** - org/apache/activemq/camel/TransactedConsumeTest.* - org/apache/activemq/usecases/JdbcDurableSubDupTest.* - org/apache/activemq/bugs/AMQ1893Test.* - org/apache/activemq/usecases/TopicReplicationTest.* - org/apache/activemq/bugs/AMQ3120Test.* - org/apache/activemq/bugs/AMQ2149KahaDBTest.* - org/apache/activemq/usecases/DurableSubSelectorDelayTest.* - org/apache/activemq/usecases/DispatchMultipleConsumersTest.* - org/apache/activemq/bugs/AMQ2183Test.* - org/apache/activemq/usecases/UnlimitedEnqueueTest.* - org/apache/activemq/usecases/DurableSubProcessTest.* - org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.* - org/apache/activemq/bugs/TempStoreDataCleanupTest.* - org/apache/activemq/bugs/AMQ2356Test.* - org/apache/activemq/bugs/MemoryUsageCleanupTest.* - org/apache/activemq/bugs/AMQ2870Test.* - org/apache/activemq/bugs/AMQ2584Test.* - org/apache/activemq/broker/virtual/MirroredQueueCorrectMemoryUsageTest.* - org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.* - org/apache/activemq/bugs/AMQ1936Test.* - org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.* - org/apache/activemq/bugs/SlowConsumerTest.* - org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.* - org/apache/activemq/bugs/MissingDataFileTest.* - org/apache/activemq/transport/failover/AMQ1925Test.* - org/apache/activemq/bugs/AMQ3732Test.* - org/apache/activemq/bugs/AMQ2512Test.* - org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.* - org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.* - org/apache/activemq/bugs/AMQ3567Test.* - org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.* - org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.* - org/apache/activemq/usecases/DurableSubSelectorDelayWithRestartTest.* - org/apache/activemq/bugs/AMQ2149Test.* - org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.* - org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.* - org/apache/activemq/store/kahadb/KahaDBVersionTest.* - org/apache/activemq/usecases/DurableSubscriptionSelectorTest.* - org/apache/activemq/transport/stomp/StompNIOSSLLoadTest.* - org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.* - org/apache/activemq/transport/stomp/StompLoadTest.* - org/apache/activemq/transport/stomp/StompSSLLoadTest.* - org/apache/activemq/transport/stomp/StompNIOLoadTest.* - org/apache/activemq/network/NetworkLoadTest.* - org/apache/activemq/bugs/TempStorageBlockedBrokerTest.* - org/apache/activemq/broker/region/cursors/NegativeQueueTest.* - org/apache/activemq/transport/failover/FailoverPriorityTest.* - org/apache/activemq/bugs/AMQ2983Test.* - org/apache/activemq/bugs/AMQ3140Test.* - org/apache/activemq/usecases/CompositePublishTest.* - org/apache/activemq/bugs/DoubleExpireTest.* - org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.* - org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.* - org/apache/activemq/usecases/TopicProducerFlowControlTest.* - org/apache/activemq/usecases/TempTopicProducerFlowControlTest.* - org/apache/activemq/store/jdbc/JDBCNegativeQueueTest.* - org/apache/activemq/bugs/AMQ2314Test.* - org/apache/activemq/kaha/LoadTest.* - org/apache/activemq/transport/stomp/StompVirtualTopicTest.* - org/apache/activemq/bugs/AMQ2439Test.* - org/apache/activemq/transport/failover/FailoverDuplicateTest.* - org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.* - org/apache/activemq/ExpiryHogTest.* - org/apache/activemq/usecases/BrowseOverNetworkTest.* - org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.* - org/apache/kahadb/index/HashIndexTest.* - org/apache/activemq/broker/ft/MasterSlaveSlaveShutdownTest.* - org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.* - org/apache/kahadb/index/BTreeIndexTest.* - org/apache/activemq/bugs/AMQ2021Test.* - org/apache/activemq/transport/SoWriteTimeoutTest.* - org/apache/activemq/usage/StoreUsageTest.* - org/apache/activemq/MessageEvictionTest.* - org/apache/activemq/bugs/DurableConsumerTest.* - org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.* - org/apache/activemq/proxy/ProxyFailoverTest.* - org/apache/activemq/usecases/DiscriminatingConsumerLoadTest.* - org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.* - org/apache/activemq/usecases/DurableSubscriptionReactivationTest.* - org/apache/activemq/transport/failover/FailoverComplexClusterTest.* - org/apache/activemq/usecases/QueueDuplicatesTest.* - org/apache/activemq/usecases/ThreeBrokerStompTemporaryQueueTest.* - org/apache/activemq/console/command/AMQJournalToolTest.* - org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.* - org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.* - org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.* - org/apache/activemq/bugs/VMTransportClosureTest.* - org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.* - org/apache/activemq/transport/http/HttpClientReconnectTest.* - org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.* - org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.* - org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.* - org/apache/activemq/camel/component/InvokeRequestReplyUsingJmsReplyToHeaderTest.* - org/apache/activemq/usecases/AMQ2927Test.* - org/apache/activemq/network/jms/QueueBridgeXBeanTest.* - org/apache/activemq/usecases/MultiBrokersMultiClientsTest.* - org/apache/activemq/network/jms/TopicBridgeXBeanTest.* - org/apache/activemq/network/jms/TopicBridgeSpringTest.* - org/apache/activemq/transport/failover/ReconnectTest.* - org/apache/activemq/network/jms/QueueBridgeTest.* - org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.* - org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.* - org/apache/activemq/PerDestinationStoreLimitTest.* - org/apache/activemq/transport/discovery/MasterSlaveDiscoveryTest.* - org/apache/activemq/bugs/AMQ3445Test.* - org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.* - org/apache/activemq/transport/failover/InitalReconnectDelayTest.* - org/apache/activemq/transport/failover/FailoverTransactionTest.* - org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.* - org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.* - org/apache/activemq/usecases/ClientRebalanceTest.* - org/apache/activemq/camel/JmsJdbcXATest.* - org/apache/activemq/store/kahadb/KahaDBTest.* - org/apache/activemq/broker/jmx/PurgeTest.* - org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.* - org/apache/activemq/xbean/XBeanXmlTest.* - org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.* - org/apache/activemq/broker/scheduler/JmsSchedulerTest.* - org/apache/activemq/bugs/AMQ3625Test.* - org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.* - org/apache/activemq/store/StorePerDestinationTest.* - org/apache/activemq/bugs/AMQ3167Test.* - org/apache/activemq/store/AutoStorePerDestinationTest.* - org/apache/activemq/bugs/AMQ2982Test.* - org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.* - org/apache/activemq/bugs/DataFileNotDeletedTest.* - org/apache/activemq/spring/ParallelXATransactionTest.* - org/apache/activemq/network/NetworkRestartPlainTest.* - org/apache/activemq/network/NetworkRestartTest.* - org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.* - org/apache/activemq/camel/AMQ2611Test.* - org/apache/activemq/bugs/AMQ3352Test.* - org/apache/activemq/usecases/DurableSubscriberNonPersistentMessageTest.* - org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.* - org/apache/activemq/store/kahadb/KahaDBMessagePriorityTest.* - org/apache/bugs/AMQ1730Test.* - org/apache/activemq/bugs/ConnectionPerMessageTest.* - org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.* - org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.* - org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.* - org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.* - org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.* - org/apache/activemq/transport/TopicClusterTest.* - org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.* - org/apache/activemq/transport/mqtt/MTQQNioTest.* - org/apache/activemq/transport/mqtt/MQTTTest.* - org/apache/activemq/ra/FailoverManagedClusterTest.* - org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.* - org/apache/activemq/transport/QueueClusterTest.* - org/apache/activemq/usecases/ExpiredMessagesTest.* - org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.* - org/apache/activemq/network/DuplexNetworkMBeanTest.* - org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.* - org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.* - org/apache/activemq/usecases/DurableSubscriptionActivationTest.* - org/apache/activemq/broker/ft/TopicMasterSlaveTest.* - org/apache/activemq/usecases/MessageReroutingTest.* - org/apache/activemq/usecases/ThreeBrokerTempQueueNetworkTest.* - org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.* - org/apache/activemq/transport/SoWriteTimeoutClientTest.* - org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.* - org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementTest.* - org/apache/activemq/broker/ft/QueueMasterSlaveTest.* - org/apache/activemq/bugs/AMQ2401Test.* - org/apache/activemq/advisory/TempQueueMemoryTest.* - org/apache/activemq/network/FailoverStaticNetworkTest.* - org/apache/activemq/usecases/DurableSubscriptionOfflineTest.* - org/apache/activemq/bugs/AMQ2413Test.* - org/apache/activemq/transport/stomp/ConnectTest.* - org/apache/activemq/broker/region/UniquePropertyMessageEvictionStrategyTest.* - org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.* - org/apache/activemq/JmsAutoAckListenerTest.* - org/apache/activemq/advisory/TempDestLoadTest.* - org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.* - org/apache/activemq/util/LRUCacheTest.* - org/apache/activemq/network/SimpleNetworkTest.* - org/apache/activemq/broker/store/RecoverExpiredMessagesTest.* - org/apache/activemq/JmsClientAckListenerTest.* - org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.* - org/apache/activemq/bugs/AMQ3157Test.* - org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.* - org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.* - org/apache/activemq/ConsumerReceiveWithTimeoutTest.* - org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.* - org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.* - org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.* - org/apache/activemq/store/kahadb/KahaDBStoreRecoveryExpiryTest.* - org/apache/activemq/bugs/AMQ2832Test.* - org/apache/activemq/RemoveDestinationTest.* - org/apache/activemq/network/DuplexNetworkTest.* - org/apache/activemq/network/NetworkBrokerDetachTest.* - org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.* - org/apache/activemq/bugs/JmsTimeoutTest.* - org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.* - org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.* - org/apache/activemq/usecases/MessageGroupCloseTest.* - org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupAMQStoreTest.* - org/apache/activemq/bugs/AMQ2645Test.* - org/apache/activemq/bugs/AMQ2764Test.* - org/apache/kahadb/util/DataByteArrayInputStreamTest.* - org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.* - org/apache/activemq/transport/failover/FailoverClusterTest.* - org/apache/activemq/bugs/AMQ3529Test.* - org/apache/activemq/bugs/AMQ2751Test.* - org/apache/activemq/usecases/DurableUnsubscribeTest.* - org/apache/activemq/usecases/ConcurrentDestinationCreationTest.* - org/apache/activemq/usecases/StaticNetworkTest.* - org/apache/activemq/usecases/StartAndStopBrokerTest.* - org/apache/activemq/util/DataByteArrayInputStreamTest.* - org/apache/activemq/broker/JdbcXARecoveryBrokerTest.* - org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.* - org/apache/activemq/broker/virtual/VirtualTopicDLQTest.* - org/apache/activemq/usecases/ReliableReconnectTest.* - org/apache/activemq/bugs/AMQ3141Test.* - org/apache/activemq/usecases/JournalDurableSubscriptionTest.* - org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.* - org/apache/activemq/advisory/MasterSlaveTempQueueMemoryTest.* - org/apache/activemq/bugs/AMQ2910Test.* - org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.* - org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.* - org/apache/activemq/bugs/AMQ1853Test.* - org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.* - org/apache/activemq/bugs/MessageExpirationReaperTest.* - org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.* - org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.* - org/apache/activemq/bugs/JMSDurableTopicNoLocalTest.* - org/apache/activemq/broker/region/DestinationGCTest.* - org/apache/activemq/web/AjaxTest.* - org/apache/activemq/usecases/AdvisoryTopicCleanUpTest.* - org/apache/activemq/bugs/AMQ1917Test.* - org/apache/activemq/console/command/TestPurgeCommand.* - org/apache/activemq/OnePrefetchAsyncConsumerTest.* - org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.* - org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.* - org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.* - org/apache/activemq/bugs/AMQ2513Test.* - org/apache/activemq/usecases/TransientQueueRedeliverTest.* - org/apache/activemq/usecases/TopicRedeliverTest.* - org/apache/activemq/usecases/QueueRedeliverTest.* - org/apache/activemq/transport/failover/FailoverTransportBackupsTest.* - org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.* - org/apache/activemq/usecases/MessageGroupDelayedTest.* - org/apache/activemq/transport/stomp/StompSslAuthTest.* - org/apache/activemq/QueueConsumerPriorityTest.* - org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.* - org/apache/activemq/security/JaasNetworkTest.* - org/apache/activemq/bugs/AMQ3145Test.* - org/apache/activemq/broker/policy/AbortSlowConsumerTest.* - org/apache/activemq/store/jdbc/JDBCXACommitExceptionTest.* - org/apache/kahadb/index/ListIndexTest.* - org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.* - org/apache/activemq/usecases/JDBCDurableSubscriptionTest.* - org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.* - org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.* - org/apache/activemq/bugs/AMQ3274Test.* - org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.* - org/apache/activemq/bugs/MemoryUsageBlockResumeTest.* - org/apache/activemq/usecases/LargeQueueSparseDeleteTest.* - org/apache/activemq/network/NetworkReconnectTest.* - org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.* - org/apache/activemq/transport/failover/FailoverUpdateURIsTest.* - org/apache/activemq/usecases/AMQStackOverFlowTest.* - org/apache/activemq/camel/component/ActiveMQRouteTest.* - org/apache/activemq/transport/tcp/InactivityMonitorTest.* - org/apache/activemq/network/NetworkRemovesSubscriptionsTest.* - org/apache/activemq/console/command/TestAMQ3410.* - org/apache/activemq/broker/region/cursors/CursorDurableTest.* - org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.* - org/apache/activemq/transport/stomp/StompSslTest.* - org/apache/activemq/transport/http/HttpSpringTest.* - org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.* + org/apache/activemq/ActiveMQInputStreamTest.* org/apache/activemq/ActiveMQMessageAuditTest.* - org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.* - org/apache/activemq/spring/Spring2XmlNamespacesTest.* - org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.* - org/apache/activemq/pool/PooledConnectionFactoryTest.* - org/apache/activemq/network/DemandForwardingBridgeFilterTest.* - org/apache/activemq/test/message/NestedMapMessageTest.* - org/apache/activemq/transport/failover/FailoverTimeoutTest.* - org/apache/activemq/broker/scheduler/JobSchedulerTest.* - org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.* - org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.* - org/apache/activemq/bugs/AMQ3454Test.* - org/apache/activemq/bugs/AMQ2171Test.* - org/apache/activemq/broker/RedeliveryRestartTest.* - org/apache/activemq/store/kahadb/KahaDBStoreTest.* - org/apache/activemq/TimeStampTest.* - org/apache/activemq/bugs/AMQ3324Test.* - org/apache/activemq/config/ConfigTest.* - org/apache/activemq/usecases/NetworkAsyncStartTest.* - org/apache/bugs/LoadBalanceTest.* - org/apache/activemq/kaha/impl/index/hash/HashTest.* - org/apache/activemq/transport/fanout/FanoutTest.* - org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.* - org/apache/activemq/broker/ReconnectWithJMXEnabledTest.* - org/apache/activemq/bugs/CraigsBugTest.* - org/apache/activemq/transport/tcp/SslBrokerServiceTest.* - org/apache/activemq/test/message/NestedMapAndListPropertyTest.* - org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.* - org/apache/activemq/broker/XARecoveryBrokerTest.* - org/apache/activemq/store/jdbc/JDBCPersistenceAdapterTest.* - org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.* org/apache/activemq/BrokerConfigTest.* - org/apache/activemq/bugs/AMQ2084Test.* - org/apache/activemq/transport/failover/FailoverRandomTest.* - org/apache/activemq/console/command/TestAMQ3411.* - org/apache/activemq/transport/vm/VMTransportWaitForTest.* - org/apache/activemq/transport/stomp/Stomp11Test.* - org/apache/activemq/xbean/ConnectorXBeanConfigTest.* - org/apache/activemq/broker/QueueMbeanRestartTest.* - org/apache/activemq/store/jdbc/JDBCStoreOrderTest.* - org/apache/activemq/usecases/JMXRemoveQueueThenSendIgnoredTest.* - org/apache/activemq/ProducerFlowControlTest.* - org/apache/activemq/MessageListenerRedeliveryTest.* - org/apache/activemq/bugs/AMQ2580Test.* - org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.* - org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.* - org/apache/activemq/spring/ListenerTest.* - org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.* - org/apache/activemq/camel/CamelVMTransportRoutingTest.* - org/apache/activemq/transport/failover/FailoverTransportBrokerTest.* - org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.* - org/apache/activemq/transport/stomp/StompNIOSSLTest.* - org/apache/activemq/usecases/MessageGroupNewConsumerTest.* - org/apache/activemq/transport/stomp/StompAdvisoryTest.* - org/apache/activemq/bugs/amq1095/MessageSelectorTest.* - org/apache/activemq/web/RestTest.* - org/apache/activemq/ra/FailoverManagedConnectionTest.* - org/apache/activemq/bugs/AMQ3436Test.* - org/apache/activemq/plugin/BrokerStatisticsPluginTest.* - org/apache/activemq/command/MessageCompressionTest.* - org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.* - org/apache/activemq/camel/DlqTest.* - org/apache/activemq/blob/FilesystemBlobTest.* - org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.* - org/apache/activemq/security/LDAPSecurityTest.* - org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.* - org/apache/activemq/bugs/AMQ3622Test.* - org/apache/activemq/bugs/AMQ2200Test.* - org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.* - org/apache/activemq/bugs/AMQ2364Test.* - org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.* - org/apache/activemq/security/XBeanSslContextTest.* - org/apache/activemq/transport/xmpp/XmppTest.* - org/apache/activemq/camel/SetHeaderTest.* - org/apache/activemq/transport/stomp/StompTest.* - org/apache/activemq/test/rollback/RollbacksWhileConsumingLargeQueueTest.* - org/apache/activemq/camel/CamelDestinationExclusiveConsumerTest.* - org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.* - org/apache/activemq/camel/component/AutoExposeQueuesInCamelTest.* - org/apache/activemq/broker/RecoveryBrokerTest.* - org/apache/activemq/transport/stomp/StompNIOTest.* - org/apache/activemq/security/SecurityJMXTest.* - org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.* - org/apache/activemq/bugs/AMQ2213Test.* - org/apache/activemq/config/BrokerXmlConfigFromJNDITest.* - org/apache/activemq/camel/component/JmsSimpleRequestReplyTest.* - org/apache/activemq/broker/jmx/MBeanTest.* - org/apache/activemq/JmsSendWithAsyncCallbackTest.* - org/apache/activemq/pool/ConnectionExpiryEvictsFromPoolTest.* - org/apache/activemq/bugs/AMQ2616Test.* - org/apache/activemq/JmsDurableTopicSelectorTest.* - org/apache/activemq/JmsTopicSelectorTest.* - org/apache/activemq/broker/util/PluginBrokerTest.* - org/apache/activemq/broker/SpringTest.* - org/apache/activemq/usecases/AMQStoreDurableSubscriptionTest.* - org/apache/activemq/bugs/AMQ3841Test.* - org/apache/activemq/transport/discovery/DiscoveryUriTest.* - org/apache/activemq/bugs/ActiveMQSlowConsumerManualTest.* - org/apache/activemq/bugs/AMQ3405Test.* - org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.* + org/apache/activemq/ConsumerReceiveWithTimeoutTest.* org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.* - org/apache/activemq/broker/util/TraceBrokerPathPluginTest.* + org/apache/activemq/ExpiryHogTest.* + org/apache/activemq/JmsAutoAckListenerTest.* + org/apache/activemq/JmsClientAckListenerTest.* + org/apache/activemq/JmsDurableTopicSelectorTest.* + org/apache/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.* + org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.* + org/apache/activemq/JmsSendWithAsyncCallbackTest.* + org/apache/activemq/JmsTopicSelectorTest.* + org/apache/activemq/MessageEvictionTest.* + org/apache/activemq/MessageListenerRedeliveryTest.* + org/apache/activemq/OnePrefetchAsyncConsumerTest.* + org/apache/activemq/OptimizedAckTest.* + org/apache/activemq/PerDestinationStoreLimitTest.* + org/apache/activemq/ProducerFlowControlSendFailTest.* + org/apache/activemq/ProducerFlowControlTest.* + org/apache/activemq/QueueConsumerPriorityTest.* + org/apache/activemq/ReconnectWithSameClientIDTest.* + org/apache/activemq/RemoveDestinationTest.* + org/apache/activemq/TimeStampTest.* org/apache/activemq/advisory/DestinationListenerTest.* - org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.* - org/apache/activemq/camel/CamelRedeliveryTest.* + org/apache/activemq/advisory/MasterSlaveTempQueueMemoryTest.* + org/apache/activemq/advisory/TempDestLoadTest.* + org/apache/activemq/advisory/TempQueueMemoryTest.* + org/apache/activemq/blob/FilesystemBlobTest.* + org/apache/activemq/broker/DoubleSubscriptionTest.* + org/apache/activemq/broker/JdbcXARecoveryBrokerTest.* + org/apache/activemq/broker/QueueMbeanRestartTest.* + org/apache/activemq/broker/ReconnectWithJMXEnabledTest.* + org/apache/activemq/broker/RecoveryBrokerTest.* + org/apache/activemq/broker/RedeliveryRestartTest.* + org/apache/activemq/broker/SpringTest.* + org/apache/activemq/broker/XARecoveryBrokerTest.* + org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.* + org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.* + org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.* + org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.* + org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.* + org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.* + org/apache/activemq/broker/ft/MasterSlaveSlaveDieTest.* + org/apache/activemq/broker/ft/MasterSlaveSlaveShutdownTest.* + org/apache/activemq/broker/ft/QueueMasterSlaveSingleUrlTest.* + org/apache/activemq/broker/ft/QueueMasterSlaveTest.* + org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.* + org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.* + org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementTest.* + org/apache/activemq/broker/ft/TopicMasterSlaveTest.* + org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.* + org/apache/activemq/broker/jmx/MBeanTest.* + org/apache/activemq/broker/jmx/PurgeTest.* + org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.* + org/apache/activemq/broker/policy/AbortSlowConsumerTest.* + org/apache/activemq/broker/region/DestinationGCTest.* + org/apache/activemq/broker/region/DestinationRemoveRestartTest.* + org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.* + org/apache/activemq/broker/region/UniquePropertyMessageEvictionStrategyTest.* + org/apache/activemq/broker/region/cursors/CursorDurableTest.* + org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.* + org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.* + org/apache/activemq/broker/region/cursors/NegativeQueueTest.* + org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.* + org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.* + org/apache/activemq/broker/scheduler/JmsCronSchedulerTest.* + org/apache/activemq/broker/scheduler/JmsSchedulerTest.* + org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.* + org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.* + org/apache/activemq/broker/scheduler/JobSchedulerTest.* + org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.* + org/apache/activemq/broker/store/RecoverExpiredMessagesTest.* + org/apache/activemq/broker/util/PluginBrokerTest.* + org/apache/activemq/broker/util/TraceBrokerPathPluginTest.* + org/apache/activemq/broker/virtual/CompositeTopicTest.* + org/apache/activemq/broker/virtual/FilteredQueueTest.* + org/apache/activemq/broker/virtual/MirroredQueueCorrectMemoryUsageTest.* + org/apache/activemq/broker/virtual/VirtualTopicDLQTest.* + org/apache/activemq/broker/virtual/VirtualTopicDisconnectSelectorTest.* + org/apache/activemq/bugs/AMQ1687Test.* + org/apache/activemq/bugs/AMQ1853Test.* + org/apache/activemq/bugs/AMQ1893Test.* + org/apache/activemq/bugs/AMQ1917Test.* + org/apache/activemq/bugs/AMQ1936Test.* + org/apache/activemq/bugs/AMQ2021Test.* + org/apache/activemq/bugs/AMQ2084Test.* + org/apache/activemq/bugs/AMQ2149KahaDBTest.* + org/apache/activemq/bugs/AMQ2149Test.* + org/apache/activemq/bugs/AMQ2171Test.* + org/apache/activemq/bugs/AMQ2183Test.* + org/apache/activemq/bugs/AMQ2200Test.* + org/apache/activemq/bugs/AMQ2213Test.* + org/apache/activemq/bugs/AMQ2314Test.* + org/apache/activemq/bugs/AMQ2356Test.* + org/apache/activemq/bugs/AMQ2364Test.* + org/apache/activemq/bugs/AMQ2401Test.* + org/apache/activemq/bugs/AMQ2413Test.* + org/apache/activemq/bugs/AMQ2439Test.* + org/apache/activemq/bugs/AMQ2489Test.* + org/apache/activemq/bugs/AMQ2512Test.* + org/apache/activemq/bugs/AMQ2513Test.* + org/apache/activemq/bugs/AMQ2580Test.* + org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.* + org/apache/activemq/bugs/AMQ2584Test.* + org/apache/activemq/bugs/AMQ2616Test.* + org/apache/activemq/bugs/AMQ2645Test.* + org/apache/activemq/bugs/AMQ2751Test.* + org/apache/activemq/bugs/AMQ2764Test.* + org/apache/activemq/bugs/AMQ2832Test.* + org/apache/activemq/bugs/AMQ2870Test.* + org/apache/activemq/bugs/AMQ2910Test.* + org/apache/activemq/bugs/AMQ2982Test.* + org/apache/activemq/bugs/AMQ2983Test.* + org/apache/activemq/bugs/AMQ3120Test.* + org/apache/activemq/bugs/AMQ3140Test.* + org/apache/activemq/bugs/AMQ3141Test.* + org/apache/activemq/bugs/AMQ3145Test.* + org/apache/activemq/bugs/AMQ3157Test.* + org/apache/activemq/bugs/AMQ3167Test.* + org/apache/activemq/bugs/AMQ3274Test.* + org/apache/activemq/bugs/AMQ3324Test.* + org/apache/activemq/bugs/AMQ3352Test.* + org/apache/activemq/bugs/AMQ3405Test.* + org/apache/activemq/bugs/AMQ3436Test.* + org/apache/activemq/bugs/AMQ3445Test.* + org/apache/activemq/bugs/AMQ3454Test.* + org/apache/activemq/bugs/AMQ3529Test.* + org/apache/activemq/bugs/AMQ3567Test.* + org/apache/activemq/bugs/AMQ3622Test.* + org/apache/activemq/bugs/AMQ3625Test.* + org/apache/activemq/bugs/AMQ3674Test.* org/apache/activemq/bugs/AMQ3675Test.* org/apache/activemq/bugs/AMQ3678Test.* - org/apache/activemq/camel/component/JournalRouteTest.* - org/apache/activemq/ProducerFlowControlSendFailTest.* - org/apache/activemq/bugs/AMQ3674Test.* - org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.* - org/apache/activemq/transport/stomp/StompTelnetTest.* - org/apache/activemq/network/NetworkConnectionsTest.* - org/apache/activemq/broker/virtual/FilteredQueueTest.* - org/apache/activemq/bugs/AMQ1687Test.* - org/apache/activemq/broker/virtual/CompositeTopicTest.* + org/apache/activemq/bugs/AMQ3732Test.* + org/apache/activemq/bugs/AMQ3841Test.* + org/apache/activemq/bugs/ActiveMQSlowConsumerManualTest.* + org/apache/activemq/bugs/ConnectionPerMessageTest.* + org/apache/activemq/bugs/CraigsBugTest.* + org/apache/activemq/bugs/DataFileNotDeletedTest.* + org/apache/activemq/bugs/DoubleExpireTest.* + org/apache/activemq/bugs/DurableConsumerTest.* + org/apache/activemq/bugs/JMSDurableTopicNoLocalTest.* + org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.* + org/apache/activemq/bugs/JmsTimeoutTest.* + org/apache/activemq/bugs/MemoryUsageBlockResumeTest.* + org/apache/activemq/bugs/MemoryUsageCleanupTest.* + org/apache/activemq/bugs/MessageExpirationReaperTest.* + org/apache/activemq/bugs/MissingDataFileTest.* org/apache/activemq/bugs/QueueWorkerPrefetchTest.* - org/apache/activemq/transport/vm/VMTransportBrokerNameTest.* - org/apache/activemq/broker/DoubleSubscriptionTest.* - org/apache/activemq/ActiveMQInputStreamTest.* - org/apache/activemq/OptimizedAckTest.* - org/apache/activemq/ReconnectWithSameClientIDTest.* - org/apache/activemq/bugs/AMQ2489Test.* + org/apache/activemq/bugs/SlowConsumerTest.* + org/apache/activemq/bugs/SparseAckReplayAfterStoreCleanupAMQStoreTest.* + org/apache/activemq/bugs/TempStorageBlockedBrokerTest.* + org/apache/activemq/bugs/TempStoreDataCleanupTest.* + org/apache/activemq/bugs/VMTransportClosureTest.* + org/apache/activemq/bugs/amq1095/MessageSelectorTest.* + org/apache/activemq/camel/AMQ2611Test.* + org/apache/activemq/camel/CamelDestinationExclusiveConsumerTest.* + org/apache/activemq/camel/CamelRedeliveryTest.* + org/apache/activemq/camel/CamelVMTransportRoutingTest.* + org/apache/activemq/camel/DlqTest.* + org/apache/activemq/camel/JmsJdbcXATest.* + org/apache/activemq/camel/SetHeaderTest.* + org/apache/activemq/camel/TransactedConsumeTest.* org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteTest.* - org/apache/activemq/util/HttpBlobTest.* - org/apache/activemq/usecases/ConsumeUncompressedCompressedMessageTest.* - org/apache/activemq/broker/region/DestinationRemoveRestartTest.* - org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.* - org/apache/activemq/broker/ft/MasterSlaveSlaveDieTest.* + org/apache/activemq/camel/component/ActiveMQRouteTest.* + org/apache/activemq/camel/component/AutoExposeQueuesInCamelTest.* + org/apache/activemq/camel/component/InvokeRequestReplyUsingJmsReplyToHeaderTest.* + org/apache/activemq/camel/component/JmsSimpleRequestReplyTest.* + org/apache/activemq/camel/component/JournalRouteTest.* + org/apache/activemq/command/MessageCompressionTest.* + org/apache/activemq/config/BrokerXmlConfigFromJNDITest.* + org/apache/activemq/config/ConfigTest.* + org/apache/activemq/console/command/AMQJournalToolTest.* + org/apache/activemq/console/command/TestAMQ3410.* + org/apache/activemq/console/command/TestAMQ3411.* + org/apache/activemq/console/command/TestPurgeCommand.* + org/apache/activemq/kaha/LoadTest.* + org/apache/activemq/kaha/impl/index/hash/HashTest.* + org/apache/activemq/network/DemandForwardingBridgeFilterTest.* + org/apache/activemq/network/DuplexNetworkMBeanTest.* + org/apache/activemq/network/DuplexNetworkTest.* + org/apache/activemq/network/FailoverStaticNetworkTest.* + org/apache/activemq/network/NetworkBrokerDetachTest.* + org/apache/activemq/network/NetworkConnectionsTest.* + org/apache/activemq/network/NetworkLoadTest.* + org/apache/activemq/network/NetworkReconnectTest.* + org/apache/activemq/network/NetworkRemovesSubscriptionsTest.* + org/apache/activemq/network/NetworkRestartPlainTest.* + org/apache/activemq/network/NetworkRestartTest.* + org/apache/activemq/network/SimpleNetworkTest.* + org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.* + org/apache/activemq/network/jms/QueueBridgeTest.* + org/apache/activemq/network/jms/QueueBridgeXBeanTest.* + org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.* + org/apache/activemq/network/jms/TopicBridgeSpringTest.* + org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.* + org/apache/activemq/network/jms/TopicBridgeXBeanTest.* + org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.* + org/apache/activemq/plugin/BrokerStatisticsPluginTest.* + org/apache/activemq/pool/ConnectionExpiryEvictsFromPoolTest.* + org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.* + org/apache/activemq/pool/PooledConnectionFactoryTest.* + org/apache/activemq/proxy/ProxyFailoverTest.* + org/apache/activemq/ra/FailoverManagedClusterTest.* + org/apache/activemq/ra/FailoverManagedConnectionTest.* + org/apache/activemq/security/JaasNetworkTest.* + org/apache/activemq/security/LDAPSecurityTest.* + org/apache/activemq/security/SecurityJMXTest.* org/apache/activemq/security/XBeanSecurityWithGuestNoCredentialsOnlyTest.* + org/apache/activemq/security/XBeanSslContextTest.* + org/apache/activemq/spring/ListenerTest.* + org/apache/activemq/spring/ParallelXATransactionTest.* + org/apache/activemq/spring/Spring2XmlNamespacesTest.* + org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.* + org/apache/activemq/store/AutoStorePerDestinationTest.* + org/apache/activemq/store/StorePerDestinationTest.* + org/apache/activemq/store/jdbc/JDBCCommitExceptionTest.* + org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.* + org/apache/activemq/store/jdbc/JDBCNegativeQueueTest.* + org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.* + org/apache/activemq/store/jdbc/JDBCPersistenceAdapterTest.* + org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.* + org/apache/activemq/store/jdbc/JDBCStoreOrderTest.* + org/apache/activemq/store/jdbc/JDBCXACommitExceptionTest.* + org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.* + org/apache/activemq/store/kahadb/KahaDBMessagePriorityTest.* + org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.* + org/apache/activemq/store/kahadb/KahaDBStoreRecoveryExpiryTest.* + org/apache/activemq/store/kahadb/KahaDBStoreTest.* + org/apache/activemq/store/kahadb/KahaDBTest.* + org/apache/activemq/store/kahadb/KahaDBVersionTest.* org/apache/activemq/store/kahadb/plist/PListTest.* + org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.* + org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.* + org/apache/activemq/test/message/NestedMapAndListPropertyTest.* + org/apache/activemq/test/message/NestedMapMessageTest.* + org/apache/activemq/test/rollback/RollbacksWhileConsumingLargeQueueTest.* + org/apache/activemq/transport/QueueClusterTest.* + org/apache/activemq/transport/SoWriteTimeoutClientTest.* + org/apache/activemq/transport/SoWriteTimeoutTest.* + org/apache/activemq/transport/TopicClusterTest.* + org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.* + org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.* + org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.* + org/apache/activemq/transport/discovery/DiscoveryUriTest.* + org/apache/activemq/transport/discovery/MasterSlaveDiscoveryTest.* + org/apache/activemq/transport/failover/AMQ1925Test.* + org/apache/activemq/transport/failover/ConnectionHangOnStartupTest.* + org/apache/activemq/transport/failover/FailoverClusterTest.* + org/apache/activemq/transport/failover/FailoverComplexClusterTest.* + org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.* + org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.* + org/apache/activemq/transport/failover/FailoverDuplicateTest.* + org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.* + org/apache/activemq/transport/failover/FailoverPriorityTest.* + org/apache/activemq/transport/failover/FailoverRandomTest.* + org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.* + org/apache/activemq/transport/failover/FailoverTimeoutTest.* + org/apache/activemq/transport/failover/FailoverTransactionTest.* + org/apache/activemq/transport/failover/FailoverTransportBackupsTest.* + org/apache/activemq/transport/failover/FailoverTransportBrokerTest.* + org/apache/activemq/transport/failover/FailoverUpdateURIsTest.* + org/apache/activemq/transport/failover/InitalReconnectDelayTest.* + org/apache/activemq/transport/failover/ReconnectTest.* + org/apache/activemq/transport/fanout/FanoutTest.* + org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.* + org/apache/activemq/transport/http/HttpClientReconnectTest.* + org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.* + org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.* + org/apache/activemq/transport/http/HttpSpringTest.* + org/apache/activemq/transport/mqtt/MQTTTest.* + org/apache/activemq/transport/mqtt/MTQQNioTest.* + org/apache/activemq/transport/stomp/ConnectTest.* + org/apache/activemq/transport/stomp/Stomp11Test.* + org/apache/activemq/transport/stomp/StompAdvisoryTest.* + org/apache/activemq/transport/stomp/StompLoadTest.* + org/apache/activemq/transport/stomp/StompNIOLoadTest.* + org/apache/activemq/transport/stomp/StompNIOSSLLoadTest.* + org/apache/activemq/transport/stomp/StompNIOSSLTest.* + org/apache/activemq/transport/stomp/StompNIOTest.* + org/apache/activemq/transport/stomp/StompSSLLoadTest.* + org/apache/activemq/transport/stomp/StompSslAuthTest.* + org/apache/activemq/transport/stomp/StompSslTest.* + org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.* + org/apache/activemq/transport/stomp/StompTelnetTest.* + org/apache/activemq/transport/stomp/StompTest.* + org/apache/activemq/transport/stomp/StompVirtualTopicTest.* + org/apache/activemq/transport/tcp/InactivityMonitorTest.* + org/apache/activemq/transport/tcp/SslBrokerServiceTest.* + org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.* + org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.* + org/apache/activemq/transport/vm/VMTransportBrokerNameTest.* + org/apache/activemq/transport/vm/VMTransportWaitForTest.* + org/apache/activemq/transport/vm/VmTransportNetworkBrokerTest.* + org/apache/activemq/transport/xmpp/XmppTest.* + org/apache/activemq/usage/StoreUsageTest.* + org/apache/activemq/usecases/AMQ2927Test.* + org/apache/activemq/usecases/AMQStackOverFlowTest.* + org/apache/activemq/usecases/AMQStoreDurableSubscriptionTest.* + org/apache/activemq/usecases/AdvisoryTopicCleanUpTest.* + org/apache/activemq/usecases/BrowseOverNetworkTest.* + org/apache/activemq/usecases/ClientRebalanceTest.* + org/apache/activemq/usecases/CompositePublishTest.* + org/apache/activemq/usecases/ConcurrentDestinationCreationTest.* + org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.* + org/apache/activemq/usecases/ConcurrentProducerQueueConsumerTest.* + org/apache/activemq/usecases/ConsumeUncompressedCompressedMessageTest.* + org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.* + org/apache/activemq/usecases/DiscriminatingConsumerLoadTest.* + org/apache/activemq/usecases/DispatchMultipleConsumersTest.* + org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.* + org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.* + org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.* + org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.* + org/apache/activemq/usecases/DurableSubProcessTest.* + org/apache/activemq/usecases/DurableSubSelectorDelayTest.* + org/apache/activemq/usecases/DurableSubSelectorDelayWithRestartTest.* + org/apache/activemq/usecases/DurableSubscriberNonPersistentMessageTest.* + org/apache/activemq/usecases/DurableSubscriberWithNetworkDisconnectTest.* + org/apache/activemq/usecases/DurableSubscriptionActivationTest.* + org/apache/activemq/usecases/DurableSubscriptionOfflineTest.* + org/apache/activemq/usecases/DurableSubscriptionReactivationTest.* + org/apache/activemq/usecases/DurableSubscriptionRemoveOfflineTest.* + org/apache/activemq/usecases/DurableSubscriptionSelectorTest.* + org/apache/activemq/usecases/DurableSubscriptionUnsubscribeTest.* + org/apache/activemq/usecases/DurableUnsubscribeTest.* + org/apache/activemq/usecases/ExpiredMessagesTest.* + org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.* + org/apache/activemq/usecases/JDBCDurableSubscriptionTest.* + org/apache/activemq/usecases/JMXRemoveQueueThenSendIgnoredTest.* + org/apache/activemq/usecases/JdbcDurableSubDupTest.* + org/apache/activemq/usecases/JournalDurableSubscriptionTest.* + org/apache/activemq/usecases/KahaDBDurableSubscriptionTest.* + org/apache/activemq/usecases/LargeQueueSparseDeleteTest.* + org/apache/activemq/usecases/MessageGroupCloseTest.* + org/apache/activemq/usecases/MessageGroupDelayedTest.* + org/apache/activemq/usecases/MessageGroupNewConsumerTest.* + org/apache/activemq/usecases/MessageReroutingTest.* + org/apache/activemq/usecases/MultiBrokersMultiClientsTest.* + org/apache/activemq/usecases/MultiBrokersMultiClientsUsingTcpTest.* + org/apache/activemq/usecases/MulticastDiscoveryOnFaultyNetworkTest.* + org/apache/activemq/usecases/NetworkAsyncStartTest.* + org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.* + org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.* + org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.* + org/apache/activemq/usecases/NonBlockingConsumerRedeliveryTest.* + org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.* + org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.* + org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.* + org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.* + org/apache/activemq/usecases/QueueDuplicatesTest.* + org/apache/activemq/usecases/QueueMemoryFullMultiBrokersTest.* + org/apache/activemq/usecases/QueueRedeliverTest.* + org/apache/activemq/usecases/ReliableReconnectTest.* + org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.* + org/apache/activemq/usecases/SingleBrokerVirtualDestinationsWithWildcardTest.* + org/apache/activemq/usecases/StartAndStopBrokerTest.* + org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.* + org/apache/activemq/usecases/StaticNetworkTest.* + org/apache/activemq/usecases/TempTopicProducerFlowControlTest.* + org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.* + org/apache/activemq/usecases/ThreeBrokerQueueNetworkUsingTcpTest.* + org/apache/activemq/usecases/ThreeBrokerStompTemporaryQueueTest.* + org/apache/activemq/usecases/ThreeBrokerTempQueueNetworkTest.* + org/apache/activemq/usecases/ThreeBrokerTopicNetworkTest.* + org/apache/activemq/usecases/ThreeBrokerTopicNetworkUsingTcpTest.* + org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkAMQPATest.* + org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.* + org/apache/activemq/usecases/TopicProducerFlowControlTest.* + org/apache/activemq/usecases/TopicRedeliverTest.* + org/apache/activemq/usecases/TopicReplicationTest.* + org/apache/activemq/usecases/TopicSubscriptionSlowConsumerTest.* + org/apache/activemq/usecases/TransientQueueRedeliverTest.* + org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.* + org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardDynamicallyIncludedDestinationTest.* + org/apache/activemq/usecases/TwoBrokerNetworkConnectorWildcardStaticallyIncludedDestinationTest.* + org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.* + org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.* + org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.* + org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.* + org/apache/activemq/usecases/TwoBrokerTopicSendReceiveLotsOfMessagesUsingTcpTest.* + org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.* + org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.* + org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.* + org/apache/activemq/usecases/TwoBrokerVirtualDestDinamicallyIncludedDestTest.* + org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.* + org/apache/activemq/usecases/UnlimitedEnqueueTest.* + org/apache/activemq/util/DataByteArrayInputStreamTest.* + org/apache/activemq/util/HttpBlobTest.* + org/apache/activemq/util/LRUCacheTest.* + org/apache/activemq/web/AjaxTest.* + org/apache/activemq/web/RestTest.* + org/apache/activemq/xbean/ConnectorXBeanConfigTest.* + org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.* + org/apache/activemq/xbean/XBeanXmlTest.* + org/apache/bugs/AMQ1730Test.* + org/apache/bugs/LoadBalanceTest.* + org/apache/kahadb/index/BTreeIndexTest.* + org/apache/kahadb/index/HashIndexTest.* + org/apache/kahadb/index/ListIndexTest.* + org/apache/kahadb/util/DataByteArrayInputStreamTest.* diff --git a/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java b/activemq-core/src/main/java/org/apache/kahadb/index/BTreeIndex.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java rename to activemq-core/src/main/java/org/apache/kahadb/index/BTreeIndex.java diff --git a/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java b/activemq-core/src/main/java/org/apache/kahadb/index/BTreeNode.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java rename to activemq-core/src/main/java/org/apache/kahadb/index/BTreeNode.java diff --git a/kahadb/src/main/java/org/apache/kahadb/index/BTreeVisitor.java b/activemq-core/src/main/java/org/apache/kahadb/index/BTreeVisitor.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/index/BTreeVisitor.java rename to activemq-core/src/main/java/org/apache/kahadb/index/BTreeVisitor.java diff --git a/kahadb/src/main/java/org/apache/kahadb/index/HashBin.java b/activemq-core/src/main/java/org/apache/kahadb/index/HashBin.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/index/HashBin.java rename to activemq-core/src/main/java/org/apache/kahadb/index/HashBin.java diff --git a/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java b/activemq-core/src/main/java/org/apache/kahadb/index/HashIndex.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java rename to activemq-core/src/main/java/org/apache/kahadb/index/HashIndex.java diff --git a/kahadb/src/main/java/org/apache/kahadb/index/Index.java b/activemq-core/src/main/java/org/apache/kahadb/index/Index.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/index/Index.java rename to activemq-core/src/main/java/org/apache/kahadb/index/Index.java diff --git a/kahadb/src/main/java/org/apache/kahadb/index/ListIndex.java b/activemq-core/src/main/java/org/apache/kahadb/index/ListIndex.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/index/ListIndex.java rename to activemq-core/src/main/java/org/apache/kahadb/index/ListIndex.java diff --git a/kahadb/src/main/java/org/apache/kahadb/index/ListNode.java b/activemq-core/src/main/java/org/apache/kahadb/index/ListNode.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/index/ListNode.java rename to activemq-core/src/main/java/org/apache/kahadb/index/ListNode.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java b/activemq-core/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/CallerBufferingDataFileAppender.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java b/activemq-core/src/main/java/org/apache/kahadb/journal/DataFile.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/DataFile.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java b/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java b/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAccessorPool.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java b/activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAppender.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/DataFileAppender.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/FileAppender.java b/activemq-core/src/main/java/org/apache/kahadb/journal/FileAppender.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/FileAppender.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/FileAppender.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java b/activemq-core/src/main/java/org/apache/kahadb/journal/Journal.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/Journal.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/Journal.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/Location.java b/activemq-core/src/main/java/org/apache/kahadb/journal/Location.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/Location.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/Location.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java b/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java b/activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/ReadOnlyJournal.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java b/activemq-core/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java rename to activemq-core/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/package.html b/activemq-core/src/main/java/org/apache/kahadb/journal/package.html similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/journal/package.html rename to activemq-core/src/main/java/org/apache/kahadb/journal/package.html diff --git a/kahadb/src/main/java/org/apache/kahadb/package.html b/activemq-core/src/main/java/org/apache/kahadb/package.html similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/package.html rename to activemq-core/src/main/java/org/apache/kahadb/package.html diff --git a/kahadb/src/main/java/org/apache/kahadb/page/Page.java b/activemq-core/src/main/java/org/apache/kahadb/page/Page.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/page/Page.java rename to activemq-core/src/main/java/org/apache/kahadb/page/Page.java diff --git a/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java b/activemq-core/src/main/java/org/apache/kahadb/page/PageFile.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/page/PageFile.java rename to activemq-core/src/main/java/org/apache/kahadb/page/PageFile.java diff --git a/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java b/activemq-core/src/main/java/org/apache/kahadb/page/Transaction.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/page/Transaction.java rename to activemq-core/src/main/java/org/apache/kahadb/page/Transaction.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/ByteArrayInputStream.java b/activemq-core/src/main/java/org/apache/kahadb/util/ByteArrayInputStream.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/ByteArrayInputStream.java rename to activemq-core/src/main/java/org/apache/kahadb/util/ByteArrayInputStream.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/ByteArrayOutputStream.java b/activemq-core/src/main/java/org/apache/kahadb/util/ByteArrayOutputStream.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/ByteArrayOutputStream.java rename to activemq-core/src/main/java/org/apache/kahadb/util/ByteArrayOutputStream.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/ByteSequence.java b/activemq-core/src/main/java/org/apache/kahadb/util/ByteSequence.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/ByteSequence.java rename to activemq-core/src/main/java/org/apache/kahadb/util/ByteSequence.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java b/activemq-core/src/main/java/org/apache/kahadb/util/BytesMarshaller.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java rename to activemq-core/src/main/java/org/apache/kahadb/util/BytesMarshaller.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/CommandLineSupport.java b/activemq-core/src/main/java/org/apache/kahadb/util/CommandLineSupport.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/CommandLineSupport.java rename to activemq-core/src/main/java/org/apache/kahadb/util/CommandLineSupport.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java b/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java rename to activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayInputStream.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java b/activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java rename to activemq-core/src/main/java/org/apache/kahadb/util/DataByteArrayOutputStream.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/DiskBenchmark.java b/activemq-core/src/main/java/org/apache/kahadb/util/DiskBenchmark.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/DiskBenchmark.java rename to activemq-core/src/main/java/org/apache/kahadb/util/DiskBenchmark.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/HexSupport.java b/activemq-core/src/main/java/org/apache/kahadb/util/HexSupport.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/HexSupport.java rename to activemq-core/src/main/java/org/apache/kahadb/util/HexSupport.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/IOExceptionSupport.java b/activemq-core/src/main/java/org/apache/kahadb/util/IOExceptionSupport.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/IOExceptionSupport.java rename to activemq-core/src/main/java/org/apache/kahadb/util/IOExceptionSupport.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/IOHelper.java b/activemq-core/src/main/java/org/apache/kahadb/util/IOHelper.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/IOHelper.java rename to activemq-core/src/main/java/org/apache/kahadb/util/IOHelper.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java b/activemq-core/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java rename to activemq-core/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/IntrospectionSupport.java b/activemq-core/src/main/java/org/apache/kahadb/util/IntrospectionSupport.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/IntrospectionSupport.java rename to activemq-core/src/main/java/org/apache/kahadb/util/IntrospectionSupport.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/LFUCache.java b/activemq-core/src/main/java/org/apache/kahadb/util/LFUCache.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/LFUCache.java rename to activemq-core/src/main/java/org/apache/kahadb/util/LFUCache.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/LRUCache.java b/activemq-core/src/main/java/org/apache/kahadb/util/LRUCache.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/LRUCache.java rename to activemq-core/src/main/java/org/apache/kahadb/util/LRUCache.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/LinkedNode.java b/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNode.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/LinkedNode.java rename to activemq-core/src/main/java/org/apache/kahadb/util/LinkedNode.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/LinkedNodeList.java b/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNodeList.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/LinkedNodeList.java rename to activemq-core/src/main/java/org/apache/kahadb/util/LinkedNodeList.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/LocationMarshaller.java b/activemq-core/src/main/java/org/apache/kahadb/util/LocationMarshaller.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/LocationMarshaller.java rename to activemq-core/src/main/java/org/apache/kahadb/util/LocationMarshaller.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/LockFile.java b/activemq-core/src/main/java/org/apache/kahadb/util/LockFile.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/LockFile.java rename to activemq-core/src/main/java/org/apache/kahadb/util/LockFile.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java b/activemq-core/src/main/java/org/apache/kahadb/util/LongMarshaller.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java rename to activemq-core/src/main/java/org/apache/kahadb/util/LongMarshaller.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java b/activemq-core/src/main/java/org/apache/kahadb/util/Marshaller.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java rename to activemq-core/src/main/java/org/apache/kahadb/util/Marshaller.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java b/activemq-core/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java rename to activemq-core/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/Scheduler.java b/activemq-core/src/main/java/org/apache/kahadb/util/Scheduler.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/Scheduler.java rename to activemq-core/src/main/java/org/apache/kahadb/util/Scheduler.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java b/activemq-core/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java rename to activemq-core/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/Sequence.java b/activemq-core/src/main/java/org/apache/kahadb/util/Sequence.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/Sequence.java rename to activemq-core/src/main/java/org/apache/kahadb/util/Sequence.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java b/activemq-core/src/main/java/org/apache/kahadb/util/SequenceSet.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java rename to activemq-core/src/main/java/org/apache/kahadb/util/SequenceSet.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java b/activemq-core/src/main/java/org/apache/kahadb/util/StringMarshaller.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java rename to activemq-core/src/main/java/org/apache/kahadb/util/StringMarshaller.java diff --git a/kahadb/src/main/java/org/apache/kahadb/util/VariableMarshaller.java b/activemq-core/src/main/java/org/apache/kahadb/util/VariableMarshaller.java similarity index 100% rename from kahadb/src/main/java/org/apache/kahadb/util/VariableMarshaller.java rename to activemq-core/src/main/java/org/apache/kahadb/util/VariableMarshaller.java diff --git a/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java b/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java rename to activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java diff --git a/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java b/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java rename to activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java diff --git a/kahadb/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java b/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java rename to activemq-core/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java diff --git a/kahadb/src/test/java/org/apache/kahadb/index/HashIndexTest.java b/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexTest.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/index/HashIndexTest.java rename to activemq-core/src/test/java/org/apache/kahadb/index/HashIndexTest.java diff --git a/kahadb/src/test/java/org/apache/kahadb/index/IndexBenchmark.java b/activemq-core/src/test/java/org/apache/kahadb/index/IndexBenchmark.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/index/IndexBenchmark.java rename to activemq-core/src/test/java/org/apache/kahadb/index/IndexBenchmark.java diff --git a/kahadb/src/test/java/org/apache/kahadb/index/IndexTestSupport.java b/activemq-core/src/test/java/org/apache/kahadb/index/IndexTestSupport.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/index/IndexTestSupport.java rename to activemq-core/src/test/java/org/apache/kahadb/index/IndexTestSupport.java diff --git a/kahadb/src/test/java/org/apache/kahadb/index/ListIndexTest.java b/activemq-core/src/test/java/org/apache/kahadb/index/ListIndexTest.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/index/ListIndexTest.java rename to activemq-core/src/test/java/org/apache/kahadb/index/ListIndexTest.java diff --git a/kahadb/src/test/java/org/apache/kahadb/journal/JournalTest.java b/activemq-core/src/test/java/org/apache/kahadb/journal/JournalTest.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/journal/JournalTest.java rename to activemq-core/src/test/java/org/apache/kahadb/journal/JournalTest.java diff --git a/kahadb/src/test/java/org/apache/kahadb/page/PageFileTest.java b/activemq-core/src/test/java/org/apache/kahadb/page/PageFileTest.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/page/PageFileTest.java rename to activemq-core/src/test/java/org/apache/kahadb/page/PageFileTest.java diff --git a/kahadb/src/test/java/org/apache/kahadb/util/DataByteArrayInputStreamTest.java b/activemq-core/src/test/java/org/apache/kahadb/util/DataByteArrayInputStreamTest.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/util/DataByteArrayInputStreamTest.java rename to activemq-core/src/test/java/org/apache/kahadb/util/DataByteArrayInputStreamTest.java diff --git a/kahadb/src/test/java/org/apache/kahadb/util/DataByteArrayOutputStreamTest.java b/activemq-core/src/test/java/org/apache/kahadb/util/DataByteArrayOutputStreamTest.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/util/DataByteArrayOutputStreamTest.java rename to activemq-core/src/test/java/org/apache/kahadb/util/DataByteArrayOutputStreamTest.java diff --git a/kahadb/src/test/java/org/apache/kahadb/util/SequenceSetTest.java b/activemq-core/src/test/java/org/apache/kahadb/util/SequenceSetTest.java similarity index 100% rename from kahadb/src/test/java/org/apache/kahadb/util/SequenceSetTest.java rename to activemq-core/src/test/java/org/apache/kahadb/util/SequenceSetTest.java diff --git a/assembly/pom.xml b/assembly/pom.xml index 38cbf6cf1b..270da4459a 100755 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -111,10 +111,6 @@ ${project.groupId} activemq-run - - ${project.groupId} - kahadb - diff --git a/kahadb/README b/kahadb/README deleted file mode 100644 index 9d60609c95..0000000000 --- a/kahadb/README +++ /dev/null @@ -1,24 +0,0 @@ -======================================================================= - KahaDB : An Embedded Lightweight Non-Relational Database -======================================================================= - -Goals: - * Provide a simple collections based interface for storing persistent - data. - * Provide a lower level key value interface for storing data. Secondary - keys should be supported. - * Fast recovery - -Status: - * Moved the org.apache.activemq.kaha package into this module - and renamed it as org.apache.kahadb - * Moved a refactored version of the low level indexing logic - used by Apache xindice to the org.apache.kahadb.xindice page. - -TODO: - * None of our current index support fast recovery. They suffer - from partial page write failures so on a crash, they have - to be fully rebuilt from the data logs. - * Indexes should know what the last transaction id that updated - it, so that missing operations can be replayed. - * Investigate implementing data log replication for HA. \ No newline at end of file diff --git a/kahadb/pom.xml b/kahadb/pom.xml deleted file mode 100755 index c07d7901c7..0000000000 --- a/kahadb/pom.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - org.apache.activemq - activemq-parent - 5.8-SNAPSHOT - - - 4.0.0 - - kahadb - bundle - ActiveMQ :: KahaDB - An Embedded Lightweight Non-Relational Database - - - - * - - - org.apache.kahadb*;version=${project.version};-noimport:=true - - - - - org.slf4j - slf4j-api - - - log4j - log4j - test - true - - - org.slf4j - slf4j-log4j12 - test - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - pertest - false - true - -Xmx512M - - - org.apache.activemq.default.directory.prefix - target/ - - - - **/*Test.* - - - **/perf/* - - - - - - - diff --git a/kahadb/src/main/resources/META-INF/services/org/apache/activemq/transport/kdbr b/kahadb/src/main/resources/META-INF/services/org/apache/activemq/transport/kdbr deleted file mode 100644 index 271bd4033f..0000000000 --- a/kahadb/src/main/resources/META-INF/services/org/apache/activemq/transport/kdbr +++ /dev/null @@ -1,17 +0,0 @@ -## --------------------------------------------------------------------------- -## 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. -## --------------------------------------------------------------------------- -class=org.apache.kahadb.replication.transport.KDBRTransportFactory diff --git a/kahadb/src/main/resources/META-INF/services/org/apache/activemq/wireformat/kdbr b/kahadb/src/main/resources/META-INF/services/org/apache/activemq/wireformat/kdbr deleted file mode 100644 index 2b6eb7f46e..0000000000 --- a/kahadb/src/main/resources/META-INF/services/org/apache/activemq/wireformat/kdbr +++ /dev/null @@ -1,17 +0,0 @@ -## --------------------------------------------------------------------------- -## 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. -## --------------------------------------------------------------------------- -class=org.apache.kahadb.replication.transport.KDBRWireFormatFactory diff --git a/kahadb/src/test/eclipse-resources/log4j.properties b/kahadb/src/test/eclipse-resources/log4j.properties deleted file mode 100644 index 66385debaa..0000000000 --- a/kahadb/src/test/eclipse-resources/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -## ------------------------------------------------------------------------ -## 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. -## ------------------------------------------------------------------------ - -# -# The logging properties used for eclipse testing, We want to see debug output on the console. -# -log4j.rootLogger=INFO, out - - - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.fout=org.apache.log4j.FileAppender -log4j.appender.fout.layout=org.apache.log4j.PatternLayout -log4j.appender.fout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.fout.file=target/amq-testlog.log -log4j.appender.fout.append=true \ No newline at end of file diff --git a/kahadb/src/test/resources/log4j.properties b/kahadb/src/test/resources/log4j.properties deleted file mode 100644 index 12cbd08bc5..0000000000 --- a/kahadb/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -## --------------------------------------------------------------------------- -## 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. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, stdout - -log4j.logger.org.apache.activemq.spring=WARN -log4j.logger.org.apache.zookeeper=WARN - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.out=org.apache.log4j.FileAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.out.file=target/activemq-test.log -log4j.appender.out.append=true diff --git a/pom.xml b/pom.xml index b3d230ee9b..9a064650f1 100755 --- a/pom.xml +++ b/pom.xml @@ -218,7 +218,6 @@ activemq-xmpp tests assembly - kahadb @@ -352,11 +351,6 @@ activemq-openwire-generator ${project.version} - - org.apache.activemq - kahadb - ${project.version} - org.apache.activemq activemq-karaf