Upgrade build scripts to on Ubuntu 10.04.

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

10 files changed, 87 insertions, 34 deletions

diff --git a/sca-cpp/trunk/INSTALL b/sca-cpp/trunk/INSTALL
index d2e642f23c..40f4430e5a 100644
--- a/sca-cpp/trunk/INSTALL
+++ b/sca-cpp/trunk/INSTALL
@@ -1,16 +1,16 @@
 Apache Tuscany SCA Runtime
 ==========================
 
-Automated installation on Ubuntu 9.10
-=====================================
+Automated installation on Ubuntu 10.04
+======================================
 
-Tuscany provides two automated install scripts for Ubuntu 9.10. You can start
-with a fresh Ubuntu Server 9.10 system and these scripts will take care of all
-the download, build and installation steps for you.
+Tuscany provides two automated install scripts for Ubuntu. You can start with
+a fresh Ubuntu Server 10.04 system and these scripts will take care of all the
+download, build and installation steps for you.
 
 ubuntu/ubuntu-install:
 Minimum build and installation using dependencies (Apache HTTPD server,
-Memcached etc) from your Ubuntu 9.10 system.
+Memcached etc) from your Ubuntu 10.04 system.
 
 ubuntu/ubuntu-install-all:
 Complete build and installation with most dependencies built from source.
@@ -28,7 +28,7 @@ chmod +x ./ubuntu-install
 The installation script will display each command as it's executed.
 
 That's all you need to do to build and install the Tuscany SCA runtime on
-Ubuntu 9.10.
+Ubuntu 10.04.
 
 For manual build and install steps on other systems or if you need to customize
 your installation, read on...
@@ -50,7 +50,7 @@ The GCC 4.5 compiler may not yet be included in your Linux distribution.
 GCC 4.5 Ubuntu / Debian packages can be downloaded from:
 http://ftp.debian.org/debian/pool/main/g/gcc-4.5/
 
-To download and setup GCC 4.5 on Ubuntu 9.10, run this script:
+To download and setup GCC 4.5 on Ubuntu 10.04, run this script:
 http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5
 
 
@@ -171,12 +171,12 @@ in the configure help:
 ./configure --help
 
 
-Here's an example configuration, tested on Ubuntu 9.10, with the system
+Here's an example configuration, tested on Ubuntu 10.04, with the system
 dependencies installed in the standard system directories and some of the
 dependencies installed under $HOME:
 
 ./configure --prefix=$HOME/tuscany-sca-cpp-bin \
---with-apr=$HOME/httpd-2.2.13-bin --with-httpd=$HOME/httpd-2.2.13-bin \
+--with-apr=$HOME/httpd-2.2.16-bin --with-httpd=$HOME/httpd-2.2.16-bin \
 --with-memcached=$HOME/memcached-1.4.4-bin \
 --with-tinycdb=$HOME/tinycdb-0.77-bin \
 --with-curl=$HOME/curl-7.19.5-bin --with-libxml2=/usr \
@@ -197,6 +197,7 @@ dependencies installed under $HOME:
 --enable-log --with-thrift=$HOME/thrift-0.2.0-bin \
 --with-scribe=$HOME/scribe-2.2-bin \
 --enable-openid --with-mod-auth-openid=$HOME/mod-auth-openid-bin \
+--enable-oauth \
 --enable-maintainer-mode
 
 
diff --git a/sca-cpp/trunk/README b/sca-cpp/trunk/README
index f79c296895..8e02113d30 100644
--- a/sca-cpp/trunk/README
+++ b/sca-cpp/trunk/README
@@ -6,7 +6,8 @@ in C++ and integrated with the Apache HTTPD server.
 
 It supports SCA components written in C++ and Python. Experimental support
 for other programming languages is under construction. SCA bindings are
-available for the JSON-RPC and ATOMPub protocols.
+available for the JSON-RPC, ATOMPub and RSS protocols. User authentication
+is supported using OpenID and OAuth.
 
 Several useful SCA components are provided on top of the SCA runtime, which
 can be used to help assemble distributed SCA composite applications:
@@ -14,9 +15,9 @@ can be used to help assemble distributed SCA composite applications:
 Cache: Key/value memory cache, using Memcached;
 Chat: XMPP chat, using Apache Vysper and Libstrophe;
 Log: distributed logger, using Facebook Scribe.
+Nosqldb: Key/value 'NoSQL' persistent store, using TinyCDB;
 Queue: AMQP queuing, using Apache Qpid/C;
 Sqldb: SQL database, using PostgreSQL;
-Store: Key/value persistent store, using TinyCDB;
 Webservice: Web service gateway, using Apache Axis2/C;
 
 These components present a simple ATOMPub REST interface, allowing you to send
@@ -55,24 +56,35 @@ Here's a rough guide to the Tuscany SCA source tree:
  |   |
  |   |-- modules              Modules that plug into the runtime
  |   |   |-- atom             AtomPub encoding
- |   |   |-- json             JSON-RPC encoding
  |   |   |-- http             HTTP protocol
  |   |   |-- java             Support for Java components
+ |   |   |-- json             JSON-RPC encoding
+ |   |   |-- oauth            OAuth authentication
+ |   |   |-- openid           OpenID authentication
  |   |   |-- python           Support for Python components
  |   |   |-- scheme           Support for Scheme components
  |   |   |-- server           Apache HTTPD server integration
  |   |   |-- wsgi             Python WSGI server integration
  |   |
  |   |-- components           Useful SCA components
- |   |   |-- cache            Key/value memory cache
+ |   |   |-- cache            Memcached key/value cache
  |   |   |-- chat             XMPP chat
- |   |   |-- log              Logger
+ |   |   |-- log              Scribe logger
+ |   |   |-- nosqldb          TinyCDB NoSQL database
  |   |   |-- queue            AMQP message queue
- |   |   |-- sqldb            SQL database
- |   |   |-- store            Key/value persistent store
- |   |   |-- webservice       Web service gateway
+ |   |   |-- sqldb            PostgreSQL database
+ |   |   |-- webservice       Axis2 Web service gateway
  |   |
  |   |-- samples              Sample Applications
+ |   |   |-- store-cluster    Online store on a proxy + server + db cluster
+ |   |   |-- store-cpp        Online store written in C++
+ |   |   |-- store-gae        Online store written in Python, working on GAE
+ |   |   |-- store-java       Online store written in Java
+ |   |   |-- store-nosql      Online store using a NoSQL database
+ |   |   |-- store-python     Online store written in Python
+ |   |   |-- store-scheme     Online store written in Scheme
+ |   |   |-- store-sql        Online store using an SQL database
+ |   |   |-- store-vhost      Online store on virtual hosts
  |   |
  |   |-- ubuntu               Automated install on Ubuntu 9.10
  |
diff --git a/sca-cpp/trunk/components/cache/Makefile.am b/sca-cpp/trunk/components/cache/Makefile.am
index 96fb476fef..03e63f12ed 100644
--- a/sca-cpp/trunk/components/cache/Makefile.am
+++ b/sca-cpp/trunk/components/cache/Makefile.am
@@ -28,14 +28,13 @@ memcached.prefix: $(top_builddir)/config.status
 EXTRA_DIST = memcache.composite
 
 comp_LTLIBRARIES = libmemcache.la libfrontcache.la
+noinst_DATA = libmemcache.so libfrontcache.so
 
 libmemcache_la_SOURCES = memcache.cpp
-noinst_DATA = libmemcache.so
 libmemcache.so:
 	ln -s .libs/libmemcache.so
 
 libfrontcache_la_SOURCES = frontcache.cpp
-noinst_DATA = libfrontcache.so
 libfrontcache.so:
 	ln -s .libs/libfrontcache.so
 
diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac
index 6f69a60e7b..bb57b49b20 100644
--- a/sca-cpp/trunk/configure.ac
+++ b/sca-cpp/trunk/configure.ac
@@ -229,13 +229,19 @@ xulrunner=`ls /usr/include | grep "xulrunner" | tail -1`
 if test "$xulrunner" = ""; then
   xulrunner="xulrunner-1.9.1.8"
 fi
+xulunstable=`ls /usr/include/$xulrunner | grep "unstable"`
+if test "$xulunstable" = ""; then
+  xulinclude="$xulrunner"
+else
+  xulinclude="$xulrunner/unstable"
+fi
 AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH], [path to installed SpiderMonkey include dir
-             [default=/usr/include/$xulrunner/unstable]])], [
+             [default=/usr/include/$xulinclude]])], [
   JS_INCLUDE="${withval}"
   AC_MSG_RESULT("${withval}")
 ], [
-  JS_INCLUDE="/usr/include/$xulrunner/unstable"
-  AC_MSG_RESULT(/usr/include/$xulrunner/unstable)
+  JS_INCLUDE="/usr/include/$xulinclude"
+  AC_MSG_RESULT(/usr/include/$xulinclude)
 ])
 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]])], [
diff --git a/sca-cpp/trunk/modules/wsgi/gae-start b/sca-cpp/trunk/modules/wsgi/gae-start
index 69882750aa..a3ee8765cb 100755
--- a/sca-cpp/trunk/modules/wsgi/gae-start
+++ b/sca-cpp/trunk/modules/wsgi/gae-start
@@ -25,5 +25,5 @@ port=$2
 python_prefix=`cat $here/../python/python.prefix`
 gae_prefix=`cat $here/gae.prefix`
 cd $root
-$python_prefix/bin/python $gae_prefix/dev_appserver.py -p $port $root &
+$python_prefix/bin/python $gae_prefix/dev_appserver.py -a 0.0.0.0 -p $port $root &
 
diff --git a/sca-cpp/trunk/modules/wsgi/gae-stop b/sca-cpp/trunk/modules/wsgi/gae-stop
index 64e7031058..69de7f0c2b 100755
--- a/sca-cpp/trunk/modules/wsgi/gae-stop
+++ b/sca-cpp/trunk/modules/wsgi/gae-stop
@@ -24,6 +24,6 @@ port=$2
 
 python_prefix=`cat $here/../python/python.prefix`
 gae_prefix=`cat $here/gae.prefix`
-py="$python_prefix/bin/python $gae_prefix/dev_appserver.py -p $port $root"
+py="$python_prefix/bin/python $gae_prefix/dev_appserver.py -a 0.0.0.0 -p $port $root"
 
 kill `ps -ef | grep -v grep | grep "${py}" | awk '{ print $2 }'`
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
index 303cd940d4..175d860087 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
@@ -25,6 +25,9 @@ set -x
 # First update the system
 sudo apt-get update
 
+# Get the Ubuntu version
+osver=`cat /etc/issue | awk '{ print $2 }'`
+
 # Create install directory
 u=`id -un`
 g=`id -gn`
@@ -57,9 +60,16 @@ sudo apt-get -y install libxml2 libxml2-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
-if [ "$?" != "0" ]; then
-    exit $?
+if [ "$osver" = "9.10" ]; then
+    sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
+    if [ "$?" != "0" ]; then
+        exit $?
+    fi
+else
+    sudo apt-get -y install xulrunner-1.9.2 xulrunner-1.9.2-dev
+    if [ "$?" != "0" ]; then
+        exit $?
+    fi
 fi
 sudo apt-get -y install python-dev
 if [ "$?" != "0" ]; then
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
index 0cb688ea39..26088745e2 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -22,6 +22,9 @@
 # Display commands as they are executed
 set -x
 
+# Get the Ubuntu version
+osver=`cat /etc/issue | awk '{ print $2 }'`
+
 # Build and install in the current directory
 build=`pwd`
 
@@ -58,9 +61,16 @@ if [ "$?" != "0" ]; then
 fi
 
 # Install TraceMonkey
-sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
-if [ "$?" != "0" ]; then
-    exit $?
+if [ "$osver" = "9.10" ]; then
+    sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
+    if [ "$?" != "0" ]; then
+        exit $?
+    fi
+else
+    sudo apt-get -y install xulrunner-1.9.2 xulrunner-1.9.2-dev
+    if [ "$?" != "0" ]; then
+        exit $?
+    fi
 fi
 
 # Install Python
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all
index 9a717781e7..cfeed713a2 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-all
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all
@@ -171,6 +171,7 @@ cd $build
 
 # Build Libexpat
 wget http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download
+mv download expat-2.0.1.tar.gz
 tar xzf expat-2.0.1.tar.gz
 cd expat-2.0.1
 ./configure --prefix=$build/expat-2.0.1-bin
@@ -262,7 +263,7 @@ fi
 cd $build
 
 # Build Apache Thrift
-sudo apt-get -y install bison flex
+sudo apt-get -y install bison flex python-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
@@ -315,7 +316,7 @@ fi
 cd $build
 
 # Build Tuscany SCA
-sudo apt-get -y install python-dev
+sudo apt-get -y install
 if [ "$?" != "0" ]; then
     exit $?
 fi
diff --git a/sca-cpp/trunk/ubuntu/uec2-start b/sca-cpp/trunk/ubuntu/uec2-start
index 86c47a3c36..a0c1b8b2e2 100755
--- a/sca-cpp/trunk/ubuntu/uec2-start
+++ b/sca-cpp/trunk/ubuntu/uec2-start
@@ -21,9 +21,23 @@ here=`readlink -f $0`; here=`dirname $here`
 $here/uec2-setenv
 
 # Here are the AMIs you can use in the different EC2 regions:
+# Ubuntu 9.10 (instance storage)
 # US east 1 - ami-bb709dd2
 # US west 1 - ami-c32e7f86
 # EU west 1 - ami-2fc2e95b
+#
+# Ubuntu 10.04 (elastic block storage)
+# US east 1 - ami-1234de7b
+# US west 1 - ami-10f3a255
+# EU west 1 - ami-38bf954c
+# AP s.east - ami-2c354b7e
 
-ec2-run-instances "ami-c32e7f86" -k ec2-tuscany-keypair --region us-west-1
+# Here are some of the instance types you can use:
+# t1.micro (elastic block storage only)
+# m1.small (default)
+# m1.large
+
+#ec2-run-instances "ami-c32e7f86" -k ec2-tuscany-keypair --region us-west-1
+#ec2-run-instances "ami-10f3a255" -t t1.micro -k ec2-tuscany-keypair --region us-west-1
+ec2-run-instances "ami-10f3a255" -k ec2-tuscany-keypair --region us-west-1