You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/03/21 23:00:32 UTC
svn commit: r925909 - in /tuscany/sca-cpp/trunk: ./ components/cache/
components/chat/ ubuntu/
Author: jsdelfino
Date: Sun Mar 21 22:00:32 2010
New Revision: 925909
URL: http://svn.apache.org/viewvc?rev=925909&view=rev
Log:
Port to latest Apache Vysper 0.5 and Qpid 0.6. Change memcached scripts to start memcached as a daemon.
Added:
tuscany/sca-cpp/trunk/components/chat/echo-test
- copied, changed from r924189, tuscany/sca-cpp/trunk/components/cache/memcached-start
Modified:
tuscany/sca-cpp/trunk/INSTALL
tuscany/sca-cpp/trunk/components/cache/memcached-start
tuscany/sca-cpp/trunk/components/cache/memcached-stop
tuscany/sca-cpp/trunk/components/chat/Makefile.am
tuscany/sca-cpp/trunk/components/chat/vysper-start
tuscany/sca-cpp/trunk/components/chat/vysper-stop
tuscany/sca-cpp/trunk/configure.ac
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
Modified: tuscany/sca-cpp/trunk/INSTALL
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/INSTALL?rev=925909&r1=925908&r2=925909&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/INSTALL (original)
+++ tuscany/sca-cpp/trunk/INSTALL Sun Mar 21 22:00:32 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-start?rev=925909&r1=925908&r2=925909&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-start (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-start Sun Mar 21 22:00:32 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-stop
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-stop?rev=925909&r1=925908&r2=925909&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-stop (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-stop Sun Mar 21 22:00:32 2010
@@ -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 }'`
Modified: tuscany/sca-cpp/trunk/components/chat/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/Makefile.am?rev=925909&r1=925908&r2=925909&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/chat/Makefile.am Sun Mar 21 22:00:32 2010
@@ -47,6 +47,8 @@ AM_JAVACFLAGS = -cp `${top_builddir}/com
noinst_JAVA = test/*.java
CLEANFILES = test/*.class
+
+TESTS = echo-test
endif
endif
Copied: tuscany/sca-cpp/trunk/components/chat/echo-test (from r924189, tuscany/sca-cpp/trunk/components/cache/memcached-start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/echo-test?p2=tuscany/sca-cpp/trunk/components/chat/echo-test&p1=tuscany/sca-cpp/trunk/components/cache/memcached-start&r1=924189&r2=925909&rev=925909&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-start (original)
+++ tuscany/sca-cpp/trunk/components/chat/echo-test Sun Mar 21 22:00:32 2010
@@ -17,5 +17,15 @@
# specific language governing permissions and limitations
# under the License.
-# Start memcached
-memcached -l 127.0.0.1 -m 4 -p 11211 &
+# Setup
+./vysper-start
+sleep 3
+
+# Test
+./xmpp-test 2>/dev/null
+rc=$?
+
+# Cleanup
+./vysper-stop
+sleep 1
+return $rc
Modified: tuscany/sca-cpp/trunk/components/chat/vysper-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/vysper-start?rev=925909&r1=925908&r2=925909&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/vysper-start (original)
+++ tuscany/sca-cpp/trunk/components/chat/vysper-start Sun Mar 21 22:00:32 2010
@@ -22,4 +22,4 @@ here=`readlink -f $0`; here=`dirname $he
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 &
Modified: tuscany/sca-cpp/trunk/components/chat/vysper-stop
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/vysper-stop?rev=925909&r1=925908&r2=925909&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/vysper-stop (original)
+++ tuscany/sca-cpp/trunk/components/chat/vysper-stop Sun Mar 21 22:00:32 2010
@@ -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 }'`
Modified: tuscany/sca-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=925909&r1=925908&r2=925909&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Sun Mar 21 22:00:32 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install?rev=925909&r1=925908&r2=925909&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install Sun Mar 21 22:00:32 2010
@@ -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-s
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