From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 26 Jul 2009 12:01:19 +0000 (+0000)
Subject: Can use HTTP transport for ActiveMQ
X-Git-Tag: argeo-slc-2.1.7~1624
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f7105f026f943b3eb73850a7c63e12a334470930;p=gpl%2Fargeo-slc.git

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 741ef4b43..b38a627ac 100644
--- 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
 Bundle-Version: 0.11.4.SNAPSHOT
 Bundle-SymbolicName: org.argeo.slc.server.activemq.broker
-Import-Package: org.apache.activemq.broker,org.apache.activemq.xbean,org.springframework.beans.factory.config
+Import-Package: org.apache.activemq.broker,
+ org.apache.activemq.command;resolution:=optional,
+ org.apache.activemq.transport.http;resolution:=optional,
+ org.apache.activemq.xbean,
+ org.springframework.beans.factory.config
+
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index f996ed9c3..5affe7d34 100644
--- 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>