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 b38a627ac43cca93e8a35104915317744f41b73e..27b51375b6f585076bc8a4f7ba23f0f1f9b476b5 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,9 +1,21 @@
 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,\r
+Import-Package: jabber.client;resolution:=optional,\r
+ jabber.iq._private;resolution:=optional,\r
+ jabber.iq.auth;resolution:=optional,\r
+ jabber.iq.roster;resolution:=optional,\r
+ org.jabber.etherx.streams;resolution:=optional,\r
+ org.jabber.protocol.disco_info;resolution:=optional,\r
+ org.jabber.protocol.disco_items;resolution:=optional,\r
+ org.jabber.protocol.muc;resolution:=optional,\r
+ org.jabber.protocol.muc_user;resolution:=optional,\r
+ ietf.params.xml.ns.xmpp_sasl;resolution:=optional,\r
+ ietf.params.xml.ns.xmpp_stanzas;resolution:=optional,\r
+ ietf.params.xml.ns.xmpp_streams;resolution:=optional,\r
+ ietf.params.xml.ns.xmpp_tls;resolution:=optional,\r
+ 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/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 9595daa2377e5b1bacd212849401b05b72626a75..53d9846350a335ebbd0dad3de8f68c696b2ea6e6 100644 (file)
--- 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 6799759665a769064409320f2ffda009f5c9baa8..790c29f80f2ec974aa32494eae4bfa29fe4a21df 100644 (file)
--- 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 5affe7d34343ac5b304f151de9cd7bb9ef7a90fa..6b1ea462d59453a4b49dec34c6dac589f8f4c413 100644 (file)
--- 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>