From bfbe90b39929db4512be95d8931d8884c1c11c9a Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 7 Nov 2012 17:26:31 +0000 Subject: [PATCH] rename the activemq-leveldb module to activemq-leveldb-store to be consistent with other store modules. Move more spring/xbean support bits into the activemq-spring module. git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406726 13f79535-47bb-0310-9956-ffa450edef68 --- .../activemq/JmsQueueTransactionTest.java | 0 .../activemq/JmsTransactionTestSupport.java | 0 .../store/PersistenceAdapterTestSupport.java | 0 .../activemq/test/JmsResourceProvider.java | 0 .../org/apache/activemq/test/TestSupport.java | 0 .../org/apache/activemq/util/SocketProxy.java | 1 - .../java/org/apache/activemq/util/Wait.java | 0 activemq-camel/pom.xml | 6 ++ activemq-client/pom.xml | 2 +- activemq-console/pom.xml | 23 ++++--- .../apache/activemq/leveldb/IDERunner.scala | 2 + activemq-core/pom.xml | 13 +++- .../activemq/JmsTempDestinationTest.java | 2 - .../org/apache/activemq/bugs/AMQ1936Test.java | 2 - .../leveldb/LevelDBStoreBrokerTest.java | 45 +++++++++++++ .../leveldb/LevelDBXARecoveryBrokerTest.java | 0 .../network/CompressionOverNetworkTest.java | 2 - .../network/NetworkBrokerDetachTest.java | 1 - ...TwoConnectionsWithSenderUsingPoolTest.java | 0 .../activemq/store/MessagePriorityTest.java | 1 - .../store/leveldb/LevelDBStoreBrokerTest.java | 0 .../transport/nio/NIOSSLLoadTest.java | 2 - .../usecases/ConsumeTopicPrefetchTest.java | 1 - .../DurableSubscriptionSelectorTest.java | 2 - .../usecases/ExpiredMessagesTest.java | 1 - .../RequestReplyNoAdvisoryNetworkTest.java | 1 - .../TwoBrokerTempQueueAdvisoryTest.java | 1 - activemq-fileserver/pom.xml | 6 ++ activemq-itests-spring31/pom.xml | 2 +- .../kahadb-vs-leveldb.png | Bin .../pom.xml | 14 ++-- .../readme.md | 0 .../leveldb/LevelDBPersistenceAdapter.java | 0 .../src/main/proto/records.proto | 0 .../scala/org/apache/activemq/leveldb.scala | 0 .../apache/activemq/leveldb/DBManager.scala | 0 .../activemq/leveldb/HALevelDBClient.scala | 0 .../activemq/leveldb/HALevelDBStore.scala | 0 .../activemq/leveldb/IndexManifestDTO.java | 0 .../activemq/leveldb/LevelDBClient.scala | 0 .../activemq/leveldb/LevelDBStore.scala | 0 .../leveldb/LevelDBStoreViewMBean.java | 0 .../apache/activemq/leveldb/RecordLog.scala | 0 .../activemq/leveldb/util/FileSupport.scala | 0 .../apache/activemq/leveldb/util/Log.scala | 0 .../activemq/leveldb/util/LongCounter.scala | 0 .../activemq/leveldb/util/RetrySupport.scala | 0 .../activemq/leveldb/util/TimeMetric.scala | 0 .../activemq/store/leveldb/package.html | 0 .../src/test/resources/log4j.properties | 0 .../activemq/leveldb/ActiveMQScenario.scala | 0 .../leveldb/EnqueueRateScenariosTest.scala | 0 .../leveldb/HALevelDBFastEnqueueTest.scala | 0 .../activemq/leveldb/HALevelDBStoreTest.scala | 0 .../activemq/leveldb/JMSClientScenario.scala | 0 .../leveldb/LevelDBFastEnqueueTest.scala | 0 .../activemq/leveldb/LevelDBStoreTest.scala | 0 .../apache/activemq/leveldb/Scenario.scala | 0 .../activemq/leveldb/TestingHDFSServer.scala | 0 .../leveldb/LevelDBStoreBrokerTest.scala | 61 ------------------ activemq-optional/pom.xml | 6 ++ activemq-pool/pom.xml | 4 +- activemq-ra/pom.xml | 8 ++- activemq-spring/pom.xml | 36 ++++++++++- .../http/activemq.apache.org/schema/core | 0 .../main/resources/META-INF/spring.handlers | 0 .../main/resources/META-INF/spring.schemas | 0 .../src/main/resources/activemq.xsd | 0 .../src/main/resources/activemq.xsd.html | 0 .../src/main/resources/activemq.xsd.wiki | 0 .../store/leveldb/LevelDBConfigTest.java | 0 .../apache/activemq/store/leveldb/leveldb.xml | 0 activemq-web-demo/pom.xml | 6 ++ activemq-xmpp/pom.xml | 7 ++ assembly/pom.xml | 36 ++++++++++- pom.xml | 19 ++++-- 76 files changed, 202 insertions(+), 111 deletions(-) rename {activemq-core => activemq-broker}/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java (100%) rename {activemq-core => activemq-broker}/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java (100%) rename {activemq-core => activemq-broker}/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java (100%) rename {activemq-core => activemq-broker}/src/test/java/org/apache/activemq/test/JmsResourceProvider.java (100%) rename {activemq-core => activemq-broker}/src/test/java/org/apache/activemq/test/TestSupport.java (100%) rename {activemq-core => activemq-broker}/src/test/java/org/apache/activemq/util/SocketProxy.java (99%) rename {activemq-core => activemq-broker}/src/test/java/org/apache/activemq/util/Wait.java (100%) rename {activemq-leveldb/src/test/scala => activemq-console/src/test/java}/org/apache/activemq/leveldb/IDERunner.scala (95%) create mode 100644 activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java rename {activemq-leveldb/src/test/scala => activemq-core/src/test/java}/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java (100%) rename {activemq-pool => activemq-core}/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java (100%) rename {activemq-leveldb => activemq-core}/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java (100%) rename {activemq-leveldb => activemq-leveldb-store}/kahadb-vs-leveldb.png (100%) rename {activemq-leveldb => activemq-leveldb-store}/pom.xml (97%) rename {activemq-leveldb => activemq-leveldb-store}/readme.md (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/proto/records.proto (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/DBManager.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/util/Log.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/main/scala/org/apache/activemq/store/leveldb/package.html (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/resources/log4j.properties (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/scala/org/apache/activemq/leveldb/Scenario.scala (100%) rename {activemq-leveldb => activemq-leveldb-store}/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala (100%) delete mode 100644 activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.scala rename {activemq-core => activemq-spring}/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core (100%) rename {activemq-core => activemq-spring}/src/main/resources/META-INF/spring.handlers (100%) rename {activemq-core => activemq-spring}/src/main/resources/META-INF/spring.schemas (100%) rename {activemq-core => activemq-spring}/src/main/resources/activemq.xsd (100%) rename {activemq-core => activemq-spring}/src/main/resources/activemq.xsd.html (100%) rename {activemq-core => activemq-spring}/src/main/resources/activemq.xsd.wiki (100%) rename {activemq-leveldb => activemq-spring}/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java (100%) rename {activemq-leveldb => activemq-spring}/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml (100%) diff --git a/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java b/activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java rename to activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java diff --git a/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java b/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java rename to activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java diff --git a/activemq-core/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java b/activemq-broker/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java rename to activemq-broker/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java diff --git a/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java b/activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java rename to activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java diff --git a/activemq-core/src/test/java/org/apache/activemq/test/TestSupport.java b/activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/test/TestSupport.java rename to activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java diff --git a/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java b/activemq-broker/src/test/java/org/apache/activemq/util/SocketProxy.java similarity index 99% rename from activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java rename to activemq-broker/src/test/java/org/apache/activemq/util/SocketProxy.java index 72699b23eb..1a867eb84c 100644 --- a/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java +++ b/activemq-broker/src/test/java/org/apache/activemq/util/SocketProxy.java @@ -33,7 +33,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLServerSocketFactory; import javax.net.ssl.SSLSocketFactory; import org.slf4j.Logger; diff --git a/activemq-core/src/test/java/org/apache/activemq/util/Wait.java b/activemq-broker/src/test/java/org/apache/activemq/util/Wait.java similarity index 100% rename from activemq-core/src/test/java/org/apache/activemq/util/Wait.java rename to activemq-broker/src/test/java/org/apache/activemq/util/Wait.java diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml index 4647aa9ab8..5f6c8d2eb4 100755 --- a/activemq-camel/pom.xml +++ b/activemq-camel/pom.xml @@ -90,6 +90,12 @@ test-jar test + + ${project.groupId} + activemq-broker + test-jar + test + org.apache.camel camel-test diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml index 067cafd9a2..f24e1696d2 100755 --- a/activemq-client/pom.xml +++ b/activemq-client/pom.xml @@ -437,7 +437,7 @@ generate-sources ${basedir}/src/main/grammar - ${basedir}/target/generated-javacc + ${basedir}/target/generated-sources/javacc org.apache.activemq.selector diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml index 8447a16c43..a6b6b75cad 100644 --- a/activemq-console/pom.xml +++ b/activemq-console/pom.xml @@ -49,18 +49,21 @@ ${project.groupId} - activemq-core + activemq-spring ${project.groupId} - activemq-core - test-jar + activemq-amq-store + + + ${project.groupId} + activemq-kahadb-store ${project.groupId} activeio-core - + org.apache.geronimo.specs @@ -100,17 +103,19 @@ + + ${project.groupId} + activemq-broker + test-jar + test + + org.springframework spring-context test - - org.slf4j - slf4j-api - test - org.slf4j slf4j-log4j12 diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/IDERunner.scala b/activemq-console/src/test/java/org/apache/activemq/leveldb/IDERunner.scala similarity index 95% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/IDERunner.scala rename to activemq-console/src/test/java/org/apache/activemq/leveldb/IDERunner.scala index 7eeb110528..28ac8456e0 100644 --- a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/IDERunner.scala +++ b/activemq-console/src/test/java/org/apache/activemq/leveldb/IDERunner.scala @@ -18,6 +18,8 @@ package org.apache.activemq.leveldb import org.apache.activemq.console.Main +import scala.Array +import scala.Predef._ object IDERunner { def main(args:Array[String]) ={ diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml index 4999cbe9e5..c1fb894947 100755 --- a/activemq-core/pom.xml +++ b/activemq-core/pom.xml @@ -76,7 +76,7 @@ org.apache.activemq - activemq-broker + activemq-spring @@ -91,6 +91,10 @@ org.apache.activemq activemq-amq-store + + org.apache.activemq + activemq-leveldb-store + org.apache.activemq @@ -200,6 +204,13 @@ + + ${project.groupId} + activemq-broker + test-jar + test + + junit junit diff --git a/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java index 2920894076..3029f455f3 100755 --- a/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java @@ -17,11 +17,9 @@ package org.apache.activemq; import java.io.IOException; -import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.concurrent.CountDownLatch; diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java index 02d74494b9..a043cc1d3e 100644 --- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java +++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java @@ -22,8 +22,6 @@ import org.apache.activemq.broker.BrokerService; import org.apache.activemq.util.Wait; import org.apache.log4j.Logger; -import java.util.Map; -import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; diff --git a/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java new file mode 100644 index 0000000000..39661100fc --- /dev/null +++ b/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java @@ -0,0 +1,45 @@ +package org.apache.activemq.leveldb; + +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.BrokerTest; +import org.apache.activemq.store.PersistenceAdapter; + +import java.io.File; +import java.io.IOException; + +/** + * @author Hiram Chirino + */ +public class LevelDBStoreBrokerTest extends BrokerTest { + +// def suite: Test = { +// return new TestSuite(classOf[LevelDBStoreBrokerTest]) +// } +// +// def main(args: Array[String]): Unit = { +// junit.textui.TestRunner.run(suite) +// } + + @Override + protected BrokerService createBroker() throws Exception { + BrokerService broker = new BrokerService(); + broker.setPersistenceAdapter(createPersistenceAdapter(true)); + return broker; + } + + protected PersistenceAdapter createPersistenceAdapter(boolean delete) { + LevelDBStore store = new LevelDBStore(); + store.setDirectory(new File("target/activemq-data/leveldb")); + if (delete) { + store.deleteAllMessages(); + } + return store; + } + + protected BrokerService createRestartedBroker() throws IOException { + BrokerService broker = new BrokerService(); + broker.setPersistenceAdapter(createPersistenceAdapter(false)); + return broker; + } + +} diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java diff --git a/activemq-core/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java b/activemq-core/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java index c474482a94..95b930cd47 100644 --- a/activemq-core/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java @@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentHashMap; import javax.jms.BytesMessage; import javax.jms.Connection; import javax.jms.DeliveryMode; -import javax.jms.Destination; import javax.jms.MapMessage; import javax.jms.Message; import javax.jms.MessageConsumer; @@ -43,7 +42,6 @@ import org.apache.activemq.command.ActiveMQBytesMessage; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMapMessage; import org.apache.activemq.command.ActiveMQObjectMessage; -import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQStreamMessage; import org.apache.activemq.command.ActiveMQTextMessage; import org.apache.activemq.command.ActiveMQTopic; diff --git a/activemq-core/src/test/java/org/apache/activemq/network/NetworkBrokerDetachTest.java b/activemq-core/src/test/java/org/apache/activemq/network/NetworkBrokerDetachTest.java index a415e6e547..c985aa722c 100644 --- a/activemq-core/src/test/java/org/apache/activemq/network/NetworkBrokerDetachTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/NetworkBrokerDetachTest.java @@ -31,7 +31,6 @@ import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.Session; import javax.jms.TopicSubscriber; -import javax.management.InstanceNotFoundException; import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.management.remote.JMXConnector; diff --git a/activemq-pool/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java b/activemq-core/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java similarity index 100% rename from activemq-pool/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java rename to activemq-core/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java diff --git a/activemq-core/src/test/java/org/apache/activemq/store/MessagePriorityTest.java b/activemq-core/src/test/java/org/apache/activemq/store/MessagePriorityTest.java index 00367f5a22..7ec16d4a6b 100644 --- a/activemq-core/src/test/java/org/apache/activemq/store/MessagePriorityTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/store/MessagePriorityTest.java @@ -31,7 +31,6 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQPrefetchPolicy; import org.apache.activemq.CombinationTestSupport; import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.broker.region.policy.PendingDurableSubscriberMessageStoragePolicy; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.broker.region.policy.SharedDeadLetterStrategy; diff --git a/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java similarity index 100% rename from activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java rename to activemq-core/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java index 9dbaae39ec..698945c614 100644 --- a/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java @@ -20,11 +20,9 @@ import junit.framework.TestCase; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; -import org.apache.activemq.broker.region.Destination; import org.apache.activemq.util.ConsumerThread; import org.apache.activemq.util.ProducerThread; import org.apache.activemq.util.Wait; -import org.omg.CORBA.PUBLIC_MEMBER; import javax.jms.Connection; import javax.jms.Queue; diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java index 535a4b7020..f7b979490e 100755 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java @@ -23,7 +23,6 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.broker.BrokerRegistry; -import org.apache.activemq.broker.policy.IndividualDeadLetterViaXmlTest; import org.apache.activemq.broker.region.DestinationStatistics; import org.apache.activemq.broker.region.RegionBroker; import org.apache.activemq.util.Wait; diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java index 83f9bb3d06..d91dcb8223 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java @@ -34,8 +34,6 @@ import org.apache.activemq.broker.BrokerService; 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.PersistenceAdapter; -import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; import org.apache.activemq.util.Wait; public class DurableSubscriptionSelectorTest extends org.apache.activemq.TestSupport { diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java index ac7b2a038d..d11860f52d 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java @@ -33,7 +33,6 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.CombinationTestSupport; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.DestinationStatistics; -import org.apache.activemq.broker.region.RegionBroker; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy; diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java index 1a7b369883..31f70d48d3 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java @@ -34,7 +34,6 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQSession; -import org.apache.activemq.CombinationTestSupport; import org.apache.activemq.JmsMultipleBrokersTestSupport; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.java index 82fb3921fe..29ec5a0a71 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.java @@ -45,7 +45,6 @@ import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQMessageConsumer; import org.apache.activemq.JmsMultipleBrokersTestSupport; -import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; import org.apache.activemq.broker.jmx.DestinationViewMBean; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-fileserver/pom.xml b/activemq-fileserver/pom.xml index 99edc9c1cd..5edd74f059 100755 --- a/activemq-fileserver/pom.xml +++ b/activemq-fileserver/pom.xml @@ -92,6 +92,12 @@ test-jar test + + ${project.groupId} + activemq-broker + test-jar + test + org.eclipse.jetty.aggregate diff --git a/activemq-itests-spring31/pom.xml b/activemq-itests-spring31/pom.xml index b973cd0bcd..926f795e81 100755 --- a/activemq-itests-spring31/pom.xml +++ b/activemq-itests-spring31/pom.xml @@ -21,7 +21,7 @@ org.apache.activemq - tests + activemq-parent 5.8-SNAPSHOT diff --git a/activemq-leveldb/kahadb-vs-leveldb.png b/activemq-leveldb-store/kahadb-vs-leveldb.png similarity index 100% rename from activemq-leveldb/kahadb-vs-leveldb.png rename to activemq-leveldb-store/kahadb-vs-leveldb.png diff --git a/activemq-leveldb/pom.xml b/activemq-leveldb-store/pom.xml similarity index 97% rename from activemq-leveldb/pom.xml rename to activemq-leveldb-store/pom.xml index 7f9b6465d5..abeb8fdd61 100644 --- a/activemq-leveldb/pom.xml +++ b/activemq-leveldb-store/pom.xml @@ -25,11 +25,11 @@ 5.8-SNAPSHOT - activemq-leveldb + activemq-leveldb-store jar - ActiveMQ :: LevelDB - ActiveMQ LevelDB based store + ActiveMQ :: LevelDB Store + ActiveMQ LevelDB Store Implementation @@ -43,7 +43,7 @@ org.apache.activemq - activemq-core + activemq-broker provided @@ -194,13 +194,14 @@ org.apache.activemq - activemq-core + activemq-broker test-jar test + org.apache.activemq - activemq-console + activemq-kahadb-store test @@ -334,6 +335,7 @@ false **/EnqueueRateScenariosTest.* + **/HALevelDB*.* diff --git a/activemq-leveldb/readme.md b/activemq-leveldb-store/readme.md similarity index 100% rename from activemq-leveldb/readme.md rename to activemq-leveldb-store/readme.md diff --git a/activemq-leveldb/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java b/activemq-leveldb-store/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java similarity index 100% rename from activemq-leveldb/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java rename to activemq-leveldb-store/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java diff --git a/activemq-leveldb/src/main/proto/records.proto b/activemq-leveldb-store/src/main/proto/records.proto similarity index 100% rename from activemq-leveldb/src/main/proto/records.proto rename to activemq-leveldb-store/src/main/proto/records.proto diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/Log.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/Log.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/Log.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/Log.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala diff --git a/activemq-leveldb/src/main/scala/org/apache/activemq/store/leveldb/package.html b/activemq-leveldb-store/src/main/scala/org/apache/activemq/store/leveldb/package.html similarity index 100% rename from activemq-leveldb/src/main/scala/org/apache/activemq/store/leveldb/package.html rename to activemq-leveldb-store/src/main/scala/org/apache/activemq/store/leveldb/package.html diff --git a/activemq-leveldb/src/test/resources/log4j.properties b/activemq-leveldb-store/src/test/resources/log4j.properties similarity index 100% rename from activemq-leveldb/src/test/resources/log4j.properties rename to activemq-leveldb-store/src/test/resources/log4j.properties diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala rename to activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala rename to activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala rename to activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala rename to activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala rename to activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala rename to activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala rename to activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/Scenario.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/Scenario.scala similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/Scenario.scala rename to activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/Scenario.scala diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala similarity index 100% rename from activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala rename to activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala diff --git a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.scala b/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.scala deleted file mode 100644 index f9d4432b07..0000000000 --- a/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.scala +++ /dev/null @@ -1,61 +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. - */ - -package org.apache.activemq.leveldb - -import org.apache.activemq.broker.BrokerService -import org.apache.activemq.broker.BrokerTest -import org.apache.activemq.store.PersistenceAdapter -import java.io.File -import junit.framework.{TestSuite, Test} - -/** - * @author Hiram Chirino - */ -object LevelDBStoreBrokerTest { - def suite: Test = { - return new TestSuite(classOf[LevelDBStoreBrokerTest]) - } - - def main(args: Array[String]): Unit = { - junit.textui.TestRunner.run(suite) - } -} - -class LevelDBStoreBrokerTest extends BrokerTest { - - protected def createPersistenceAdapter(delete: Boolean): PersistenceAdapter = { - var store: LevelDBStore = new LevelDBStore - store.setDirectory(new File("target/activemq-data/leveldb")) - if (delete) { - store.deleteAllMessages - } - return store - } - - protected override def createBroker: BrokerService = { - var broker: BrokerService = new BrokerService - broker.setPersistenceAdapter(createPersistenceAdapter(true)) - return broker - } - - protected def createRestartedBroker: BrokerService = { - var broker: BrokerService = new BrokerService - broker.setPersistenceAdapter(createPersistenceAdapter(false)) - return broker - } -} \ No newline at end of file diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml index bb95dd093b..e1a9adef8d 100755 --- a/activemq-optional/pom.xml +++ b/activemq-optional/pom.xml @@ -46,6 +46,12 @@ test-jar test + + ${project.groupId} + activemq-broker + test-jar + test + ${project.groupId} activeio-core diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml index e4e77a17a7..d1e4cc468b 100755 --- a/activemq-pool/pom.xml +++ b/activemq-pool/pom.xml @@ -53,7 +53,7 @@ ${project.groupId} - activemq-core + activemq-client ${project.groupId} @@ -80,7 +80,7 @@ ${project.groupId} - activemq-core + activemq-broker test-jar test diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml index b656c78b08..8a25f3e393 100755 --- a/activemq-ra/pom.xml +++ b/activemq-ra/pom.xml @@ -45,7 +45,11 @@ org.apache.activemq - activemq-core + activemq-broker + + + org.apache.activemq + activemq-kahadb-store @@ -54,7 +58,7 @@ org.apache.activemq - activemq-core + activemq-broker ${project.version} tests test diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml index 7d2a5e2367..9bbad109ca 100755 --- a/activemq-spring/pom.xml +++ b/activemq-spring/pom.xml @@ -54,8 +54,38 @@ slf4j-api - ${project.groupId} - activemq-core + org.apache.activemq + activemq-broker + + + org.apache.activemq + activemq-jdbc-store + true + + + org.apache.activemq + activemq-kahadb-store + true + + + org.apache.activemq + activemq-amq-store + true + + + org.apache.activemq + activemq-leveldb-store + true + + + org.apache.activemq + activemq-mqtt + true + + + org.apache.activemq + activemq-stomp + true ${project.groupId} @@ -89,7 +119,7 @@ ${project.groupId} - activemq-core + activemq-broker test-jar test diff --git a/activemq-core/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core b/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core similarity index 100% rename from activemq-core/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core rename to activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core diff --git a/activemq-core/src/main/resources/META-INF/spring.handlers b/activemq-spring/src/main/resources/META-INF/spring.handlers similarity index 100% rename from activemq-core/src/main/resources/META-INF/spring.handlers rename to activemq-spring/src/main/resources/META-INF/spring.handlers diff --git a/activemq-core/src/main/resources/META-INF/spring.schemas b/activemq-spring/src/main/resources/META-INF/spring.schemas similarity index 100% rename from activemq-core/src/main/resources/META-INF/spring.schemas rename to activemq-spring/src/main/resources/META-INF/spring.schemas diff --git a/activemq-core/src/main/resources/activemq.xsd b/activemq-spring/src/main/resources/activemq.xsd similarity index 100% rename from activemq-core/src/main/resources/activemq.xsd rename to activemq-spring/src/main/resources/activemq.xsd diff --git a/activemq-core/src/main/resources/activemq.xsd.html b/activemq-spring/src/main/resources/activemq.xsd.html similarity index 100% rename from activemq-core/src/main/resources/activemq.xsd.html rename to activemq-spring/src/main/resources/activemq.xsd.html diff --git a/activemq-core/src/main/resources/activemq.xsd.wiki b/activemq-spring/src/main/resources/activemq.xsd.wiki similarity index 100% rename from activemq-core/src/main/resources/activemq.xsd.wiki rename to activemq-spring/src/main/resources/activemq.xsd.wiki diff --git a/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java b/activemq-spring/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java similarity index 100% rename from activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java rename to activemq-spring/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java diff --git a/activemq-leveldb/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml b/activemq-spring/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml similarity index 100% rename from activemq-leveldb/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml rename to activemq-spring/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml index 56ac02363b..ba6774b1ed 100755 --- a/activemq-web-demo/pom.xml +++ b/activemq-web-demo/pom.xml @@ -86,6 +86,12 @@ test test-jar + + ${project.groupId} + activemq-broker + test-jar + test + ${project.groupId} activeio-core diff --git a/activemq-xmpp/pom.xml b/activemq-xmpp/pom.xml index 5407e4a225..d0cdb46a22 100755 --- a/activemq-xmpp/pom.xml +++ b/activemq-xmpp/pom.xml @@ -83,6 +83,13 @@ test-jar test + + ${project.groupId} + activemq-broker + test-jar + test + + diff --git a/assembly/pom.xml b/assembly/pom.xml index 270da4459a..1f8911da62 100755 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -41,6 +41,19 @@ ${project.groupId} activemq-camel + + ${project.groupId} + activeio-core + + + + ${project.groupId} + activemq-client + + + ${project.groupId} + activemq-broker + ${project.groupId} activemq-core @@ -50,14 +63,33 @@ activemq-core test-jar + ${project.groupId} - activeio-core + activemq-leveldb-store ${project.groupId} - activemq-leveldb + activemq-amq-store + + ${project.groupId} + activemq-kahadb-store + + + ${project.groupId} + activemq-jdbc-store + + + + ${project.groupId} + activemq-mqtt + + + ${project.groupId} + activemq-stomp + + ${project.groupId} activemq-console diff --git a/pom.xml b/pom.xml index d108403c76..6b00d01f5b 100755 --- a/pom.xml +++ b/pom.xml @@ -204,6 +204,7 @@ activemq-kahadb-store activemq-amq-store activemq-jdbc-store + activemq-leveldb-store activemq-core activemq-all @@ -213,7 +214,6 @@ activemq-jaas activemq-blueprint activemq-karaf - activemq-leveldb activemq-openwire-generator activemq-optional activemq-pool @@ -257,6 +257,11 @@ activemq-jdbc-store ${project.version} + + org.apache.activemq + activemq-leveldb-store + ${project.version} + org.apache.activemq @@ -301,6 +306,13 @@ test-jar test + + org.apache.activemq + activemq-broker + ${project.version} + test-jar + test + org.apache.activemq activemq-jaas @@ -321,11 +333,6 @@ activemq-web ${project.version} - - org.apache.activemq - activemq-leveldb - ${project.version} - org.apache.activemq activemq-xmpp