Port to latest Apache Vysper 0.5 and Qpid 0.6. Change memcached scripts to start memcached as a daemon.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@925909 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 35 insertions, 2 deletions

diff --git a/sca-cpp/trunk/components/chat/Makefile.am b/sca-cpp/trunk/components/chat/Makefile.am
index 00fdcfea74..96a00e5fee 100644
--- a/sca-cpp/trunk/components/chat/Makefile.am
+++ b/sca-cpp/trunk/components/chat/Makefile.am
@@ -47,6 +47,8 @@ AM_JAVACFLAGS = -cp `${top_builddir}/components/chat/vysper-classpath ${VYSPER_P
 noinst_JAVA = test/*.java
 
 CLEANFILES = test/*.class
+
+TESTS = echo-test 
 endif
 
 endif
diff --git a/sca-cpp/trunk/components/chat/echo-test b/sca-cpp/trunk/components/chat/echo-test
new file mode 100755
index 0000000000..271d40d122
--- /dev/null
+++ b/sca-cpp/trunk/components/chat/echo-test
@@ -0,0 +1,31 @@
+#!/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.
+
+# Setup
+./vysper-start
+sleep 3
+
+# Test
+./xmpp-test 2>/dev/null
+rc=$?
+
+# Cleanup
+./vysper-stop
+sleep 1
+return $rc
diff --git a/sca-cpp/trunk/components/chat/vysper-start b/sca-cpp/trunk/components/chat/vysper-start
index 39d2520fae..af95ecadf4 100755
--- a/sca-cpp/trunk/components/chat/vysper-start
+++ b/sca-cpp/trunk/components/chat/vysper-start
@@ -22,4 +22,4 @@ 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 &
+${java_prefix}/jre/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
index afb1436347..3c4be4efa9 100755
--- a/sca-cpp/trunk/components/chat/vysper-stop
+++ b/sca-cpp/trunk/components/chat/vysper-stop
@@ -21,5 +21,5 @@
 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 }'`
+kill `ps -ef | grep -v grep | grep "${java_prefix}/jre/bin/java" | grep "vysper" | awk '{ print $2 }'`