Fix broken links, update to latest dependencies, and use curl instead of wget to download them.

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

10 files changed, 65 insertions, 67 deletions

diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
index e1f6c048e7..79a2104af0 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
@@ -34,7 +34,7 @@ sudo chgrp $g /mnt/tuscany
 cd /mnt/tuscany
 
 # Install core dev tools
-sudo apt-get -y install wget git-core subversion autoconf pkg-config automake libtool g++ make
+sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make
 if [ "$?" != "0" ]; then
     exit $?
 fi
@@ -85,6 +85,6 @@ if [ "$?" != "0" ]; then
 fi
 
 # Download and install the Tuscany runtime
-wget http://people.apache.org/~jsdelfino/tuscany/test/tuscany-sca-cpp-all-1.0.tar.gz
+curl -OL http://people.apache.org/~jsdelfino/tuscany/test/tuscany-sca-cpp-all-1.0.tar.gz
 tar xzf tuscany-sca-cpp-all-1.0.tar.gz
 
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
index 51e7221bec..664d585021 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
@@ -34,7 +34,7 @@ sudo chgrp $g /mnt/tuscany
 cd /mnt/tuscany
 
 # Install core dev tools
-sudo apt-get -y install wget git-core subversion autoconf pkg-config automake libtool g++ make
+sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make
 if [ "$?" != "0" ]; then
     exit $?
 fi
@@ -70,6 +70,6 @@ if [ "$?" != "0" ]; then
 fi
 
 # Download and install the Tuscany runtime
-wget http://people.apache.org/~jsdelfino/tuscany/test/tuscany-sca-cpp-1.0.tar.gz
+curl -OL 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 f3c73c45fe..9f812f61a1 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image
@@ -34,8 +34,8 @@ 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-all
+sudo apt-get -y install curl
+curl -OL 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 733d912dfb..647e5a2e76 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-dev-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-dev-image
@@ -34,8 +34,8 @@ 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
+sudo apt-get -y install curl
+curl -OL 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 8df8a61955..ea92b05b29 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -26,14 +26,13 @@ set -x
 build=`pwd`
 
 # Install core dev tools
-sudo apt-get -y install wget git-core subversion autoconf pkg-config automake libtool g++ make
+sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make
 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
+curl -L http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download -o 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
@@ -59,7 +58,7 @@ if [ "$?" != "0" ]; then
     exit $?
 fi
 cd $build
-wget http://archive.apache.org/dist/httpd/httpd-2.3.10-alpha.tar.gz
+curl -OL http://archive.apache.org/dist/httpd/httpd-2.3.10-alpha.tar.gz
 tar xzf httpd-2.3.10-alpha.tar.gz
 cd httpd-2.3.10
 ./configure --enable-ssl --enable-proxy --enable-usertrack --enable-cgi --enable-session-crypto --enable-mods-shared=most --enable-mpms-shared="prefork worker event" --with-mpm=prefork --with-apr=$build/apr-1.4.x-bin --with-expat=$build/expat-2.0.1-bin --prefix=$build/httpd-2.3.10-bin
@@ -75,7 +74,7 @@ sudo apt-get -y install libevent-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget http://memcached.googlecode.com/files/memcached-1.4.7.tar.gz
+curl -OL http://memcached.googlecode.com/files/memcached-1.4.7.tar.gz
 tar xzf memcached-1.4.7.tar.gz
 cd memcached-1.4.7
 ./configure --prefix=$build/memcached-1.4.7-bin
@@ -87,7 +86,7 @@ fi
 cd $build
 
 # Build Tinycdb
-wget http://www.corpit.ru/mjt/tinycdb/tinycdb_0.77.tar.gz
+curl -OL http://www.corpit.ru/mjt/tinycdb/tinycdb_0.77.tar.gz
 tar xzf tinycdb_0.77.tar.gz
 cd tinycdb-0.77
 make all shared
@@ -98,7 +97,7 @@ fi
 cd $build
 
 # Build Libcurl
-wget http://curl.haxx.se/download/curl-7.19.5.tar.gz
+curl -OL http://curl.haxx.se/download/curl-7.19.5.tar.gz
 tar xzf curl-7.19.5.tar.gz
 cd curl-7.19.5
 ./configure --prefix=$build/curl-7.19.5-bin
@@ -110,7 +109,7 @@ fi
 cd $build
 
 # Build Libxml2
-wget ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.7.tar.gz
+curl -OL ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.7.tar.gz
 tar xzf libxml2-sources-2.7.7.tar.gz
 cd libxml2-2.7.7
 ./configure --prefix=$build/libxml2-2.7.7-bin
@@ -122,7 +121,7 @@ fi
 cd $build
 
 # Build Mozilla Portable Runtime
-wget http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.8/src/nspr-4.8.8.tar.gz
+curl -OL http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.8/src/nspr-4.8.8.tar.gz
 tar xzf nspr-4.8.8.tar.gz
 cd nspr-4.8.8/mozilla/nsprpub
 ./configure --prefix=$build/nspr-4.8.8-bin --enable-64bit
@@ -138,7 +137,7 @@ sudo apt-get -y install zip unzip
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
+curl -OL http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
 tar xzf js185-1.0.0.tar.gz
 cd js-1.8.5/js/src
 export LD_RUN_PATH=$build/nspr-4.8.8-bin/lib
@@ -205,7 +204,7 @@ fi
 cd $build
 
 # Build Liboauth
-wget http://liboauth.sourceforge.net/pool/liboauth-0.9.1.tar.gz
+curl -OL http://liboauth.sourceforge.net/pool/liboauth-0.9.1.tar.gz
 tar xzf liboauth-0.9.1.tar.gz
 cd liboauth-0.9.1
 ./configure --prefix=$build/liboauth-0.9.1-bin CURL_CFLAGS="-I$build/curl-7.19.5-bin/include" CURL_LIBS="-L$build/curl-7.19.5-bin/lib -R$build/curl-7.19.5-bin/lib -lcurl"
@@ -217,20 +216,20 @@ fi
 cd $build
 
 # Build mod_security
-wget http://cdnetworks-us-1.dl.sourceforge.net/project/mod-security/modsecurity-apache/2.6.0/modsecurity-apache_2.6.0.tar.gz
-tar xzf modsecurity-apache_2.6.0.tar.gz
-cd modsecurity-apache_2.6.0
-./configure --prefix=$build/modsecurity-apache-2.6.0-bin --with-apxs=$build/httpd-2.3.10-bin/bin/apxs --with-apr=$build/apr-1.4.x-bin/bin/apr-2-config --with-apu=$build/apr-1.4.x-bin/bin/apr-2-config --with-libxml=$build/libxml2-2.7.7-bin --with-curl=$build/curl-7.19.5-bin LIBS="-L$build/expat-2.0.1-bin/lib -R$build/expat-2.0.1-bin/lib"
+curl -OL http://downloads.sourceforge.net/project/mod-security/modsecurity-apache/2.6.1/modsecurity-apache_2.6.1.tar.gz
+tar xzf modsecurity-apache_2.6.1.tar.gz
+cd modsecurity-apache_2.6.1
+./configure --prefix=$build/modsecurity-apache-2.6.1-bin --with-apxs=$build/httpd-2.3.10-bin/bin/apxs --with-apr=$build/apr-1.4.x-bin/bin/apr-2-config --with-apu=$build/apr-1.4.x-bin/bin/apr-2-config --with-libxml=$build/libxml2-2.7.7-bin --with-curl=$build/curl-7.19.5-bin LIBS="-L$build/expat-2.0.1-bin/lib -R$build/expat-2.0.1-bin/lib"
 make
 make install
 if [ "$?" != "0" ]; then
     exit $?
 fi
 cd $build
-wget http://cdnetworks-us-1.dl.sourceforge.net/project/mod-security/modsecurity-crs/0-CURRENT/modsecurity-crs_2.2.0.tar.gz
-tar xzf modsecurity-crs_2.2.0.tar.gz
-cp -R $build/modsecurity-crs_2.2.0/base_rules $build/modsecurity-apache-2.6.0-bin
-cp -R $build/modsecurity-crs_2.2.0/optional_rules $build/modsecurity-apache-2.6.0-bin
+curl -OL http://downloads.sourceforge.net/project/mod-security/modsecurity-crs/0-CURRENT/modsecurity-crs_2.2.1.tar.gz
+tar xzf modsecurity-crs_2.2.1.tar.gz
+cp -R $build/modsecurity-crs_2.2.1/base_rules $build/modsecurity-apache-2.6.1-bin
+cp -R $build/modsecurity-crs_2.2.1/optional_rules $build/modsecurity-apache-2.6.1-bin
 if [ "$?" != "0" ]; then
     exit $?
 fi
@@ -240,7 +239,7 @@ sudo apt-get -y install bison flex python-dev libboost-dev libboost-filesystem-d
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget http://archive.apache.org/dist/incubator/thrift/0.2.0-incubating/thrift-0.2.0-incubating.tar.gz
+curl -OL http://archive.apache.org/dist/incubator/thrift/0.2.0-incubating/thrift-0.2.0-incubating.tar.gz
 tar xzf thrift-0.2.0-incubating.tar.gz
 cd thrift-0.2.0
 ./bootstrap.sh
@@ -269,7 +268,7 @@ sudo apt-get -y install gawk
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget --no-check-certificate http://github.com/downloads/facebook/scribe/scribe-2.2.tar.gz
+curl -OL --no-check-certificate http://github.com/downloads/facebook/scribe/scribe-2.2.tar.gz
 tar xzf scribe-2.2.tar.gz
 cd scribe
 ./bootstrap.sh --prefix=$build/scribe-2.2-bin PY_PREFIX=$build/scribe-2.2-bin --with-thriftpath=$build/thrift-0.2.0-bin --with-fb303path=$build/thrift-0.2.0-bin/contrib/fb303 --disable-static
@@ -282,7 +281,7 @@ cp src/lib/libscribe.so $build/scribe-2.2-bin/lib
 cd $build
 
 # Build Apache Libcloud
-wget http://archive.apache.org/dist/incubator/libcloud/apache-libcloud-incubating-0.4.2.tar.bz2
+curl -OL http://archive.apache.org/dist/incubator/libcloud/apache-libcloud-incubating-0.4.2.tar.bz2
 tar xjf apache-libcloud-incubating-0.4.2.tar.bz2
 cd apache-libcloud-incubating-0.4.2
 python setup.py build
@@ -303,7 +302,7 @@ cd $build
 git clone git://git.apache.org/tuscany-sca-cpp.git
 cd tuscany-sca-cpp
 ./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin --with-httpd=$build/httpd-2.3.10-bin --with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/js-1.8.5-bin/include/js --with-js-lib=$build/js-1.8.5-bin/lib --with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python --with-libxml2=$build/libxml2-2.7.7-bin --enable-chat --with-libstrophe=$build/libstrophe-bin --enable-log --with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin --enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin --enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security --with-mod-security=$build/modsecurity-apache-2.6.0-bin
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin --with-httpd=$build/httpd-2.3.10-bin --with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/js-1.8.5-bin/include/js --with-js-lib=$build/js-1.8.5-bin/lib --with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python --with-libxml2=$build/libxml2-2.7.7-bin --enable-chat --with-libstrophe=$build/libstrophe-bin --enable-log --with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin --enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin --enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security --with-mod-security=$build/modsecurity-apache-2.6.1-bin
 make
 make install
 if [ "$?" != "0" ]; then
@@ -312,8 +311,8 @@ fi
 cd $build
 
 # Create src archive
-tar czf tuscany-sca-cpp-1.0-src.tar.gz apache-libcloud-incubating-0.4.2 apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin curl-7.19.5 curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz htmltidy-bin httpd-2.3.10 httpd-2.3.10-alpha.tar.gz httpd-2.3.10-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz memcached-1.4.7 memcached-1.4.7-bin memcached-1.4.7.tar.gz mod_auth_openid mod-auth-openid-bin modsecurity-apache_2.6.0 modsecurity-apache-2.6.0-bin modsecurity-apache_2.6.0.tar.gz modsecurity-crs_2.2.0 modsecurity-crs_2.2.0.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem scribe scribe-2.2-bin scribe-2.2.tar.gz thrift-0.2.0 thrift-0.2.0-bin thrift-0.2.0-incubating.tar.gz tidy tinycdb-0.77 tinycdb-0.77-bin tinycdb_0.77.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0-src.tar.gz apache-libcloud-incubating-0.4.2 apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin curl-7.19.5 curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz htmltidy-bin httpd-2.3.10 httpd-2.3.10-alpha.tar.gz httpd-2.3.10-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz memcached-1.4.7 memcached-1.4.7-bin memcached-1.4.7.tar.gz mod_auth_openid mod-auth-openid-bin modsecurity-apache_2.6.1 modsecurity-apache-2.6.1-bin modsecurity-apache_2.6.1.tar.gz modsecurity-crs_2.2.1 modsecurity-crs_2.2.1.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem scribe scribe-2.2-bin scribe-2.2.tar.gz thrift-0.2.0 thrift-0.2.0-bin thrift-0.2.0-incubating.tar.gz tidy tinycdb-0.77 tinycdb-0.77-bin tinycdb_0.77.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin
 
 # Create bin archive
-tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.19.5-bin expat-2.0.1-bin htmltidy-bin httpd-2.3.10-bin js-1.8.5-bin libcloud-0.4.2-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin memcached-1.4.7-bin mod-auth-openid-bin modsecurity-apache-2.6.0-bin nspr-4.8.8-bin nuvem/nuvem-parallel scribe-2.2-bin thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.19.5-bin expat-2.0.1-bin htmltidy-bin httpd-2.3.10-bin js-1.8.5-bin libcloud-0.4.2-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin memcached-1.4.7-bin mod-auth-openid-bin modsecurity-apache-2.6.1-bin nspr-4.8.8-bin nuvem/nuvem-parallel scribe-2.2-bin thrift-0.2.0-bin tinycdb-0.77-bin 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 7bd1bccb9b..578f03cb56 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-all
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all
@@ -26,14 +26,13 @@ set -x
 build=`pwd`
 
 # Install core dev tools
-sudo apt-get -y install wget git-core subversion autoconf pkg-config automake libtool g++ make
+sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make
 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
+curl -L http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download -o 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
@@ -59,7 +58,7 @@ if [ "$?" != "0" ]; then
     exit $?
 fi
 cd $build
-wget http://archive.apache.org/dist/httpd/httpd-2.3.10-alpha.tar.gz
+curl -OL http://archive.apache.org/dist/httpd/httpd-2.3.10-alpha.tar.gz
 tar xzf httpd-2.3.10-alpha.tar.gz
 cd httpd-2.3.10
 ./configure --enable-ssl --enable-proxy --enable-usertrack --enable-cgi --enable-session-crypto --enable-mods-shared=most --enable-mpms-shared="prefork worker event" --with-mpm=prefork --with-apr=$build/apr-1.4.x-bin --with-expat=$build/expat-2.0.1-bin --prefix=$build/httpd-2.3.10-bin
@@ -75,7 +74,7 @@ sudo apt-get -y install libevent-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget http://memcached.googlecode.com/files/memcached-1.4.7.tar.gz
+curl -OL http://memcached.googlecode.com/files/memcached-1.4.7.tar.gz
 tar xzf memcached-1.4.7.tar.gz
 cd memcached-1.4.7
 ./configure --prefix=$build/memcached-1.4.7-bin
@@ -87,7 +86,7 @@ fi
 cd $build
 
 # Build Tinycdb
-wget http://www.corpit.ru/mjt/tinycdb/tinycdb_0.77.tar.gz
+curl -OL http://www.corpit.ru/mjt/tinycdb/tinycdb_0.77.tar.gz
 tar xzf tinycdb_0.77.tar.gz
 cd tinycdb-0.77
 make all shared
@@ -98,7 +97,7 @@ fi
 cd $build
 
 # Build Libcurl
-wget http://curl.haxx.se/download/curl-7.19.5.tar.gz
+curl -OL http://curl.haxx.se/download/curl-7.19.5.tar.gz
 tar xzf curl-7.19.5.tar.gz
 cd curl-7.19.5
 ./configure --prefix=$build/curl-7.19.5-bin
@@ -110,7 +109,7 @@ fi
 cd $build
 
 # Build Libxml2
-wget ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.7.tar.gz
+curl -OL ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.7.tar.gz
 tar xzf libxml2-sources-2.7.7.tar.gz
 cd libxml2-2.7.7
 ./configure --prefix=$build/libxml2-2.7.7-bin
@@ -122,7 +121,7 @@ fi
 cd $build
 
 # Build Mozilla Portable Runtime
-wget http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.8/src/nspr-4.8.8.tar.gz
+curl -OL http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.8/src/nspr-4.8.8.tar.gz
 tar xzf nspr-4.8.8.tar.gz
 cd nspr-4.8.8/mozilla/nsprpub
 ./configure --prefix=$build/nspr-4.8.8-bin --enable-64bit
@@ -138,7 +137,7 @@ sudo apt-get -y install zip unzip
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
+curl -OL http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
 tar xzf js185-1.0.0.tar.gz
 cd js-1.8.5/js/src
 export LD_RUN_PATH=$build/nspr-4.8.8-bin/lib
@@ -153,14 +152,14 @@ fi
 cd $build
 
 # Install Google AppEngine SDK
-wget http://googleappengine.googlecode.com/files/google_appengine_1.4.0.zip
+curl -OL http://googleappengine.googlecode.com/files/google_appengine_1.4.0.zip
 unzip google_appengine_1.4.0.zip
 
 # Build Apache Axis2/C
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget http://www.apache.org/dist/ws/axis2-c/1_6_0/axis2c-src-1.6.0.tar.gz
+curl -OL 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
 cd axis2c-src-1.6.0
 ./configure --enable-openssl --with-apache2=$build/httpd-2.3.10-bin/include --with-apr=$build/apr-1.4.x-bin/include/apr-2 --prefix=$build/axis2c-1.6.0-bin
@@ -184,7 +183,7 @@ sudo apt-get -y install libboost-dev libboost-program-options-dev libboost-files
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget http://archive.apache.org/dist/qpid/0.6/qpid-cpp-0.6.tar.gz
+curl -OL http://archive.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
@@ -212,7 +211,7 @@ sudo apt-get -y install openjdk-6-jdk
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget http://archive.apache.org/dist/mina/vysper/0.6/vysper-0.6-bin.tar.gz
+curl -OL http://archive.apache.org/dist/mina/vysper/0.6/vysper-0.6-bin.tar.gz
 tar xzf vysper-0.6-bin.tar.gz
 if [ "$?" != "0" ]; then
     exit $?
@@ -259,7 +258,7 @@ fi
 cd $build
 
 # Build Liboauth
-wget http://liboauth.sourceforge.net/pool/liboauth-0.9.1.tar.gz
+curl -OL http://liboauth.sourceforge.net/pool/liboauth-0.9.1.tar.gz
 tar xzf liboauth-0.9.1.tar.gz
 cd liboauth-0.9.1
 ./configure --prefix=$build/liboauth-0.9.1-bin CURL_CFLAGS="-I$build/curl-7.19.5-bin/include" CURL_LIBS="-L$build/curl-7.19.5-bin/lib -R$build/curl-7.19.5-bin/lib -lcurl"
@@ -271,20 +270,20 @@ fi
 cd $build
 
 # Build mod_security
-wget http://cdnetworks-us-1.dl.sourceforge.net/project/mod-security/modsecurity-apache/2.6.0/modsecurity-apache_2.6.0.tar.gz
-tar xzf modsecurity-apache_2.6.0.tar.gz
-cd modsecurity-apache_2.6.0
-./configure --prefix=$build/modsecurity-apache-2.6.0-bin --with-apxs=$build/httpd-2.3.10-bin/bin/apxs --with-apr=$build/apr-1.4.x-bin/bin/apr-2-config --with-apu=$build/apr-1.4.x-bin/bin/apr-2-config --with-libxml=$build/libxml2-2.7.7-bin --with-curl=$build/curl-7.19.5-bin LIBS="-L$build/expat-2.0.1-bin/lib -R$build/expat-2.0.1-bin/lib"
+curl -OL http://downloads.sourceforge.net/project/mod-security/modsecurity-apache/2.6.1/modsecurity-apache_2.6.1.tar.gz
+tar xzf modsecurity-apache_2.6.1.tar.gz
+cd modsecurity-apache_2.6.1
+./configure --prefix=$build/modsecurity-apache-2.6.1-bin --with-apxs=$build/httpd-2.3.10-bin/bin/apxs --with-apr=$build/apr-1.4.x-bin/bin/apr-2-config --with-apu=$build/apr-1.4.x-bin/bin/apr-2-config --with-libxml=$build/libxml2-2.7.7-bin --with-curl=$build/curl-7.19.5-bin LIBS="-L$build/expat-2.0.1-bin/lib -R$build/expat-2.0.1-bin/lib"
 make
 make install
 if [ "$?" != "0" ]; then
     exit $?
 fi
 cd $build
-wget http://cdnetworks-us-1.dl.sourceforge.net/project/mod-security/modsecurity-crs/0-CURRENT/modsecurity-crs_2.2.0.tar.gz
-tar xzf modsecurity-crs_2.2.0.tar.gz
-cp -R $build/modsecurity-crs_2.2.0/base_rules $build/modsecurity-apache-2.6.0-bin
-cp -R $build/modsecurity-crs_2.2.0/optional_rules $build/modsecurity-apache-2.6.0-bin
+curl -OL http://downloads.sourceforge.net/project/mod-security/modsecurity-crs/0-CURRENT/modsecurity-crs_2.2.1.tar.gz
+tar xzf modsecurity-crs_2.2.1.tar.gz
+cp -R $build/modsecurity-crs_2.2.1/base_rules $build/modsecurity-apache-2.6.1-bin
+cp -R $build/modsecurity-crs_2.2.1/optional_rules $build/modsecurity-apache-2.6.1-bin
 if [ "$?" != "0" ]; then
     exit $?
 fi
@@ -294,7 +293,7 @@ sudo apt-get -y install libreadline-dev
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v9.0.3/postgresql-9.0.3.tar.gz
+curl -OL ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v9.0.3/postgresql-9.0.3.tar.gz
 tar xzf postgresql-9.0.3.tar.gz
 cd postgresql-9.0.3
 ./configure --prefix=$build/postgresql-9.0.3-bin --enable-thread-safety
@@ -310,7 +309,7 @@ sudo apt-get -y install bison flex python-dev libboost-dev libboost-filesystem-d
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget http://archive.apache.org/dist/incubator/thrift/0.2.0-incubating/thrift-0.2.0-incubating.tar.gz
+curl -OL http://archive.apache.org/dist/incubator/thrift/0.2.0-incubating/thrift-0.2.0-incubating.tar.gz
 tar xzf thrift-0.2.0-incubating.tar.gz
 cd thrift-0.2.0
 ./bootstrap.sh
@@ -339,7 +338,7 @@ sudo apt-get -y install gawk
 if [ "$?" != "0" ]; then
     exit $?
 fi
-wget --no-check-certificate http://github.com/downloads/facebook/scribe/scribe-2.2.tar.gz
+curl -OL --no-check-certificate http://github.com/downloads/facebook/scribe/scribe-2.2.tar.gz
 tar xzf scribe-2.2.tar.gz
 cd scribe
 ./bootstrap.sh --prefix=$build/scribe-2.2-bin PY_PREFIX=$build/scribe-2.2-bin --with-thriftpath=$build/thrift-0.2.0-bin --with-fb303path=$build/thrift-0.2.0-bin/contrib/fb303 --disable-static
@@ -352,7 +351,7 @@ cp src/lib/libscribe.so $build/scribe-2.2-bin/lib
 cd $build
 
 # Build Apache Libcloud
-wget http://archive.apache.org/dist/incubator/libcloud/apache-libcloud-incubating-0.4.2.tar.bz2
+curl -OL http://archive.apache.org/dist/incubator/libcloud/apache-libcloud-incubating-0.4.2.tar.bz2
 tar xjf apache-libcloud-incubating-0.4.2.tar.bz2
 cd apache-libcloud-incubating-0.4.2
 python setup.py build
@@ -373,7 +372,7 @@ cd $build
 git clone git://git.apache.org/tuscany-sca-cpp.git
 cd tuscany-sca-cpp
 ./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin --with-httpd=$build/httpd-2.3.10-bin --with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/js-1.8.5-bin/include/js --with-js-lib=$build/js-1.8.5-bin/lib --with-libcloud=$build/libcloud-0.4.2-bin --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.6 --enable-sqldb --with-pgsql=$build/postgresql-9.0.3-bin --enable-log --with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin --enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin --enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security --with-mod-security=$build/modsecurity-apache-2.6.0-bin
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin --with-httpd=$build/httpd-2.3.10-bin --with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/js-1.8.5-bin/include/js --with-js-lib=$build/js-1.8.5-bin/lib --with-libcloud=$build/libcloud-0.4.2-bin --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.6 --enable-sqldb --with-pgsql=$build/postgresql-9.0.3-bin --enable-log --with-thrift=$build/thrift-0.2.0-bin --with-scribe=$build/scribe-2.2-bin --enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin --enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security --with-mod-security=$build/modsecurity-apache-2.6.1-bin
 make
 make install
 if [ "$?" != "0" ]; then
@@ -382,8 +381,8 @@ fi
 cd $build
 
 # Create src archive
-tar czf tuscany-sca-cpp-all-1.0-src.tar.gz apache-libcloud-incubating-0.4.2 apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin axis2c-1.6.0-bin axis2c-src-1.6.0 axis2c-src-1.6.0.tar.gz curl-7.19.5 curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz google_appengine google_appengine_1.4.0.zip htmltidy-bin httpd-2.3.10 httpd-2.3.10-alpha.tar.gz httpd-2.3.10-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz memcached-1.4.7 memcached-1.4.7-bin memcached-1.4.7.tar.gz mod_auth_openid mod-auth-openid-bin modsecurity-apache_2.6.0 modsecurity-apache-2.6.0-bin modsecurity-apache_2.6.0.tar.gz modsecurity-crs_2.2.0 modsecurity-crs_2.2.0.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem postgresql-9.0.3 postgresql-9.0.3-bin postgresql-9.0.3.tar.gz qpidc-0.6 qpidc-0.6-bin qpid-cpp-0.6.tar.gz scribe scribe-2.2-bin scribe-2.2.tar.gz thrift-0.2.0 thrift-0.2.0-bin thrift-0.2.0-incubating.tar.gz tidy tinycdb-0.77 tinycdb-0.77-bin tinycdb_0.77.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin vysper-0.6 vysper-0.6-bin.tar.gz
+tar czf tuscany-sca-cpp-all-1.0-src.tar.gz apache-libcloud-incubating-0.4.2 apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin axis2c-1.6.0-bin axis2c-src-1.6.0 axis2c-src-1.6.0.tar.gz curl-7.19.5 curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz google_appengine google_appengine_1.4.0.zip htmltidy-bin httpd-2.3.10 httpd-2.3.10-alpha.tar.gz httpd-2.3.10-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz memcached-1.4.7 memcached-1.4.7-bin memcached-1.4.7.tar.gz mod_auth_openid mod-auth-openid-bin modsecurity-apache_2.6.1 modsecurity-apache-2.6.1-bin modsecurity-apache_2.6.1.tar.gz modsecurity-crs_2.2.1 modsecurity-crs_2.2.1.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem postgresql-9.0.3 postgresql-9.0.3-bin postgresql-9.0.3.tar.gz qpidc-0.6 qpidc-0.6-bin qpid-cpp-0.6.tar.gz scribe scribe-2.2-bin scribe-2.2.tar.gz thrift-0.2.0 thrift-0.2.0-bin thrift-0.2.0-incubating.tar.gz tidy tinycdb-0.77 tinycdb-0.77-bin tinycdb_0.77.tar.gz tuscany-sca-cpp tuscany-sca-cpp-bin vysper-0.6 vysper-0.6-bin.tar.gz
 
 # Create bin archive
-tar czf tuscany-sca-cpp-all-1.0.tar.gz apr-1.4.x-bin axis2c-1.6.0-bin curl-7.19.5-bin expat-2.0.1-bin google_appengine htmltidy-bin httpd-2.3.10-bin js-1.8.5-bin libcloud-0.4.2-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin memcached-1.4.7-bin mod-auth-openid-bin modsecurity-apache-2.6.0-bin nspr-4.8.8-bin nuvem/nuvem-parallel postgresql-9.0.3-bin qpidc-0.6-bin scribe-2.2-bin thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp tuscany-sca-cpp-bin vysper-0.6
+tar czf tuscany-sca-cpp-all-1.0.tar.gz apr-1.4.x-bin axis2c-1.6.0-bin curl-7.19.5-bin expat-2.0.1-bin google_appengine htmltidy-bin httpd-2.3.10-bin js-1.8.5-bin libcloud-0.4.2-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin memcached-1.4.7-bin mod-auth-openid-bin modsecurity-apache-2.6.1-bin nspr-4.8.8-bin nuvem/nuvem-parallel postgresql-9.0.3-bin qpidc-0.6-bin scribe-2.2-bin thrift-0.2.0-bin tinycdb-0.77-bin tuscany-sca-cpp tuscany-sca-cpp-bin vysper-0.6
 
diff --git a/sca-cpp/trunk/ubuntu/uec2-bin-all-image b/sca-cpp/trunk/ubuntu/uec2-bin-all-image
index f8b34e9083..ce4f7853f3 100755
--- a/sca-cpp/trunk/ubuntu/uec2-bin-all-image
+++ b/sca-cpp/trunk/ubuntu/uec2-bin-all-image
@@ -19,5 +19,5 @@
 host=$1
 
 # Download and execute Tuscany SCA install script
-ssh -i $HOME/.ec2/ec2-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image; chmod 700 ./ubuntu-bin-all-image; ./ubuntu-bin-all-image"
+ssh -i $HOME/.ec2/ec2-keypair.pem ubuntu@$host "curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image; chmod 700 ./ubuntu-bin-all-image; ./ubuntu-bin-all-image"
 
diff --git a/sca-cpp/trunk/ubuntu/uec2-bin-image b/sca-cpp/trunk/ubuntu/uec2-bin-image
index fbcbe091b5..06b6065820 100755
--- a/sca-cpp/trunk/ubuntu/uec2-bin-image
+++ b/sca-cpp/trunk/ubuntu/uec2-bin-image
@@ -19,5 +19,5 @@
 host=$1
 
 # Download and execute Tuscany SCA install script
-ssh -i $HOME/.ec2/ec2-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"
+ssh -i $HOME/.ec2/ec2-keypair.pem ubuntu@$host "curl -OL 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-all-image b/sca-cpp/trunk/ubuntu/uec2-dev-all-image
index d56f05cdda..ac8e56ee40 100755
--- a/sca-cpp/trunk/ubuntu/uec2-dev-all-image
+++ b/sca-cpp/trunk/ubuntu/uec2-dev-all-image
@@ -19,5 +19,5 @@
 host=$1
 
 # Download and execute Tuscany SCA install script
-ssh -i $HOME/.ec2/ec2-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image; chmod 700 ./ubuntu-dev-all-image; ./ubuntu-dev-all-image"
+ssh -i $HOME/.ec2/ec2-keypair.pem ubuntu@$host "curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image; chmod 700 ./ubuntu-dev-all-image; ./ubuntu-dev-all-image"
 
diff --git a/sca-cpp/trunk/ubuntu/uec2-dev-image b/sca-cpp/trunk/ubuntu/uec2-dev-image
index 206443a7ae..9b476b7176 100755
--- a/sca-cpp/trunk/ubuntu/uec2-dev-image
+++ b/sca-cpp/trunk/ubuntu/uec2-dev-image
@@ -19,5 +19,5 @@
 host=$1
 
 # Download and execute Tuscany SCA install script
-ssh -i $HOME/.ec2/ec2-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"
+ssh -i $HOME/.ec2/ec2-keypair.pem ubuntu@$host "curl -OL http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-image; chmod 700 ./ubuntu-dev-image; ./ubuntu-dev-image"