From 788cba4bc8028279dcf8dcd1ac192f0ce078a971 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 27 Dec 2010 23:19:34 +0000 Subject: Fix automated build and Ubuntu 10.10 install. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1053221 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/modules/http/mod-openauth.cpp | 6 ++++++ sca-cpp/trunk/ubuntu/ubuntu-bin-all-image | 6 +++--- sca-cpp/trunk/ubuntu/ubuntu-install-all | 18 ++++++++++++------ 3 files changed, 21 insertions(+), 9 deletions(-) (limited to 'sca-cpp') diff --git a/sca-cpp/trunk/modules/http/mod-openauth.cpp b/sca-cpp/trunk/modules/http/mod-openauth.cpp index 953d6891a6..688f2b0ba8 100644 --- a/sca-cpp/trunk/modules/http/mod-openauth.cpp +++ b/sca-cpp/trunk/modules/http/mod-openauth.cpp @@ -76,6 +76,8 @@ public: string login; }; +#ifdef WANT_MAINTAINER_MODE + /** * Log a session entry. */ @@ -84,6 +86,8 @@ int debugSession(unused void* r, const char* key, const char* value) { return 1; } +#endif + /** * Return the user info from a form auth encrypted session cookie. */ @@ -98,7 +102,9 @@ const failable userInfoFromSession(const string& realm, request_rec* r) { ap_session_load_fn(r, &z); if (z == NULL) return mkfailure("Couldn't retrieve user session"); +#ifdef WANT_MAINTAINER_MODE apr_table_do(debugSession, r, z->entries, NULL); +#endif if (ap_session_get_fn == NULL) ap_session_get_fn = APR_RETRIEVE_OPTIONAL_FN(ap_session_get); diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image index a3da2132e4..f568da8ada 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 autoconf automake libtool g++ +sudo apt-get -y install wget git-core subversion autoconf automake libtool g++ if [ "$?" != "0" ]; then exit $? fi @@ -90,6 +90,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 -tar xzf tuscany-sca-cpp-all-1.0.tar.gz +wget http://people.apache.org/~jsdelfino/tuscany/test/tuscany-sca-cpp-all-1.0-src.tar.gz +tar xzf tuscany-sca-cpp-all-1.0-src.tar.gz diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all index ed74e753a9..4d63554d72 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-install-all +++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all @@ -26,7 +26,7 @@ set -x build=`pwd` # Install core dev tools -sudo apt-get -y install wget git-core autoconf automake libtool g++ +sudo apt-get -y install wget git-core subversion autoconf automake libtool g++ if [ "$?" != "0" ]; then exit $? fi @@ -55,6 +55,9 @@ cd apr-1.4.x ./configure -with-openssl --with-crypto --with-expat=$build/expat-2.0.1-bin --prefix=$build/apr-1.4.x-bin make make install +if [ "$?" != "0" ]; then + exit $? +fi cd $build wget http://archive.apache.org/dist/httpd/httpd-2.3.10-alpha.tar.gz tar xzf httpd-2.3.10-alpha.tar.gz @@ -196,8 +199,8 @@ sudo apt-get -y install openjdk-6-jdk if [ "$?" != "0" ]; then exit $? fi -wget http://www.apache.org/dist/mina/vysper/0.5/vysper-0.5-bin.tar.gz -tar xzf vysper-0.5-bin.tar.gz +wget http://www.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 $? fi @@ -304,7 +307,7 @@ sudo apt-get -y install gawk if [ "$?" != "0" ]; then exit $? fi -wget http://github.com/downloads/facebook/scribe/scribe-2.2.tar.gz +wget --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 @@ -332,7 +335,7 @@ 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 --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.5-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/tracemonkey-bin/include/js --with-js-lib=$build/tracemonkey-bin/lib --with-libcloud=$build/libcloud-0.3.1-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.5 --enable-sqldb --with-pgsql=$build/postgresql-9.0.1-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 +./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.5-bin --with-tinycdb=$build/tinycdb-0.77-bin --with-js-include=$build/tracemonkey-bin/include/js --with-js-lib=$build/tracemonkey-bin/lib --with-libcloud=$build/libcloud-0.3.1-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.1-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 make make install if [ "$?" != "0" ]; then @@ -340,6 +343,9 @@ if [ "$?" != "0" ]; then fi cd $build +# Create src archive +tar czf tuscany-sca-cpp-all-1.0-src.tar.gz apache-libcloud-0.3.1 apache-libcloud-incubating-0.3.1.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 libcloud-0.3.1-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.5 memcached-1.4.5-bin memcached-1.4.5.tar.gz mod_auth_openid mod-auth-openid-bin postgresql-9.0.1 postgresql-9.0.1-bin postgresql-9.0.1.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 tracemonkey-bin tracemonkey-e4364736e170 tracemonkey-e4364736e170.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 tuscany-sca-cpp tuscany-sca-cpp-bin axis2c-1.6.0-bin libxml2-2.7.7-bin curl-7.19.5-bin httpd-2.3.10-bin apr-1.4.x-bin tracemonkey-bin google_appengine libstrophe-bin memcached-1.4.5-bin tinycdb-0.77-bin qpidc-0.6-bin vysper-0.5 postgresql-9.0.1-bin thrift-0.2.0-bin scribe-2.2-bin libcloud-0.3.1-bin htmltidy-bin libopkele-bin mod-auth-openid-bin liboauth-0.9.1-bin +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 libcloud-0.3.1-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin memcached-1.4.5-bin mod-auth-openid-bin postgresql-9.0.1-bin qpidc-0.6-bin scribe-2.2-bin thrift-0.2.0-bin tinycdb-0.77-bin tracemonkey-bin tuscany-sca-cpp tuscany-sca-cpp-bin vysper-0.6 -- cgit v1.2.3