7 files changed, 205 insertions, 8 deletions
diff --git a/sca-cpp/trunk/INSTALL b/sca-cpp/trunk/INSTALL
index 2fe522d7e4..3b08c5abf7 100644
--- a/sca-cpp/trunk/INSTALL
+++ b/sca-cpp/trunk/INSTALL
@@ -53,6 +53,10 @@ XMPP Chat:
 Libstrophe (http://code.stanziq.com/cgit/strophe/libstrophe/)
 build it from source at git://code.stanziq.com//libstrophe
 
+XMPP Chat tests: Apache Vysper (http://mina.apache.org/)
+build from source at http://svn.apache.org/repos/asf/mina/sandbox/vysper/trunk
+or download a build from http://hudson.zones.apache.org/hudson/view/Vysper
+
 
 To configure the Tuscany SCA build do this:
 ./bootstrap
@@ -80,7 +84,8 @@ To build the Web service utility component (requires Apache Axis2/C):
 To build the Queue utility component (requires Apache Qpid/C++):
 --enable-queue
 
-To build the Chat utility component (requires Libstrophe):
+To build the Chat utility component (requires Libstrophe and optionally Apache
+Vysper if you want to run the tests with a local Vysper XMPP server):
 --enable-chat
 
 To generate doxygen documentation, add:
@@ -106,6 +111,7 @@ dependencies installed under $HOME:
 --enable-webservice --with-axis2c=$HOME/axis2c-1.6.0-bin \
 --enable-queue --with-qpidc=$HOME/qpidc-0.6-bin \
 --enable-chat --with-libstrophe=$HOME/libstrophe \
+--with-vysper=$HOME/vysper-1.0.0 \
 --enable-maintainer-mode
 
 
diff --git a/sca-cpp/trunk/components/chat/Makefile.am b/sca-cpp/trunk/components/chat/Makefile.am
index 944484946e..9ab64c388c 100644
--- a/sca-cpp/trunk/components/chat/Makefile.am
+++ b/sca-cpp/trunk/components/chat/Makefile.am
@@ -15,12 +15,20 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+JAVAROOT = $(top_builddir)/components/chat
+
 if WANT_CHAT
 
 INCLUDES = -I${LIBSTROPHE_INCLUDE} -I${LIBSTROPHE_INCLUDE}/src
 
-comp_LTLIBRARIES = libchatter.la
+comp_SCRIPTS = vysper-start vysper-stop vysper-classpath
 compdir=$(prefix)/components/chat
+
+comp_DATA = vysper.prefix
+vysper.prefix: $(top_builddir)/config.status
+	echo ${VYSPER_PREFIX} >vysper.prefix
+
+comp_LTLIBRARIES = libchatter.la
 libchatter_la_SOURCES = chatter.cpp
 libchatter_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lexpat -lssl -lresolv
 
@@ -32,4 +40,13 @@ client_test_LDFLAGS = -lxml2 -lcurl -lmozjs -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_L
 
 noinst_PROGRAMS = xmpp-test client-test
 
+if WANT_VYSPER
+
+AM_JAVACFLAGS = -cp `${top_builddir}/components/chat/vysper-classpath`${JAVAROOT}
+
+noinst_JAVA = test/*.java
+
+CLEANFILES = test/*.class
+endif
+
 endif
diff --git a/sca-cpp/trunk/components/chat/test/TestVysperServer.java b/sca-cpp/trunk/components/chat/test/TestVysperServer.java
new file mode 100644
index 0000000000..3d2b7d7c3e
--- /dev/null
+++ b/sca-cpp/trunk/components/chat/test/TestVysperServer.java
@@ -0,0 +1,79 @@
+/*
+ * 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 test;
+
+/**
+ * A test XMPP server, using Apache Vysper.
+ */
+import static java.lang.System.*;
+
+import java.io.File;
+
+import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.stanzasession.StanzaSessionFactory;
+import org.apache.vysper.storage.StorageProviderRegistry;
+import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
+import org.apache.vysper.xmpp.authorization.AccountManagement;
+import org.apache.vysper.xmpp.modules.extension.xep0049_privatedata.PrivateDataModule;
+import org.apache.vysper.xmpp.modules.extension.xep0054_vcardtemp.VcardTempModule;
+import org.apache.vysper.xmpp.modules.extension.xep0092_software_version.SoftwareVersionModule;
+import org.apache.vysper.xmpp.modules.extension.xep0119_xmppping.XmppPingModule;
+import org.apache.vysper.xmpp.modules.extension.xep0202_entity_time.EntityTimeModule;
+import org.apache.vysper.xmpp.server.XMPPServer;
+
+class TestVysperServer {
+    public static void main(final String args[]) throws Exception {
+        out.println("Starting test Vysper server...");
+
+        // Add the XMPP users used by the xmpp-test and server-test test cases
+        // If you're using your own XMPP server you need to add these users manually
+        final StorageProviderRegistry providerRegistry = new MemoryStorageProviderRegistry();
+        final AccountManagement accountManagement = (AccountManagement)providerRegistry.retrieve(AccountManagement.class);
+        accountManagement.addUser("sca1@localhost", "sca1");
+        accountManagement.addUser("sca2@localhost", "sca2");
+        accountManagement.addUser("sca3@localhost", "sca3");
+
+        // Create and start XMPP server for domain: localhost
+        final XMPPServer server = new org.apache.vysper.xmpp.server.XMPPServer("localhost");
+        server.addEndpoint(new TCPEndpoint());
+        server.addEndpoint(new StanzaSessionFactory());
+        server.setStorageProviderRegistry(providerRegistry);
+        final File cert = new File(TestVysperServer.class.getClassLoader().getResource("bogus_mina_tls.cert").getPath());
+        server.setTLSCertificateInfo(cert, "boguspw");
+        server.start();
+        server.addModule(new SoftwareVersionModule());
+        server.addModule(new EntityTimeModule());
+        server.addModule(new VcardTempModule());
+        server.addModule(new XmppPingModule());
+        server.addModule(new PrivateDataModule());
+        out.println("Test Vysper server started...");
+
+        // Wait forever
+        final Object lock = new Object();
+        synchronized(lock) {
+            lock.wait();
+        }
+
+        System.out.println("Stopping test Vysper server...");
+        server.stop();
+        out.println("Test Vysper server stopped.");
+        System.exit(0);
+    }
+}
diff --git a/sca-cpp/trunk/components/chat/vysper-classpath b/sca-cpp/trunk/components/chat/vysper-classpath
new file mode 100755
index 0000000000..eb234fb285
--- /dev/null
+++ b/sca-cpp/trunk/components/chat/vysper-classpath
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+#  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.
+
+# Compute a classpath for running a Vysper server
+here=`readlink -f $0`; here=`dirname $here`
+
+vysper_prefix=`cat $here/vysper.prefix`
+jars=`find $vysper_prefix/lib -name "*.jar" | awk '{ printf "%s:", $1 }'`
+echo "$vysper_prefix/config:$jars"
diff --git a/sca-cpp/trunk/components/chat/vysper-start b/sca-cpp/trunk/components/chat/vysper-start
new file mode 100755
index 0000000000..39d2520fae
--- /dev/null
+++ b/sca-cpp/trunk/components/chat/vysper-start
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+#  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.
+
+# Start Vysper test XMPP server
+here=`readlink -f $0`; here=`dirname $here`
+
+java_prefix=`cat $here/../../modules/java/java.prefix`
+mkdir -p $here/tmp/logs
+${java_prefix}/bin/java -cp `$here/vysper-classpath`$here test.TestVysperServer 2>&1 1>>$here/tmp/logs/vysper.log &
diff --git a/sca-cpp/trunk/components/chat/vysper-stop b/sca-cpp/trunk/components/chat/vysper-stop
new file mode 100755
index 0000000000..afb1436347
--- /dev/null
+++ b/sca-cpp/trunk/components/chat/vysper-stop
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+#  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.
+
+# Stop Vysper test XMPP server
+here=`readlink -f $0`; here=`dirname $here`
+
+java_prefix=`cat $here/../../modules/java/java.prefix`
+kill `ps -ef | grep -v grep | grep "${java_prefix}/bin/java" | grep "test.TestVysperServer" | awk '{ print $2 }'`
+
diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac
index 7ac5a33b47..b630144b65 100644
--- a/sca-cpp/trunk/configure.ac
+++ b/sca-cpp/trunk/configure.ac
@@ -85,20 +85,20 @@ AC_SUBST(LIBXML2_LIB)
 # Configure path to libmozjs includes and lib.
 AC_MSG_CHECKING([for js-include])
 AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH], [path to installed SpiderMonkey include dir
-             [default=/usr/include/xulrunner-1.9.1.7/unstable]])], [
+             [default=/usr/include/xulrunner-1.9.1.8/unstable]])], [
   JS_INCLUDE="${withval}"
   AC_MSG_RESULT("${withval}")
 ], [
-  JS_INCLUDE="/usr/include/xulrunner-1.9.1.7/unstable"
-  AC_MSG_RESULT(/usr/include/xulrunner-1.9.1.7/unstable)
+  JS_INCLUDE="/usr/include/xulrunner-1.9.1.8/unstable"
+  AC_MSG_RESULT(/usr/include/xulrunner-1.9.1.8/unstable)
 ])
 AC_MSG_CHECKING([for js-lib])
-AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed SpiderMonkey lib dir [default=/usr/lib/xulrunner-1.9.1.7]])], [
+AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed SpiderMonkey lib dir [default=/usr/lib/xulrunner-1.9.1.8]])], [
   JS_LIB="${withval}"
   AC_MSG_RESULT("${withval}")
 ], [
-  JS_LIB="/usr/lib/xulrunner-1.9.1.7"
-  AC_MSG_RESULT(/usr/lib/xulrunner-1.9.1.7)
+  JS_LIB="/usr/lib/xulrunner-1.9.1.8"
+  AC_MSG_RESULT(/usr/lib/xulrunner-1.9.1.8)
 ])
 AC_SUBST(JS_INCLUDE)
 AC_SUBST(JS_LIB)
@@ -520,6 +520,17 @@ AC_ARG_WITH([libstrophe], [AC_HELP_STRING([--with-libstrophe=PATH], [path to lib
 AC_SUBST(LIBSTROPHE_INCLUDE)
 AC_SUBST(LIBSTROPHE_LIB)
 
+# Configure path to Vysper
+AC_MSG_CHECKING([for vysper])
+AC_ARG_WITH([vysper], [AC_HELP_STRING([--with-vysper=PATH], [path to Apache Vysper [default=${HOME}/vysper-1.0.0]])], [
+  VYSPER_PREFIX="${withval}"
+  AC_MSG_RESULT("${withval}")
+], [
+  VYSPER_PREFIX="${HOME}/vysper-1.0.0"
+  AC_MSG_RESULT(${HOME}/vysper-1.0.0)
+])
+AC_SUBST(VYSPER_PREFIX)
+
 # Enable Chat component.
 AC_MSG_CHECKING([whether to enable the Chat component])
 AC_ARG_ENABLE(chat, [AS_HELP_STRING([--enable-chat], [enable Chat component [default=no]])],
@@ -541,8 +552,17 @@ if test "${want_chat}" = "true"; then
   AC_CHECK_LIB([strophe], [xmpp_initialize], [], [AC_MSG_ERROR([couldn't find a suitable libstrophe, use --with-libstrophe=PATH])], [-lexpat -lssl -lresolv])
   AM_CONDITIONAL([WANT_CHAT], true)
   AC_DEFINE([WANT_CHAT], 1, [enable Chat component])
+
+  # Check for Vysper
+  AC_CHECK_FILE([${VYSPER_PREFIX}/lib/vysper-core-1.0.0-SNAPSHOT.jar], [want_vysper=true], [])
+  if test "${want_vysper}" = "true"; then
+    AM_CONDITIONAL([WANT_VYSPER], true)
+  else
+    AM_CONDITIONAL([WANT_VYSPER], false)
+  fi
 else
   AM_CONDITIONAL([WANT_CHAT], false)
+  AM_CONDITIONAL([WANT_VYSPER], false)
 fi
 
 # Configure GCC C++ and LD options.