tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r932833 - in /tuscany/sca-cpp/trunk: ./ modules/wsgi/ test/ test/store-gae/ test/store-gae/htdocs/ test/store-wsgi/ ubuntu/
Date Sun, 11 Apr 2010 03:13:20 GMT
Author: jsdelfino
Date: Sun Apr 11 03:13:15 2010
New Revision: 932833

URL: http://svn.apache.org/viewvc?rev=932833&view=rev
Log:
Add test scripts to test the WSGI integration on the GAE SDK.

Added:
    tuscany/sca-cpp/trunk/modules/wsgi/gae-start
      - copied, changed from r932801, tuscany/sca-cpp/trunk/modules/wsgi/wsgi-start
    tuscany/sca-cpp/trunk/modules/wsgi/gae-stop
      - copied, changed from r932801, tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop
    tuscany/sca-cpp/trunk/modules/wsgi/gae-test
      - copied, changed from r932801, tuscany/sca-cpp/trunk/modules/wsgi/server-test
    tuscany/sca-cpp/trunk/test/store-gae/
    tuscany/sca-cpp/trunk/test/store-gae/Makefile.am
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/Makefile.am
    tuscany/sca-cpp/trunk/test/store-gae/app.yaml
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/app.yaml
    tuscany/sca-cpp/trunk/test/store-gae/currency-converter.py
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/currency-converter.py
    tuscany/sca-cpp/trunk/test/store-gae/domain-backend.composite
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/domain-backend.composite
    tuscany/sca-cpp/trunk/test/store-gae/domain-frontend.composite
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite
    tuscany/sca-cpp/trunk/test/store-gae/domain-single.composite
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/domain-single.composite
    tuscany/sca-cpp/trunk/test/store-gae/domain.composite
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/domain.composite
    tuscany/sca-cpp/trunk/test/store-gae/fruits-catalog.py
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/fruits-catalog.py
    tuscany/sca-cpp/trunk/test/store-gae/gmemcache.py
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/gmemcache.py
    tuscany/sca-cpp/trunk/test/store-gae/htdocs/
    tuscany/sca-cpp/trunk/test/store-gae/htdocs/store.html
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/htdocs/store.html
    tuscany/sca-cpp/trunk/test/store-gae/htdocs/store.js
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/htdocs/store.js
    tuscany/sca-cpp/trunk/test/store-gae/htpasswd.py
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/htpasswd.py
    tuscany/sca-cpp/trunk/test/store-gae/server-test
      - copied, changed from r932801, tuscany/sca-cpp/trunk/modules/wsgi/http-test
    tuscany/sca-cpp/trunk/test/store-gae/shopping-cart.py
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/shopping-cart.py
    tuscany/sca-cpp/trunk/test/store-gae/start   (contents, props changed)
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/Makefile.am
    tuscany/sca-cpp/trunk/test/store-gae/stop   (contents, props changed)
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/Makefile.am
    tuscany/sca-cpp/trunk/test/store-gae/store.py
      - copied, changed from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/store.py
Removed:
    tuscany/sca-cpp/trunk/test/store-wsgi/
Modified:
    tuscany/sca-cpp/trunk/INSTALL
    tuscany/sca-cpp/trunk/configure.ac
    tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am
    tuscany/sca-cpp/trunk/modules/wsgi/http-test
    tuscany/sca-cpp/trunk/modules/wsgi/server-test
    tuscany/sca-cpp/trunk/modules/wsgi/wiring-test
    tuscany/sca-cpp/trunk/modules/wsgi/wsgi-start
    tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop
    tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test
    tuscany/sca-cpp/trunk/test/Makefile.am
    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=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/INSTALL (original)
+++ tuscany/sca-cpp/trunk/INSTALL Sun Apr 11 03:13:15 2010
@@ -81,6 +81,7 @@ libboost-filesystem-1.38.1
 
 Python:
 Python 2.6.4 (http://www.python.org/)
+Google AppEngine 1.3.2 (http://code.google.com/appengine/)
 
 Java:
 a Java 5+ JDK (http://openjdk.java.net/, http://harmony.apache.org/)
@@ -150,6 +151,7 @@ dependencies installed under $HOME:
 --with-js-lib=/usr/lib/xulrunner-1.9.1.8 \
 --enable-threads \
 --enable-python --with-python=/usr \
+--enable-gae --with-gae=$HOME/google_appengine \
 --enable-java --with-java=/usr/lib/jvm/default-java \
 --enable-webservice --with-axis2c=$HOME/axis2c-1.6.0-bin \
 --with-libxml2=$HOME/libxml2-2.7.7-bin \
@@ -206,6 +208,13 @@ cd memcached-1.4.4
 make
 make install
 
+TinyCDB:
+wget http://www.corpit.ru/mjt/tinycdb/tinycdb_0.77.tar.gz
+tar xzf tinycdb_0.77.tar.gz
+cd tinycdb-0.77
+make
+make prefix=$HOME/tinycdb-0.77-bin install
+
 CURL:
 wget http://curl.haxx.se/download/curl-7.19.5.tar.gz
 tar xzf curl-7.19.5.tar.gz
@@ -231,13 +240,6 @@ autoconf2.13
 make
 make install
 
-TinyCDB:
-wget http://www.corpit.ru/mjt/tinycdb/tinycdb_0.77.tar.gz
-tar xzf tinycdb_0.77.tar.gz
-cd tinycdb-0.77
-make
-make prefix=$HOME/tinycdb-0.77-bin install
-
 Apache Axis2/C:
 wget http://www.apache.org/dist/ws/axis2-c/1_6_0/axis2c-src-1.6.0.tar.gz
 tar xzf axis2c-src-1.6.0.tar.gz

Modified: tuscany/sca-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Sun Apr 11 03:13:15 2010
@@ -436,6 +436,38 @@ else
 fi
 AC_SUBST(JAVA_LDFLAGS)
 
+# Configure path to Google AppEngine SDK.
+AC_MSG_CHECKING([for gae])
+AC_ARG_WITH([gae], [AC_HELP_STRING([--with-gae=PATH], [path to installed Google AppEngine
1.3.2 [default=$HOME/google_appengine]])], [
+  GAE_PREFIX="${withval}"
+  AC_MSG_RESULT("${withval}")
+], [
+  GAE_PREFIX="$HOME/google_appengine"
+  AC_MSG_RESULT($HOME/google_appengine)
+])
+AC_SUBST(GAE_PREFIX)
+
+# Enable support for Google AppEngine.
+AC_MSG_CHECKING([whether to enable Google AppEngine support])
+AC_ARG_ENABLE(gae, [AS_HELP_STRING([--enable-gae], [enable Google AppEngine support [default=no]])],
+[ case "${enableval}" in
+  no)
+    AC_MSG_RESULT(no)
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    want_gae=true
+    ;;
+  esac ],
+[ AC_MSG_RESULT(no)])
+if test "${want_gae}" = "true"; then
+  AM_CONDITIONAL([WANT_GAE], true)
+  AC_DEFINE([WANT_GAE], 1, [enable Google AppEngine support])
+else
+  AM_CONDITIONAL([WANT_GAE], false)
+fi
+
+# Configure path to Java includes and lib.
 # Configure path to Apache Axis2C includes and lib.
 AC_MSG_CHECKING([for axis2c])
 AC_ARG_WITH([axis2c], [AC_HELP_STRING([--with-axis2c=PATH], [path to installed Apache Axis2C
[default=/usr/local/axis2c]])], [
@@ -664,7 +696,7 @@ AC_CONFIG_FILES([Makefile
                  test/store-cpp/Makefile
                  test/store-python/Makefile
                  test/store-java/Makefile
-                 test/store-wsgi/Makefile
+                 test/store-gae/Makefile
                  test/store-sql/Makefile
                  doc/Makefile
                  doc/Doxyfile

Modified: tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/Makefile.am Sun Apr 11 03:13:15 2010
@@ -33,10 +33,20 @@ target.stamp: app.yaml *.py *.composite 
 clean-local:
 	rm -rf target.stamp target
 
+prefix_DATA = gae.prefix
+prefixdir=$(prefix)/modules/wsgi
+gae.prefix: $(top_builddir)/config.status
+	echo ${GAE_PREFIX} >gae.prefix
+
 client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
 noinst_PROGRAMS = client-test
+
+if WANT_GAE
+TESTS = util-test wsgi-test wiring-test http-test server-test gae-test
+else
 TESTS = util-test wsgi-test wiring-test http-test server-test
+endif
 
 endif

Copied: tuscany/sca-cpp/trunk/modules/wsgi/gae-start (from r932801, tuscany/sca-cpp/trunk/modules/wsgi/wsgi-start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/gae-start?p2=tuscany/sca-cpp/trunk/modules/wsgi/gae-start&p1=tuscany/sca-cpp/trunk/modules/wsgi/wsgi-start&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/wsgi-start (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/gae-start Sun Apr 11 03:13:15 2010
@@ -17,10 +17,13 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Start WSGI server
+# Start Google AppEngine server
 here=`readlink -f $0`; here=`dirname $here`
-port=$1
+root=`readlink -f $1`
+port=$2
 
 python_prefix=`cat $here/../python/python.prefix`
-$python_prefix/bin/python composite.py $port &
+gae_prefix=`cat $here/gae.prefix`
+cd $root
+$python_prefix/bin/python $gae_prefix/dev_appserver.py -p $port $root &
 

Copied: tuscany/sca-cpp/trunk/modules/wsgi/gae-stop (from r932801, tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/gae-stop?p2=tuscany/sca-cpp/trunk/modules/wsgi/gae-stop&p1=tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/gae-stop Sun Apr 11 03:13:15 2010
@@ -17,11 +17,13 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Stop WSGI server
+# Stop Google AppEngine server
 here=`readlink -f $0`; here=`dirname $here`
-port=$1
+root=`readlink -f $1`
+port=$2
 
 python_prefix=`cat $here/../python/python.prefix`
-py="$python_prefix/bin/python composite.py $port"
+gae_prefix=`cat $here/gae.prefix`
+py="$python_prefix/bin/python $gae_prefix/dev_appserver.py -p $port $root"
 
 kill `ps -ef | grep -v grep | grep "${py}" | awk '{ print $2 }'`

Copied: tuscany/sca-cpp/trunk/modules/wsgi/gae-test (from r932801, tuscany/sca-cpp/trunk/modules/wsgi/server-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/gae-test?p2=tuscany/sca-cpp/trunk/modules/wsgi/gae-test&p1=tuscany/sca-cpp/trunk/modules/wsgi/server-test&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/server-test (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/gae-test Sun Apr 11 03:13:15 2010
@@ -18,7 +18,7 @@
 #  under the License.
 
 # Setup
-./wsgi-start 8090 2>/dev/null
+./gae-start target 8090 2>/dev/null
 sleep 2
 
 # Test
@@ -26,5 +26,5 @@ sleep 2
 rc=$?
 
 # Cleanup
-./wsgi-stop 8090
+./gae-stop target 8090
 return $rc

Modified: tuscany/sca-cpp/trunk/modules/wsgi/http-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/http-test?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/http-test (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/http-test Sun Apr 11 03:13:15 2010
@@ -24,7 +24,7 @@ fi
 
 # Setup
 mkdir -p tmp
-./wsgi-start 8090 2>/dev/null
+./wsgi-start target 8090 2>/dev/null
 sleep 2
 
 # Test JSON-RPC
@@ -34,6 +34,6 @@ $python_prefix/bin/python http-test.py
 rc=$?
 
 # Cleanup
-./wsgi-stop 8090
+./wsgi-stop target 8090
 sleep 2
 return $rc

Modified: tuscany/sca-cpp/trunk/modules/wsgi/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/server-test?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/server-test (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/server-test Sun Apr 11 03:13:15 2010
@@ -18,7 +18,7 @@
 #  under the License.
 
 # Setup
-./wsgi-start 8090 2>/dev/null
+./wsgi-start target 8090 2>/dev/null
 sleep 2
 
 # Test
@@ -26,5 +26,5 @@ sleep 2
 rc=$?
 
 # Cleanup
-./wsgi-stop 8090
+./wsgi-stop target 8090
 return $rc

Modified: tuscany/sca-cpp/trunk/modules/wsgi/wiring-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/wiring-test?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/wiring-test (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/wiring-test Sun Apr 11 03:13:15 2010
@@ -27,7 +27,7 @@ fi
 
 # Setup
 mkdir -p tmp
-./wsgi-start 8090 2>/dev/null
+./wsgi-start target 8090 2>/dev/null
 sleep 2
 
 # Test HTTP GET
@@ -67,7 +67,7 @@ if [ "$rc" = "0" ]; then
 fi
 
 # Cleanup
-./wsgi-stop 8090
+./wsgi-stop target 8090
 sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"

Modified: tuscany/sca-cpp/trunk/modules/wsgi/wsgi-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/wsgi-start?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/wsgi-start (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/wsgi-start Sun Apr 11 03:13:15 2010
@@ -19,8 +19,10 @@
 
 # Start WSGI server
 here=`readlink -f $0`; here=`dirname $here`
-port=$1
+root=`readlink -f $1`
+port=$2
 
 python_prefix=`cat $here/../python/python.prefix`
+cd $root
 $python_prefix/bin/python composite.py $port &
 

Modified: tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/wsgi-stop Sun Apr 11 03:13:15 2010
@@ -19,7 +19,8 @@
 
 # Stop WSGI server
 here=`readlink -f $0`; here=`dirname $here`
-port=$1
+root=`readlink -f $1`
+port=$2
 
 python_prefix=`cat $here/../python/python.prefix`
 py="$python_prefix/bin/python composite.py $port"

Modified: tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test Sun Apr 11 03:13:15 2010
@@ -23,7 +23,7 @@ curl_prefix=`cat $here/../http/curl.pref
 
 # Setup
 mkdir -p tmp
-./wsgi-start 8090 2>/dev/null
+./wsgi-start target 8090 2>/dev/null
 sleep 2
 
 # Test HTTP GET
@@ -63,7 +63,7 @@ if [ "$rc" = "0" ]; then
 fi
 
 # Cleanup
-./wsgi-stop 8090
+./wsgi-stop target 8090
 sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"

Modified: tuscany/sca-cpp/trunk/test/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/Makefile.am?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/Makefile.am Sun Apr 11 03:13:15 2010
@@ -15,5 +15,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-SUBDIRS = store-scheme store-cpp store-python store-java store-wsgi store-sql
+SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql
 

Copied: tuscany/sca-cpp/trunk/test/store-gae/Makefile.am (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/Makefile.am?p2=tuscany/sca-cpp/trunk/test/store-gae/Makefile.am&p1=tuscany/sca-cpp/trunk/test/store-wsgi/Makefile.am&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-wsgi/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-gae/Makefile.am Sun Apr 11 03:13:15 2010
@@ -16,6 +16,7 @@
 #  under the License.
 
 if WANT_PYTHON
+if WANT_GAE
 
 noinst_DATA = target.stamp 
 
@@ -28,6 +29,7 @@ target.stamp: app.yaml *.py *.composite 
 clean-local:
 	rm -rf target.stamp target
 
-#TESTS = server-test
+TESTS = server-test
 
 endif
+endif

Copied: tuscany/sca-cpp/trunk/test/store-gae/app.yaml (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/app.yaml)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/app.yaml?p2=tuscany/sca-cpp/trunk/test/store-gae/app.yaml&p1=tuscany/sca-cpp/trunk/test/store-wsgi/app.yaml&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/currency-converter.py (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/currency-converter.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/currency-converter.py?p2=tuscany/sca-cpp/trunk/test/store-gae/currency-converter.py&p1=tuscany/sca-cpp/trunk/test/store-wsgi/currency-converter.py&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/domain-backend.composite (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/domain-backend.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/domain-backend.composite?p2=tuscany/sca-cpp/trunk/test/store-gae/domain-backend.composite&p1=tuscany/sca-cpp/trunk/test/store-wsgi/domain-backend.composite&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/domain-frontend.composite (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/domain-frontend.composite?p2=tuscany/sca-cpp/trunk/test/store-gae/domain-frontend.composite&p1=tuscany/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/domain-single.composite (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/domain-single.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/domain-single.composite?p2=tuscany/sca-cpp/trunk/test/store-gae/domain-single.composite&p1=tuscany/sca-cpp/trunk/test/store-wsgi/domain-single.composite&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/domain.composite (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/domain.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/domain.composite?p2=tuscany/sca-cpp/trunk/test/store-gae/domain.composite&p1=tuscany/sca-cpp/trunk/test/store-wsgi/domain.composite&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/fruits-catalog.py (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/fruits-catalog.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/fruits-catalog.py?p2=tuscany/sca-cpp/trunk/test/store-gae/fruits-catalog.py&p1=tuscany/sca-cpp/trunk/test/store-wsgi/fruits-catalog.py&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/gmemcache.py (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/gmemcache.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/gmemcache.py?p2=tuscany/sca-cpp/trunk/test/store-gae/gmemcache.py&p1=tuscany/sca-cpp/trunk/test/store-wsgi/gmemcache.py&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-wsgi/gmemcache.py (original)
+++ tuscany/sca-cpp/trunk/test/store-gae/gmemcache.py Sun Apr 11 03:13:15 2010
@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Memcached based cache implementation
+# Google AppEngine Memcached based cache implementation
 import uuid
 from google.appengine.api import memcache
 

Copied: tuscany/sca-cpp/trunk/test/store-gae/htdocs/store.html (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/htdocs/store.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/htdocs/store.html?p2=tuscany/sca-cpp/trunk/test/store-gae/htdocs/store.html&p1=tuscany/sca-cpp/trunk/test/store-wsgi/htdocs/store.html&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/htdocs/store.js (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/htdocs/store.js)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/htdocs/store.js?p2=tuscany/sca-cpp/trunk/test/store-gae/htdocs/store.js&p1=tuscany/sca-cpp/trunk/test/store-wsgi/htdocs/store.js&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/htpasswd.py (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/htpasswd.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/htpasswd.py?p2=tuscany/sca-cpp/trunk/test/store-gae/htpasswd.py&p1=tuscany/sca-cpp/trunk/test/store-wsgi/htpasswd.py&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/server-test (from r932801, tuscany/sca-cpp/trunk/modules/wsgi/http-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/server-test?p2=tuscany/sca-cpp/trunk/test/store-gae/server-test&p1=tuscany/sca-cpp/trunk/modules/wsgi/http-test&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/http-test (original)
+++ tuscany/sca-cpp/trunk/test/store-gae/server-test Sun Apr 11 03:13:15 2010
@@ -17,23 +17,25 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-uri=$1
-if [ "$uri" = "" ]; then
-    uri="http://localhost:8090"
-fi
+echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
-mkdir -p tmp
-./wsgi-start 8090 2>/dev/null
+./start 2>/dev/null
 sleep 2
 
-# Test JSON-RPC
-here=`readlink -f $0`; here=`dirname $here`
-python_prefix=`cat $here/../python/python.prefix`
-$python_prefix/bin/python http-test.py
+# Test HTTP GET
+mkdir -p tmp
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+diff tmp/store.html htdocs/store.html
 rc=$?
 
 # Cleanup
-./wsgi-stop 8090
+./stop
 sleep 2
+
+if [ "$rc" = "0" ]; then
+    echo "OK"
+fi
 return $rc

Copied: tuscany/sca-cpp/trunk/test/store-gae/shopping-cart.py (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/shopping-cart.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/shopping-cart.py?p2=tuscany/sca-cpp/trunk/test/store-gae/shopping-cart.py&p1=tuscany/sca-cpp/trunk/test/store-wsgi/shopping-cart.py&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/test/store-gae/start (from r932801, tuscany/sca-cpp/trunk/test/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/start?p2=tuscany/sca-cpp/trunk/test/store-gae/start&p1=tuscany/sca-cpp/trunk/test/Makefile.am&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-gae/start Sun Apr 11 03:13:15 2010
@@ -1,3 +1,5 @@
+#!/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
@@ -15,5 +17,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-SUBDIRS = store-scheme store-cpp store-python store-java store-wsgi store-sql
+../../modules/wsgi/gae-start target 8090
 

Propchange: tuscany/sca-cpp/trunk/test/store-gae/start
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-cpp/trunk/test/store-gae/stop (from r932801, tuscany/sca-cpp/trunk/test/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/stop?p2=tuscany/sca-cpp/trunk/test/store-gae/stop&p1=tuscany/sca-cpp/trunk/test/Makefile.am&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/test/store-gae/stop Sun Apr 11 03:13:15 2010
@@ -1,3 +1,5 @@
+#!/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
@@ -15,5 +17,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-SUBDIRS = store-scheme store-cpp store-python store-java store-wsgi store-sql
+../../modules/wsgi/gae-stop target 8090
 

Propchange: tuscany/sca-cpp/trunk/test/store-gae/stop
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-cpp/trunk/test/store-gae/store.py (from r932801, tuscany/sca-cpp/trunk/test/store-wsgi/store.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-gae/store.py?p2=tuscany/sca-cpp/trunk/test/store-gae/store.py&p1=tuscany/sca-cpp/trunk/test/store-wsgi/store.py&r1=932801&r2=932833&rev=932833&view=diff
==============================================================================
    (empty)

Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install?rev=932833&r1=932832&r2=932833&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install Sun Apr 11 03:13:15 2010
@@ -114,6 +114,10 @@ if [ "$?" != "0" ]; then
 fi
 cd $build
 
+# Install Google AppEngine SDK
+wget http://googleappengine.googlecode.com/files/google_appengine_1.3.2.zip
+unzip google_appengine_1.3.2.zip
+
 # Build Apache Axis2/C
 sudo apt-get -y install pkg-config
 if [ "$?" != "0" ]; then
@@ -211,7 +215,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-curl=$build/curl-7.19.5-bin --with-apr=$build/httpd-2.2.15-bin
--with-httpd=$build/httpd-2.2.15-bin --with-memcached=$build/memcached-1.4.4-bin --with-tinycdb=$build/tinycdb-0.77-bin
--with-js-include=$build/tracemonkey-bin/include/js --with-js-lib=$build/tracemonkey-bin/lib
--enable-threads --enable-python --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice
--with-libxml2=$build/libxml2-2.7.7-bin --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue
--with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe-bin --with-vysper=$build/vysper-0.5
--enable-sqldb --with-pgsql=$build/postgresql-9.0-bin
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/httpd-2.2.15-bin
--with-httpd=$build/httpd-2.2.15-bin --with-memcached=$build/memcached-1.4.4-bin --with-tinycdb=$build/tinycdb-0.77-bin
--with-js-include=$build/tracemonkey-bin/include/js --with-js-lib=$build/tracemonkey-bin/lib
--enable-threads --enable-python --enable-gae --with-gae=$build/google_appengine --enable-java
--with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-libxml2=$build/libxml2-2.7.7-bin
--with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat
--with-libstrophe=$build/libstrophe-bin --with-vysper=$build/vysper-0.5 --enable-sqldb --with-pgsql=$build/postgresql-9.0-bin
 make
 make install
 if [ "$?" != "0" ]; then
@@ -220,5 +224,5 @@ fi
 cd $build
 
 # Create bin archive
-tar czf tuscany-sca-cpp-1.0.0-SNAPSHOT.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin axis2c-1.6.0-bin
libxml2-2.7.7-bin curl-7.19.5-bin httpd-2.2.15-bin tracemonkey-bin libstrophe-bin memcached-1.4.4-bin
tinycdb-0.77-bin qpidc-0.6-bin vysper-0.5 postgresql-9.0-bin
+tar czf tuscany-sca-cpp-1.0.0-SNAPSHOT.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin axis2c-1.6.0-bin
libxml2-2.7.7-bin curl-7.19.5-bin httpd-2.2.15-bin tracemonkey-bin google_appengine libstrophe-bin
memcached-1.4.4-bin tinycdb-0.77-bin qpidc-0.6-bin vysper-0.5 postgresql-9.0-bin
 



Mime
View raw message