6 files changed, 161 insertions, 32 deletions
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
new file mode 100755
index 0000000000..3e9e959b55
--- /dev/null
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
@@ -0,0 +1,78 @@
+#  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.
+
+# Install a complete distribution, the required system tools and libraries,
+# the runtime dependencies and the Tuscany SCA runtime on a fresh Ubuntu Server
+# 9.10 image.
+
+# Display commands as they are executed
+set -x
+
+# First update the system
+sudo apt-get update
+
+# Create install directory
+sudo mkdir -p /mnt/tuscany
+sudo chown ubuntu /mnt/tuscany
+sudo chgrp ubuntu /mnt/tuscany
+cd /mnt/tuscany
+
+# Install system tools and libraries
+sudo apt-get -y install wget git-core autoconf automake libtool g++
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+# Uncomment to install GCC 4.5
+#wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5
+#chmod +x ./ubuntu-gcc-4.5
+#./ubuntu-gcc-4.5
+#if [ "$?" != "0" ]; then
+#    exit $?
+#fi
+sudo apt-get -y install libssl-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+sudo apt-get -y install python-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+sudo apt-get -y install libevent-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+sudo apt-get -y install pkg-config
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+sudo apt-get -y install libboost-dev libboost-program-options-dev libboost-filesystem-dev uuid-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+sudo apt-get -y install openjdk-6-jdk
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+sudo apt-get -y install bison flex
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+
+# Download and install the Tuscany runtime
+wget http://people.apache.org/~jsdelfino/tuscany/test/tuscany-sca-cpp-all-1.0.tar.gz
+tar xzf tuscany-sca-cpp-1.0.tar.gz
+
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
index 523fcaff34..7a8e6e166c 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
@@ -15,8 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 image.
+# Install a minimal distribution including only the core runtime, support for
+# Python and C++ components, memcached and tinycdb on a fresh Ubuntu Server
+# 9.10 image.
 
 # Display commands as they are executed
 set -x
@@ -42,27 +43,31 @@ fi
 #if [ "$?" != "0" ]; then
 #    exit $?
 #fi
-sudo apt-get -y install libssl-dev
+sudo apt-get -y install libssl-dev apache2 apache2-utils apache2-prefork-dev libaprutil1-dev libapr1-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-sudo apt-get -y install libevent-dev
+sudo apt-get -y install curl libcurl4-openssl-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-sudo apt-get -y install pkg-config
+sudo apt-get -y install libxml2 libxml2-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-sudo apt-get -y install libboost-dev libboost-program-options-dev libboost-filesystem-dev uuid-dev
+sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-sudo apt-get -y install openjdk-6-jdk
+sudo apt-get -y install python-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-sudo apt-get -y install bison flex
+sudo apt-get -y install memcached
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+sudo apt-get -y install tinycdb libcdb-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image b/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
new file mode 100755
index 0000000000..aed2ec8efe
--- /dev/null
+++ b/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
@@ -0,0 +1,39 @@
+#  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.
+
+# Install a complete distribution, the required system tools and libraries,
+# the runtime dependencies and the Tuscany SCA runtime on a fresh Ubuntu
+# Server 9.10 image.
+
+# Display commands as they are executed
+set -x
+
+# First update the system
+sudo apt-get update
+
+# Create install directory
+sudo mkdir -p /mnt/tuscany
+sudo chown ubuntu /mnt/tuscany
+sudo chgrp ubuntu /mnt/tuscany
+cd /mnt/tuscany
+
+# Download and run install script
+sudo apt-get -y install wget
+wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
+chmod +x ./ubuntu-install-all
+./ubuntu-install-all
+
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-dev-image b/sca-cpp/trunk/ubuntu/ubuntu-dev-image
index 3d3827bc81..183941aae6 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-dev-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-dev-image
@@ -15,8 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 image.
+# Install a complete distribution, the required system tools and libraries,
+# the runtime dependencies and the Tuscany SCA runtime on a fresh Ubuntu
+# Server 9.10 image.
 
 # Display commands as they are executed
 set -x
@@ -32,7 +33,7 @@ cd /mnt/tuscany
 
 # Download and run install script
 sudo apt-get -y install wget
-wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
-chmod +x ./ubuntu-install-all
-./ubuntu-install-all
+wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
+chmod +x ./ubuntu-install
+./ubuntu-install
 
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
index fc8eb32a15..0cb688ea39 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -15,11 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 system.
-
 # Build a minimal distribution including only the core runtime, support for
-# Python and C++ components, memcached and tinycdb.
+# Python and C++ components, memcached and tinycdb on a fresh Ubuntu Server
+# 9.10 system.
 
 # Display commands as they are executed
 set -x
@@ -47,32 +45,38 @@ if [ "$?" != "0" ]; then
     exit $?
 fi
 
-# Install Memcached
-sudo apt-get -y install memcached
+# Install Libcurl
+sudo apt-get -y install curl libcurl4-openssl-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
 
-# Install Tinycdb
-sudo apt-get -y install tinycdb libcdb-dev
+# Build Libxml2
+sudo apt-get -y install libxml2 libxml2-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
 
-# Install Libcurl
-sudo apt-get -y install curl libcurl4-openssl-dev
+# Install TraceMonkey
+sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
 
-# Build Libxml2
-sudo apt-get -y install libxml2 libxml2-dev
+# Install Python
+sudo apt-get -y install python-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
 
-# Install TraceMonkey
-sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev
+# Install Memcached
+sudo apt-get -y install memcached
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+
+# Install Tinycdb
+sudo apt-get -y install tinycdb libcdb-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all
index afa6ff3d28..8d59803dbc 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-all
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all
@@ -15,11 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Install the required system tools and libraries, the runtime dependencies and
-# the Tuscany SCA runtime on a fresh Ubuntu Server 9.10 system.
-
-# Build a complete distribution including the core runtime, all modules and
-# components and dependencies from source.
+# Install a complete distribution, the required system tools and libraries, the
+# runtime dependencies and the Tuscany SCA runtime on a fresh Ubuntu Server
+# 9.10 system.
 
 # Display commands as they are executed
 set -x
@@ -275,6 +273,10 @@ fi
 cd $build
 
 # Build Tuscany SCA
+sudo apt-get -y install python-dev
+if [ "$?" != "0" ]; then
+    exit $?
+fi
 git clone git://git.apache.org/tuscany-sca-cpp.git
 cd tuscany-sca-cpp
 cp etc/git-exclude .git/info/exclude