From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 26 Jul 2009 12:53:42 +0000 (+0000)
Subject: First tests of XMPP
X-Git-Tag: argeo-slc-2.1.7~1622
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=9ea27e19dfe5f8e2595a3f6098497541d0338eaa;p=gpl%2Fargeo-slc.git

First tests of XMPP

git-svn-id: https://svn.argeo.org/slc/trunk@2767 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 b38a627ac..27b51375b 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,9 +1,21 @@
 Manifest-Version: 1.0
 Bundle-Version: 0.11.4.SNAPSHOT
 Bundle-SymbolicName: org.argeo.slc.server.activemq.broker
-Import-Package: org.apache.activemq.broker,
+Import-Package: jabber.client;resolution:=optional,
+ jabber.iq._private;resolution:=optional,
+ jabber.iq.auth;resolution:=optional,
+ jabber.iq.roster;resolution:=optional,
+ org.jabber.etherx.streams;resolution:=optional,
+ org.jabber.protocol.disco_info;resolution:=optional,
+ org.jabber.protocol.disco_items;resolution:=optional,
+ org.jabber.protocol.muc;resolution:=optional,
+ org.jabber.protocol.muc_user;resolution:=optional,
+ ietf.params.xml.ns.xmpp_sasl;resolution:=optional,
+ ietf.params.xml.ns.xmpp_stanzas;resolution:=optional,
+ ietf.params.xml.ns.xmpp_streams;resolution:=optional,
+ ietf.params.xml.ns.xmpp_tls;resolution:=optional,
+ 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/modules/server/org.argeo.slc.server.activemq.broker/META-INF/spring/activemq-broker.xml b/modules/server/org.argeo.slc.server.activemq.broker/META-INF/spring/activemq-broker.xml
index 9595daa23..53d984635 100644
--- a/modules/server/org.argeo.slc.server.activemq.broker/META-INF/spring/activemq-broker.xml
+++ b/modules/server/org.argeo.slc.server.activemq.broker/META-INF/spring/activemq-broker.xml
@@ -18,6 +18,7 @@
 	<amq:broker id="broker" useJmx="false" persistent="false">
 		<amq:transportConnectors>
 			<amq:transportConnector uri="${slc.server.jms.url}" />
+			<!-- <amq:transportConnector uri="xmpp://localhost:61222" /> -->
 		</amq:transportConnectors>
 	</amq:broker>
 </beans>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 679975966..790c29f80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1003,6 +1003,11 @@ limitations under the License.
 				<artifactId>org.argeo.dep.osgi.activemq.optional</artifactId>
 				<version>5.2.0.0001</version>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.activemq.xmpp</artifactId>
+				<version>5.2.0.0001</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.activemq</groupId>
 				<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 5affe7d34..6b1ea462d 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -78,6 +78,12 @@
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.activemq.optional</artifactId>
 		</dependency>
+		<!-- 
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.activemq.xmpp</artifactId>
+		</dependency>
+		 -->
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>com.springsource.org.apache.activemq.pool</artifactId>