Can use HTTP transport for ActiveMQ

git-svn-id: https://svn.argeo.org/slc/trunk@2763 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/modules/server/org.argeo.slc.server.activemq.broker/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.activemq.broker/META-INF/MANIFEST.MF
index 741ef4b431ce557d1457d06789a2155cd8e36deb..b38a627ac43cca93e8a35104915317744f41b73e 100644 (file)
--- a/modules/server/org.argeo.slc.server.activemq.broker/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.activemq.broker/META-INF/MANIFEST.MF
@@ -1,4 +1,9 @@
 Manifest-Version: 1.0\r
 Bundle-Version: 0.11.4.SNAPSHOT\r
 Bundle-SymbolicName: org.argeo.slc.server.activemq.broker\r
-Import-Package: org.apache.activemq.broker,org.apache.activemq.xbean,org.springframework.beans.factory.config\r
+Import-Package: org.apache.activemq.broker,\r
+ org.apache.activemq.command;resolution:=optional,\r
+ org.apache.activemq.transport.http;resolution:=optional,\r
+ org.apache.activemq.xbean,\r
+ org.springframework.beans.factory.config\r
+

diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index f996ed9c3f89b2cf64ff639de22812d625774ac7..5affe7d34343ac5b304f151de9cd7bb9ef7a90fa 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -74,6 +74,10 @@
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.activemq</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.activemq.optional</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.apache.activemq</groupId>
                        <artifactId>com.springsource.org.apache.activemq.pool</artifactId>