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
This commit is contained in:
parent
c7c8892faf
commit
bc6e7c7b3b
9 changed files with 44 additions and 13 deletions
sca-cpp/trunk
|
@ -84,14 +84,12 @@ Java:
|
|||
a Java 5+ JDK (http://openjdk.java.net/, http://harmony.apache.org/)
|
||||
|
||||
XMPP Chat:
|
||||
Apache Vysper 0.5 (http://mina.apache.org/)
|
||||
|
||||
Libstrophe (http://code.stanziq.com/cgit/strophe/libstrophe/)
|
||||
build it from source at git://code.stanziq.com//libstrophe
|
||||
requires libcheck-0.9.6
|
||||
|
||||
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
|
||||
|
|
|
@ -18,4 +18,4 @@
|
|||
# under the License.
|
||||
|
||||
# Start memcached
|
||||
memcached -l 127.0.0.1 -m 4 -p 11211 &
|
||||
memcached -d -l 127.0.0.1 -m 4 -p 11211
|
||||
|
|
|
@ -18,6 +18,6 @@
|
|||
# under the License.
|
||||
|
||||
# Stop memcached
|
||||
mc="memcached -l 127.0.0.1 -m 4 -p 11211"
|
||||
mc="memcached -d -l 127.0.0.1 -m 4 -p 11211"
|
||||
|
||||
kill `ps -ef | grep -v grep | grep "${mc}" | awk '{ print $2 }'`
|
||||
|
|
|
@ -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
|
||||
|
|
31
sca-cpp/trunk/components/chat/echo-test
Executable file
31
sca-cpp/trunk/components/chat/echo-test
Executable file
|
@ -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
|
|
@ -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 &
|
||||
|
|
|
@ -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 }'`
|
||||
|
||||
|
|
|
@ -558,7 +558,7 @@ if test "${want_chat}" = "true"; then
|
|||
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], [])
|
||||
AC_CHECK_FILE([${VYSPER_PREFIX}/lib/vysper-core-0.5.jar], [want_vysper=true], [])
|
||||
if test "${want_vysper}" = "true"; then
|
||||
AM_CONDITIONAL([WANT_VYSPER], true)
|
||||
else
|
||||
|
|
|
@ -83,7 +83,7 @@ if [ "$?" != "0" ]; then
|
|||
fi
|
||||
sudo -s ln -s /usr/lib/libboost_program_options-mt.so /usr/lib/libboost_program_options.so
|
||||
sudo -s ln -s /usr/lib/libboost_filesystem-mt.so /usr/lib/libboost_filesystem.so
|
||||
curl -o qpid-cpp-0.6.tar.gz http://qpid.apache.org/dist/qpid-0.6rc7/qpid-cpp-0.6rc7.tar.gz
|
||||
curl -o qpid-cpp-0.6.tar.gz http://www.apache.org/dist/qpid/0.6/qpid-cpp-0.6.tar.gz
|
||||
tar xzf qpid-cpp-0.6.tar.gz
|
||||
cd qpidc-0.6
|
||||
./configure --prefix=$build/qpidc-0.6-bin
|
||||
|
@ -119,8 +119,8 @@ sudo apt-get -y install openjdk-6-jdk
|
|||
if [ "$?" != "0" ]; then
|
||||
exit $?
|
||||
fi
|
||||
curl -o vysper-1.0.0-bin.tar.gz 'http://hudson.zones.apache.org/hudson/view/Vysper/job/vysper-trunk-jdk1.6-ubuntu/org.apache.vysper$vysper/lastSuccessfulBuild/artifact/org.apache.vysper/vysper/1.0.0-SNAPSHOT/vysper-1.0.0-SNAPSHOT-bin.tar.gz'
|
||||
tar xzf vysper-1.0.0-bin.tar.gz
|
||||
curl -o vysper-0.5-bin.tar.gz https://repository.apache.org/content/repositories/orgapachemina-007/org/apache/vysper/vysper/0.5/vysper-0.5-bin.tar.gz
|
||||
tar xzf vysper-0.5-bin.tar.gz
|
||||
if [ "$?" != "0" ]; then
|
||||
exit $?
|
||||
fi
|
||||
|
@ -134,7 +134,7 @@ git clone git://git.apache.org/tuscany-sca-cpp
|
|||
cd tuscany-sca-cpp
|
||||
cp etc/git-exclude .git/info/exclude
|
||||
./bootstrap
|
||||
./configure --prefix=$build/tuscany-sca-cpp-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --enable-threads --enable-python --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe --with-vysper=$build/vysper-1.0.0
|
||||
./configure --prefix=$build/tuscany-sca-cpp-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --enable-threads --enable-python --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe --with-vysper=$build/vysper-0.5
|
||||
make
|
||||
make install
|
||||
if [ "$?" != "0" ]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue