From 9a1ad8c8b32a90ec45bb4ade507bc0168550e259 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Thu, 8 Nov 2012 15:51:10 +0000 Subject: [PATCH] Split out the activemq-http and activemq-log4j-appender modules from the activemq-optional module. git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407139 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-http/pom.xml | 200 ++++++++++++++++++ .../SecureSocketConnectorFactory.java | 0 .../transport/SocketConnectorFactory.java | 0 .../transport/WebTransportServerSupport.java | 0 .../http/DiscoveryRegistryServlet.java | 0 .../discovery/http/EmbeddedJettyServer.java | 0 .../discovery/http/HTTPDiscoveryAgent.java | 0 .../http/HTTPDiscoveryAgentFactory.java | 0 .../http/BlockingQueueTransport.java | 0 .../transport/http/HttpClientTransport.java | 0 .../http/HttpEmbeddedTunnelServlet.java | 0 .../http/HttpSpringEmbeddedTunnelServlet.java | 0 .../transport/http/HttpTransportFactory.java | 0 .../transport/http/HttpTransportServer.java | 0 .../transport/http/HttpTransportSupport.java | 0 .../transport/http/HttpTunnelServlet.java | 0 .../activemq/transport/http/package.html | 0 .../transport/https/HttpsClientTransport.java | 0 .../https/HttpsTransportFactory.java | 0 .../transport/https/HttpsTransportServer.java | 0 .../https/Krb5AndCertsSslSocketConnector.java | 0 .../activemq/transport/https/package.html | 0 .../transport/util/TextWireFormat.java | 0 .../activemq/transport/ws/StompServlet.java | 0 .../activemq/transport/ws/StompSocket.java | 0 .../transport/ws/WSTransportFactory.java | 0 .../transport/ws/WSTransportServer.java | 0 .../transport/wss/WSSTransportFactory.java | 0 .../transport/wss/WSSTransportServer.java | 0 .../transport/xstream/XStreamWireFormat.java | 0 .../xstream/XStreamWireFormatFactory.java | 0 .../activemq/transport/discoveryagent/http | 0 .../org/apache/activemq/transport/http | 0 .../org/apache/activemq/transport/https | 0 .../services/org/apache/activemq/transport/ws | 0 .../org/apache/activemq/transport/wss | 0 .../org/apache/activemq/wireformat/xstream | 0 ...woBrokerTopicSendReceiveUsingHttpTest.java | 0 .../org/apache/activemq/bugs/AMQ2764Test.java | 0 .../http/HttpClientReconnectTest.java | 0 .../transport/http/HttpJMSMessageTest.java | 0 .../HttpJMSMessagesWithCompressionTest.java | 0 .../HttpJmsDurableTopicSendReceiveTest.java | 0 .../http/HttpJmsSendAndReceiveTest.java | 0 ...pJmsSendAndReceiveWithCompressionTest.java | 0 .../HttpPersistentSendAndReceiveTest.java | 0 .../http/HttpSendCompressedMessagesTest.java | 0 .../transport/http/HttpSpringTest.java | 0 .../http/HttpTransportBrokerTest.java | 0 .../transport/http/WaitForJettyListener.java | 0 ...dAndReceiveConfigurationSslConfigTest.java | 0 ...msSendAndReceiveEmbeddedSslConfigTest.java | 0 .../https/HttpsJmsSendAndReceiveTest.java | 0 .../https/HttpsTransportBrokerTest.java | 0 .../transport/ws/WSTransportTest.java | 0 .../transport/wss/WSSTransportTest.java | 0 .../xstream/XStreamWireFormatTest.java | 0 .../src/test/resources/activemq-https.xml | 0 .../src/test/resources/client.keystore | Bin .../bugs/amq2764/reconnect-broker1.xml | 0 .../bugs/amq2764/reconnect-broker2.xml | 0 .../src/test/resources/server.keystore | Bin .../src/test/resources/spring-http.xml | 0 activemq-log4j-appender/pom.xml | 105 +++++++++ .../apache/activemq/util/JmsLogAppender.java | 0 .../activemq/util/JmsLogAppenderSupport.java | 0 .../activemq/util/JndiJmsLogAppender.java | 0 .../activemq/util/JmsLogAppenderTest.java | 0 .../src/test/resources/jndi.properties | 0 .../activemq/util/test-log4j.properties | 0 .../filter/XMLBeansXPathEvaluator.java | 61 ------ activemq-spring/pom.xml | 1 - assembly/pom.xml | 9 + pom.xml | 14 +- 74 files changed, 327 insertions(+), 63 deletions(-) create mode 100755 activemq-http/pom.xml rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgentFactory.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/http/package.html (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/https/package.html (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/ws/StompServlet.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/ws/StompSocket.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/ws/WSTransportFactory.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java (100%) rename {activemq-optional => activemq-http}/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java (100%) rename {activemq-optional => activemq-http}/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/http (100%) rename {activemq-optional => activemq-http}/src/main/resources/META-INF/services/org/apache/activemq/transport/http (100%) rename {activemq-optional => activemq-http}/src/main/resources/META-INF/services/org/apache/activemq/transport/https (100%) rename {activemq-optional => activemq-http}/src/main/resources/META-INF/services/org/apache/activemq/transport/ws (100%) rename {activemq-optional => activemq-http}/src/main/resources/META-INF/services/org/apache/activemq/transport/wss (100%) rename {activemq-optional => activemq-http}/src/main/resources/META-INF/services/org/apache/activemq/wireformat/xstream (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveWithCompressionTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveConfigurationSslConfigTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveEmbeddedSslConfigTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java (100%) rename {activemq-optional => activemq-http}/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java (100%) rename {activemq-optional => activemq-http}/src/test/resources/activemq-https.xml (100%) rename {activemq-optional => activemq-http}/src/test/resources/client.keystore (100%) rename {activemq-optional => activemq-http}/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml (100%) rename {activemq-optional => activemq-http}/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml (100%) rename {activemq-optional => activemq-http}/src/test/resources/server.keystore (100%) rename {activemq-optional => activemq-http}/src/test/resources/spring-http.xml (100%) create mode 100755 activemq-log4j-appender/pom.xml rename {activemq-optional => activemq-log4j-appender}/src/main/java/org/apache/activemq/util/JmsLogAppender.java (100%) rename {activemq-optional => activemq-log4j-appender}/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java (100%) rename {activemq-optional => activemq-log4j-appender}/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java (100%) rename {activemq-optional => activemq-log4j-appender}/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java (100%) rename {activemq-optional => activemq-log4j-appender}/src/test/resources/jndi.properties (100%) rename {activemq-optional => activemq-log4j-appender}/src/test/resources/org/apache/activemq/util/test-log4j.properties (100%) delete mode 100644 activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml new file mode 100755 index 0000000000..0535173375 --- /dev/null +++ b/activemq-http/pom.xml @@ -0,0 +1,200 @@ + + + + + 4.0.0 + + + org.apache.activemq + activemq-parent + 5.8-SNAPSHOT + + + activemq-http + jar + ActiveMQ :: HTTP Protocol Support + ActiveMQ HTTP Protocol Support + + + + + + ${project.groupId} + activemq-spring + + + ${project.groupId} + activemq-stomp + + + org.slf4j + slf4j-api + + + + org.eclipse.jetty.aggregate + jetty-all-server + + + org.eclipse.jetty + jetty-websocket + ${jetty-version} + + + + + + + + + org.apache.httpcomponents + httpclient + + + + com.thoughtworks.xstream + xstream + + + + + + + ${project.groupId} + activemq-core + test-jar + test + + + ${project.groupId} + activemq-broker + test-jar + test + + + + junit + junit + compile + true + + + org.slf4j + slf4j-log4j12 + test + + + + org.seleniumhq.selenium + selenium-java + 2.25.0 + test + + + org.seleniumhq.selenium + selenium-chrome-driver + 2.25.0 + test + + + org.seleniumhq.selenium + selenium-firefox-driver + 2.25.0 + test + + + + + + + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.felix + maven-bundle-plugin + + + ${project.artifactId} + org.apache.activemq.activemq-core + + org.apache.activemq.transport.http*;version=${project.version};-noimport:=;-split-package:=merge-last, + org.apache.activemq.transport.https*;version=${project.version};-noimport:=;-split-package:=merge-last + + + org.eclipse.jetty*;version="[7.5,8.0)";resolution:=optional, + !org.apache.activemq.transport.ws*;version=${project.version}, + !org.apache.activemq.transport.xstream;version=${project.version}, + !org.apache.activemq.transport.util;version=${project.version}, + org.apache.activemq*;version=${project.version};resolution:=optional + + + + + + bundle-manifest + process-classes + + manifest + + + + + + + maven-surefire-plugin + + + + + + + + activemq.tests-quick + + true + + + + + maven-surefire-plugin + + + + **/perf/* + + + **/load/* + + org/apache/activemq/transport/http/HttpClientReconnectTest.* + org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.* + org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.* + org/apache/activemq/transport/http/HttpSpringTest.* + + + + + + + + + diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java b/activemq-http/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java rename to activemq-http/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java b/activemq-http/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java rename to activemq-http/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java b/activemq-http/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java rename to activemq-http/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java b/activemq-http/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java rename to activemq-http/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java b/activemq-http/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java rename to activemq-http/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java b/activemq-http/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java rename to activemq-http/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgent.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgentFactory.java b/activemq-http/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgentFactory.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgentFactory.java rename to activemq-http/src/main/java/org/apache/activemq/transport/discovery/http/HTTPDiscoveryAgentFactory.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java rename to activemq-http/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java rename to activemq-http/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java rename to activemq-http/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java rename to activemq-http/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java rename to activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java rename to activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java rename to activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java rename to activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/package.html b/activemq-http/src/main/java/org/apache/activemq/transport/http/package.html similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/http/package.html rename to activemq-http/src/main/java/org/apache/activemq/transport/http/package.html diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java b/activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java rename to activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsClientTransport.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java b/activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java rename to activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java b/activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java rename to activemq-http/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java b/activemq-http/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java rename to activemq-http/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/https/package.html b/activemq-http/src/main/java/org/apache/activemq/transport/https/package.html similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/https/package.html rename to activemq-http/src/main/java/org/apache/activemq/transport/https/package.html diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java b/activemq-http/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java rename to activemq-http/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompServlet.java b/activemq-http/src/main/java/org/apache/activemq/transport/ws/StompServlet.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompServlet.java rename to activemq-http/src/main/java/org/apache/activemq/transport/ws/StompServlet.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java b/activemq-http/src/main/java/org/apache/activemq/transport/ws/StompSocket.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java rename to activemq-http/src/main/java/org/apache/activemq/transport/ws/StompSocket.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportFactory.java b/activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportFactory.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportFactory.java rename to activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportFactory.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java b/activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java rename to activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java b/activemq-http/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java rename to activemq-http/src/main/java/org/apache/activemq/transport/wss/WSSTransportFactory.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java b/activemq-http/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java rename to activemq-http/src/main/java/org/apache/activemq/transport/wss/WSSTransportServer.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java b/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java rename to activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java b/activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java rename to activemq-http/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java diff --git a/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/http b/activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/http similarity index 100% rename from activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/http rename to activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/http diff --git a/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/http b/activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/http similarity index 100% rename from activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/http rename to activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/http diff --git a/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/https b/activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/https similarity index 100% rename from activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/https rename to activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/https diff --git a/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/ws b/activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/ws similarity index 100% rename from activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/ws rename to activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/ws diff --git a/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/wss b/activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/wss similarity index 100% rename from activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/transport/wss rename to activemq-http/src/main/resources/META-INF/services/org/apache/activemq/transport/wss diff --git a/activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/wireformat/xstream b/activemq-http/src/main/resources/META-INF/services/org/apache/activemq/wireformat/xstream similarity index 100% rename from activemq-optional/src/main/resources/META-INF/services/org/apache/activemq/wireformat/xstream rename to activemq-http/src/main/resources/META-INF/services/org/apache/activemq/wireformat/xstream diff --git a/activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java b/activemq-http/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java rename to activemq-http/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java b/activemq-http/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java rename to activemq-http/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveWithCompressionTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveWithCompressionTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveWithCompressionTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveWithCompressionTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java rename to activemq-http/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveConfigurationSslConfigTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveConfigurationSslConfigTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveConfigurationSslConfigTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveConfigurationSslConfigTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveEmbeddedSslConfigTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveEmbeddedSslConfigTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveEmbeddedSslConfigTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveEmbeddedSslConfigTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java rename to activemq-http/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java diff --git a/activemq-optional/src/test/resources/activemq-https.xml b/activemq-http/src/test/resources/activemq-https.xml similarity index 100% rename from activemq-optional/src/test/resources/activemq-https.xml rename to activemq-http/src/test/resources/activemq-https.xml diff --git a/activemq-optional/src/test/resources/client.keystore b/activemq-http/src/test/resources/client.keystore similarity index 100% rename from activemq-optional/src/test/resources/client.keystore rename to activemq-http/src/test/resources/client.keystore diff --git a/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml b/activemq-http/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml similarity index 100% rename from activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml rename to activemq-http/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml diff --git a/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml b/activemq-http/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml similarity index 100% rename from activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml rename to activemq-http/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml diff --git a/activemq-optional/src/test/resources/server.keystore b/activemq-http/src/test/resources/server.keystore similarity index 100% rename from activemq-optional/src/test/resources/server.keystore rename to activemq-http/src/test/resources/server.keystore diff --git a/activemq-optional/src/test/resources/spring-http.xml b/activemq-http/src/test/resources/spring-http.xml similarity index 100% rename from activemq-optional/src/test/resources/spring-http.xml rename to activemq-http/src/test/resources/spring-http.xml diff --git a/activemq-log4j-appender/pom.xml b/activemq-log4j-appender/pom.xml new file mode 100755 index 0000000000..c04a143138 --- /dev/null +++ b/activemq-log4j-appender/pom.xml @@ -0,0 +1,105 @@ + + + + + 4.0.0 + + + org.apache.activemq + activemq-parent + 5.8-SNAPSHOT + + + activemq-log4j-appender + jar + ActiveMQ :: Log4j Appender + ActiveMQ Log4j Appender + + + + + org.apache.activemq + activemq-client + + + log4j + log4j + provided + + + + + + + junit + junit + test + + + org.slf4j + slf4j-log4j12 + test + + + org.apache.activemq + activemq-broker + test + + + + + + + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.felix + maven-bundle-plugin + + + ${project.artifactId} + org.apache.activemq.activemq-core + + org.apache.activemq.transport.util*;version=${project.version};-noimport:=;-split-package:=merge-last, + + + + + + bundle-manifest + process-classes + + manifest + + + + + + + maven-surefire-plugin + + + + + + diff --git a/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java b/activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppender.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java rename to activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppender.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java b/activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java rename to activemq-log4j-appender/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java diff --git a/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java b/activemq-log4j-appender/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java similarity index 100% rename from activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java rename to activemq-log4j-appender/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java diff --git a/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java b/activemq-log4j-appender/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java similarity index 100% rename from activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java rename to activemq-log4j-appender/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java diff --git a/activemq-optional/src/test/resources/jndi.properties b/activemq-log4j-appender/src/test/resources/jndi.properties similarity index 100% rename from activemq-optional/src/test/resources/jndi.properties rename to activemq-log4j-appender/src/test/resources/jndi.properties diff --git a/activemq-optional/src/test/resources/org/apache/activemq/util/test-log4j.properties b/activemq-log4j-appender/src/test/resources/org/apache/activemq/util/test-log4j.properties similarity index 100% rename from activemq-optional/src/test/resources/org/apache/activemq/util/test-log4j.properties rename to activemq-log4j-appender/src/test/resources/org/apache/activemq/util/test-log4j.properties diff --git a/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java b/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java deleted file mode 100644 index babdacc715..0000000000 --- a/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java +++ /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.filter; - -import javax.jms.BytesMessage; -import javax.jms.JMSException; -import javax.jms.TextMessage; - -import org.apache.activemq.command.Message; -import org.apache.activemq.util.ByteArrayInputStream; -import org.apache.xmlbeans.XmlObject; - -public class XMLBeansXPathEvaluator implements XPathExpression.XPathEvaluator { - - private final String xpath; - - public XMLBeansXPathEvaluator(String xpath) { - this.xpath = xpath; - } - - public boolean evaluate(Message message) throws JMSException { - if (message instanceof TextMessage) { - String text = ((TextMessage)message).getText(); - try { - XmlObject object = XmlObject.Factory.parse(text); - XmlObject[] objects = object.selectPath(xpath); - return object != null && objects.length > 0; - } catch (Throwable e) { - return false; - } - - } else if (message instanceof BytesMessage) { - BytesMessage bm = (BytesMessage)message; - byte data[] = new byte[(int)bm.getBodyLength()]; - bm.readBytes(data); - try { - XmlObject object = XmlObject.Factory.parse(new ByteArrayInputStream(data)); - XmlObject[] objects = object.selectPath(xpath); - return object != null && objects.length > 0; - } catch (Throwable e) { - return false; - } - } - return false; - } -} diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml index 547f349a5f..77a99f3623 100755 --- a/activemq-spring/pom.xml +++ b/activemq-spring/pom.xml @@ -60,7 +60,6 @@ org.apache.xbean xbean-spring - true org.apache.activemq diff --git a/assembly/pom.xml b/assembly/pom.xml index 95703e9e2e..b3d07e7ec4 100755 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -94,6 +94,15 @@ activemq-stomp + + ${project.groupId} + activemq-log4j-appender + + + ${project.groupId} + activemq-http + + ${project.groupId} activemq-console diff --git a/pom.xml b/pom.xml index d5cd58c6f2..e1dd8dac14 100755 --- a/pom.xml +++ b/pom.xml @@ -230,7 +230,8 @@ activemq-xmpp activemq-itests-spring31 assembly - + activemq-log4j-appender + activemq-http @@ -245,6 +246,17 @@ + + org.apache.activemq + activemq-http + ${project.version} + + + org.apache.activemq + activemq-log4j-appender + ${project.version} + + org.apache.activemq activemq-amq-store