summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/ubuntu
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-11-14 09:27:28 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-11-14 09:27:28 +0000
commit2c7009b5200ff5b7462b56239c909daef8ed7910 (patch)
tree40b116d31a3c7f56540d12ed05a5b80f3e7c4ef3 /sca-cpp/trunk/ubuntu
parentefccdd821b68280ee3b73c8ef5cda121bc27f620 (diff)
Port to Ubuntu server 10.10 64-bit. C++ code fixes required to compile and run on 64-bit. Update INSTALL doc and build scripts. Remove a few obsolete scripts.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1034963 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/ubuntu')
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-bin-all-image45
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-bin-image90
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-dev-all-image2
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-dev-image41
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-gcc-4.552
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-install109
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-install-all53
-rwxr-xr-xsca-cpp/trunk/ubuntu/uec2-bin-image23
-rwxr-xr-xsca-cpp/trunk/ubuntu/uec2-dev-image23
9 files changed, 50 insertions, 388 deletions
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
index 85a6f382ad..a3da2132e4 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
@@ -17,7 +17,7 @@
# 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.
+# 10.10 64-bit image.
# Display commands as they are executed
set -x
@@ -33,47 +33,58 @@ sudo chown $u /mnt/tuscany
sudo chgrp $g /mnt/tuscany
cd /mnt/tuscany
-# Install system tools and libraries
+# Install core dev tools
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
+# Required by Apache HTTP server
+sudo apt-get -y install libssl-dev libpcre3-dev
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install python-dev
+# Required by Memcached
+sudo apt-get -y install libevent-dev
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install libpcre3-dev
-if [ "$?" != "0" ]; then
- exit $?
-fi
-sudo apt-get -y install libevent-dev
+# Required by TraceMonkey
+sudo apt-get -y install autoconf2.13 zip
if [ "$?" != "0" ]; then
exit $?
fi
+# Required by Apache Axis2/C
sudo apt-get -y install pkg-config
if [ "$?" != "0" ]; then
exit $?
fi
+# Required by Apache Qpid/C++
sudo apt-get -y install libboost-dev libboost-program-options-dev libboost-filesystem-dev uuid-dev
if [ "$?" != "0" ]; then
exit $?
fi
+# Required by Apache Vysper
sudo apt-get -y install openjdk-6-jdk
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install bison flex
+# Require by HTML Tidy
+sudo apt-get -y install cvs
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+# Required by PostgreSQL
+sudo apt-get -y install libreadline-dev
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+# Required by Apache Thrift
+sudo apt-get -y install bison flex python-dev
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+# Required by Facebook Scribe
+sudo apt-get -y install gawk
if [ "$?" != "0" ]; then
exit $?
fi
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
deleted file mode 100755
index 175d860087..0000000000
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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 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
-
-# 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`
-sudo mkdir -p /mnt/tuscany
-sudo chown $u /mnt/tuscany
-sudo chgrp $g /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 apache2 apache2-utils apache2-prefork-dev libaprutil1-dev libapr1-dev
-if [ "$?" != "0" ]; then
- exit $?
-fi
-sudo apt-get -y install curl libcurl4-openssl-dev
-if [ "$?" != "0" ]; then
- exit $?
-fi
-sudo apt-get -y install libxml2 libxml2-dev
-if [ "$?" != "0" ]; then
- exit $?
-fi
-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
- exit $?
-fi
-sudo apt-get -y install memcached
-if [ "$?" != "0" ]; then
- exit $?
-fi
-sudo apt-get -y install tinycdb libcdb-dev
-if [ "$?" != "0" ]; then
- exit $?
-fi
-
-# Download and install the Tuscany runtime
-wget http://people.apache.org/~jsdelfino/tuscany/test/tuscany-sca-cpp-1.0.tar.gz
-tar xzf tuscany-sca-cpp-1.0.tar.gz
-
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image b/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
index 6fa4656c29..28d55e697e 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
@@ -17,7 +17,7 @@
# 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.
+# Server 10.10 64-bit image.
# Display commands as they are executed
set -x
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-dev-image b/sca-cpp/trunk/ubuntu/ubuntu-dev-image
deleted file mode 100755
index ed40aa6b9c..0000000000
--- a/sca-cpp/trunk/ubuntu/ubuntu-dev-image
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-u=`id -un`
-g=`id -gn`
-sudo mkdir -p /mnt/tuscany
-sudo chown $u /mnt/tuscany
-sudo chgrp $g /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
-chmod +x ./ubuntu-install
-./ubuntu-install
-
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5 b/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5
deleted file mode 100755
index 8464382d0a..0000000000
--- a/sca-cpp/trunk/ubuntu/ubuntu-gcc-4.5
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 GCC 4.5, useful if you want to use it and it's not already included
-# in your Linux distribution
-
-# Display commands as they are executed
-set -x
-
-# Install GCC 4.5 binaries
-mkdir -p gcc-4.5
-cd gcc-4.5
-sudo apt-get -y install libcloog-ppl0 libelfg0 libgmpxx4ldbl libmpc2 libppl-c2 libppl7
-if [ "$?" != "0" ]; then
- exit $?
-fi
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/cpp-4.5_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/fixincludes_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/g++-4.5_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/gcc-4.5-base_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gcc1_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64gomp1_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64mudflap0_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/lib64stdc++6_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgcc1_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libgomp1_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0-4.5-dev_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libmudflap0_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/g/gcc-4.5/libstdc++6-4.5-dev_4.5.0-2_i386.deb
-wget http://ftp.debian.org/debian/pool/main/b/binutils/binutils_2.20.51.20100418-1_i386.deb
-sudo dpkg -i *.deb
-if [ "$?" != "0" ]; then
- exit $?
-fi
-cd ..
-
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
deleted file mode 100755
index 26088745e2..0000000000
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.
-
-# Build a minimal distribution including only the core runtime, support for
-# Python and C++ components, memcached and tinycdb on a fresh Ubuntu Server
-# 9.10 system.
-
-# 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`
-
-# Install core dev tools
-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
-
-# Install Apache HTTP server
-sudo apt-get -y install libssl-dev apache2 apache2-utils apache2-prefork-dev libaprutil1-dev libapr1-dev
-if [ "$?" != "0" ]; then
- exit $?
-fi
-
-# Install Libcurl
-sudo apt-get -y install curl libcurl4-openssl-dev
-if [ "$?" != "0" ]; then
- exit $?
-fi
-
-# Build Libxml2
-sudo apt-get -y install libxml2 libxml2-dev
-if [ "$?" != "0" ]; then
- exit $?
-fi
-
-# Install TraceMonkey
-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
-sudo apt-get -y install python-dev
-if [ "$?" != "0" ]; then
- exit $?
-fi
-
-# 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
-
-# Build Tuscany SCA
-git clone git://git.apache.org/tuscany-sca-cpp.git
-cd tuscany-sca-cpp
-cp etc/git-exclude .git/info/exclude
-./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin
-make
-make install
-if [ "$?" != "0" ]; then
- exit $?
-fi
-cd $build
-
-# Create bin archive
-tar czf tuscany-sca-cpp-1.0.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin
-
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all
index 5231c42d21..dd730a6d03 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-all
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all
@@ -17,7 +17,7 @@
# 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.
+# 10.10 64-bit system.
# Display commands as they are executed
set -x
@@ -31,23 +31,28 @@ 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
+# 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
+make
+make install
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+cd $build
# Build Apache HTTP server
-sudo apt-get -y install libssl-dev
+sudo apt-get -y install libssl-dev libpcre3-dev
if [ "$?" != "0" ]; then
exit $?
fi
wget http://archive.apache.org/dist/httpd/httpd-2.3.8.tar.gz
tar xzf httpd-2.3.8.tar.gz
cd httpd-2.3.8
-./configure --enable-ssl --enable-proxy --enable-usertrack --enable-mods-shared=most --with-included-apr --with-mpm=prefork --prefix=$build/httpd-2.3.8-bin
+./configure --enable-ssl --enable-proxy --enable-usertrack --enable-mods-shared=most --with-included-apr --with-expat=$build/expat-2.0.1-bin --with-mpm=prefork --prefix=$build/httpd-2.3.8-bin
make
make install
if [ "$?" != "0" ]; then
@@ -124,8 +129,8 @@ fi
cd $build
# Install Google AppEngine SDK
-wget http://googleappengine.googlecode.com/files/google_appengine_1.3.7.zip
-unzip google_appengine_1.3.7.zip
+wget http://googleappengine.googlecode.com/files/google_appengine_1.3.8.zip
+unzip google_appengine_1.3.8.zip
# Build Apache Axis2/C
sudo apt-get -y install pkg-config
@@ -156,8 +161,6 @@ sudo apt-get -y install libboost-dev libboost-program-options-dev libboost-files
if [ "$?" != "0" ]; then
exit $?
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
wget 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
@@ -169,19 +172,6 @@ if [ "$?" != "0" ]; then
fi
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
-make
-make install
-if [ "$?" != "0" ]; then
- exit $?
-fi
-cd $build
-
# Build Libstrophe
git clone git://github.com/jsdelfino/libstrophe.git
cd libstrophe
@@ -234,7 +224,6 @@ fi
cd $build
# Build Mod_auth_openid
-sudo apt-get -y install libpcre3-dev
git clone git://github.com/jsdelfino/mod_auth_openid.git
cd mod_auth_openid
./autogen.sh
@@ -304,6 +293,10 @@ cp cpp/lib/libfb303.so $build/thrift-0.2.0-bin/contrib/fb303/lib
cd $build
# Build Facebook Scribe
+sudo apt-get -y install gawk
+if [ "$?" != "0" ]; then
+ exit $?
+fi
wget http://github.com/downloads/facebook/scribe/scribe-2.2.tar.gz
tar xzf scribe-2.2.tar.gz
cd scribe
@@ -328,10 +321,6 @@ fi
cd $build
# Build Tuscany SCA
-sudo apt-get -y install
-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
diff --git a/sca-cpp/trunk/ubuntu/uec2-bin-image b/sca-cpp/trunk/ubuntu/uec2-bin-image
deleted file mode 100755
index f4d738a050..0000000000
--- a/sca-cpp/trunk/ubuntu/uec2-bin-image
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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 Tuscany image on an EC2 instance
-host=$1
-
-# Download and execute Tuscany SCA install script
-ssh -i $HOME/.ec2/ec2-tuscany-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image; chmod 700 ./ubuntu-bin-image; ./ubuntu-bin-image"
-
diff --git a/sca-cpp/trunk/ubuntu/uec2-dev-image b/sca-cpp/trunk/ubuntu/uec2-dev-image
deleted file mode 100755
index 55a0477a34..0000000000
--- a/sca-cpp/trunk/ubuntu/uec2-dev-image
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.
-
-# Build a Tuscany image on an EC2 instance
-host=$1
-
-# Download and execute Tuscany SCA install script
-ssh -i $HOME/.ec2/ec2-tuscany-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image; chmod 700 ./ubuntu-dev-image; ./ubuntu-dev-image"
-