You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/03/29 08:26:17 UTC
svn commit: r928605 - in /tuscany/sca-cpp/trunk: ./ components/cache/
modules/http/ ubuntu/
Author: jsdelfino
Date: Mon Mar 29 06:26:16 2010
New Revision: 928605
URL: http://svn.apache.org/viewvc?rev=928605&view=rev
Log:
Build memcached from source as the Ubuntu 9.10 memcached package is back level. Minor typo fixes in httpd config scripts.
Modified:
tuscany/sca-cpp/trunk/INSTALL
tuscany/sca-cpp/trunk/components/cache/Makefile.am
tuscany/sca-cpp/trunk/components/cache/memcached-start
tuscany/sca-cpp/trunk/components/cache/memcached-stop
tuscany/sca-cpp/trunk/configure.ac
tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf
tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf
tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
Modified: tuscany/sca-cpp/trunk/INSTALL
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/INSTALL?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/INSTALL (original)
+++ tuscany/sca-cpp/trunk/INSTALL Mon Mar 29 06:26:16 2010
@@ -43,11 +43,7 @@ doxygen-1.6.1
Install the following binaries:
curl-7.19.5 (http://curl.haxx.se)
-memcached-1.2.8 (http://memcached.org/)
-
-Optional:
privbind-1.1 (http://manpages.ubuntu.com/manpages/karmic/man1/privbind.1.html)
-will help you bind to port 80 for example without running as root
Then install the following development dependencies:
@@ -57,6 +53,10 @@ httpd-2.2-15 (http://httpd.apache.org/)
with included libapr and libaprutil
built with OpenSSL libssl-0.9.8g
+Memcached:
+memcached-1.4.4 (http://memcached.org/)
+built with libevent-1.4.11
+
XML:
libxml2-2.7.5 (http://xmlsoft.org/)
@@ -135,6 +135,7 @@ 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-memcached=$HOME/memcached-1.4.4-bin \
--with-libcurl=$HOME/curl-7.19.5-bin --with-libxml2=/usr \
--with-js-include=/usr/include/xulrunner-1.9.1.8/unstable \
--with-js-lib=/usr/lib/xulrunner-1.9.1.8 \
@@ -183,6 +184,11 @@ make
make install
export PATH=$HOME/httpd-2-2.13-bin/bin:$PATH
+Memcached:
+./configure --prefix=$HOME/memcached-1.4.4-bin
+make
+make install
+
Apache Axis2/C:
./configure --enable-libxml2 --enable-openssl \
--with-apache2=$HOME/httpd-2.2.13-bin/include --prefix=$HOME/axis2c-1.6.0-bin
Modified: tuscany/sca-cpp/trunk/components/cache/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/Makefile.am?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/components/cache/Makefile.am Mon Mar 29 06:26:16 2010
@@ -18,6 +18,10 @@
comp_SCRIPTS = memcached-start memcached-stop
compdir=$(prefix)/components/cache
+comp_DATA = memcached.prefix
+memcached.prefix: $(top_builddir)/config.status
+ echo ${MEMCACHED_PREFIX} >memcached.prefix
+
comp_LTLIBRARIES = libmemcache.la
libmemcache_la_SOURCES = memcache.cpp
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-start?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-start (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-start Mon Mar 29 06:26:16 2010
@@ -18,4 +18,8 @@
# under the License.
# Start memcached
-memcached -d -l 127.0.0.1 -m 4 -p 11211
+here=`readlink -f $0`; here=`dirname $here`
+
+memcached_prefix=`cat $here/memcached.prefix`
+$memcached_prefix/bin/memcached -d -l 127.0.0.1 -m 4 -p 11211
+
Modified: tuscany/sca-cpp/trunk/components/cache/memcached-stop
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/memcached-stop?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-stop (original)
+++ tuscany/sca-cpp/trunk/components/cache/memcached-stop Mon Mar 29 06:26:16 2010
@@ -18,6 +18,9 @@
# under the License.
# Stop memcached
-mc="memcached -d -l 127.0.0.1 -m 4 -p 11211"
+here=`readlink -f $0`; here=`dirname $here`
+
+memcached_prefix=`cat $here/memcached.prefix`
+mc="$memcached_prefix/bin/memcached -d -l 127.0.0.1 -m 4 -p 11211"
kill `ps -ef | grep -v grep | grep "${mc}" | awk '{ print $2 }'`
Modified: tuscany/sca-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Mon Mar 29 06:26:16 2010
@@ -54,7 +54,7 @@ else
AM_CONDITIONAL([DARWIN], false)
fi
-# Configure path to LIBCURL includes and lib.
+# Configure path to libcurl includes and lib.
AC_MSG_CHECKING([for libcurl])
AC_ARG_WITH([libcurl], [AC_HELP_STRING([--with-libcurl=PATH], [path to installed libcurl [default=/usr]])], [
LIBCURL_INCLUDE="${withval}/include"
@@ -134,6 +134,17 @@ AC_ARG_WITH([httpd], [AC_HELP_STRING([--
AC_SUBST(HTTPD_PREFIX)
AC_SUBST(HTTPD_INCLUDE)
+# Configure path to memcached.
+AC_MSG_CHECKING([for memcached])
+AC_ARG_WITH([memcached], [AC_HELP_STRING([--with-memcached=PATH], [path to installed memcached [default=/usr]])], [
+ MEMCACHED_PREFIX="${withval}"
+ AC_MSG_RESULT("${withval}")
+], [
+ MEMCACHED_PREFIX="/usr"
+ AC_MSG_RESULT(/usr)
+])
+AC_SUBST(MEMCACHED_PREFIX)
+
# Configure TUSCANY_SCACPP path variable.
TUSCANY_SCACPP=`echo "${TUSCANY_SCACPP}"`
if test "${TUSCANY_SCACPP}" = ""; then
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf Mon Mar 29 06:26:16 2010
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a test certificate of authority
+# Generate a test certification authority certificate
here=`readlink -f $0`; here=`dirname $here`
root=`readlink -f $1`
host=$2
@@ -84,6 +84,6 @@ rm -f $root/conf/ca-database
echo 1000 > $root/conf/ca-serial
touch $root/conf/ca-database
-# Generate the certificate of authority
+# Generate the certification authority certificate
openssl req -new -x509 -config $root/conf/openssl-ca.conf -out $root/conf/ca.crt -keyout $root/conf/ca.key
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf Mon Mar 29 06:26:16 2010
@@ -50,7 +50,7 @@ EOF
# Generate a certificate request
openssl req -new -config $root/conf/openssl-cert.conf -out $root/conf/server-req.crt -keyout $root/conf/server.key
-# Generate a certificate, signed with our test certificate of authority
+# Generate a certificate, signed with our test certification authority certificate
openssl ca -batch -config $root/conf/openssl-ca.conf -out $root/conf/server.crt -infiles $root/conf/server-req.crt
# Export it to PKCS12 format, that's the format Web browsers want to import
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf Mon Mar 29 06:26:16 2010
@@ -65,7 +65,7 @@ CustomLog $root/logs/ssl_access_log sslc
LogLevel warn
# Require clients to present either:
-# a certificate signed with our CA certificate of authority
+# a certificate signed with our certification authority certificate
# or a userid + password for HTTP basic authentication
<Location />
Satisfy Any
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-image Mon Mar 29 06:26:16 2010
@@ -35,7 +35,7 @@ sudo apt-get -y install git-core autocon
if [ "$?" != "0" ]; then
exit $?
fi
-sudo apt-get -y install curl memcached privbind
+sudo apt-get -y install curl privbind
if [ "$?" != "0" ]; then
exit $?
fi
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install?rev=928605&r1=928604&r2=928605&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install Mon Mar 29 06:26:16 2010
@@ -31,7 +31,7 @@ if [ "$?" != "0" ]; then
fi
# Install the required binaries
-sudo apt-get -y install curl memcached privbind
+sudo apt-get -y install curl privbind
if [ "$?" != "0" ]; then
exit $?
fi
@@ -52,6 +52,22 @@ if [ "$?" != "0" ]; then
fi
cd $build
+# Build Memcached
+sudo apt-get install libevent-dev
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+curl -o memcached-1.4.4.tar.gz http://memcached.googlecode.com/files/memcached-1.4.4.tar.gz
+tar xzf memcached-1.4.4.tar.gz
+cd memcached-1.4.4
+./configure --prefix=$build/memcached-1.4.4-bin
+make
+make install
+if [ "$?" != "0" ]; then
+ exit $?
+fi
+cd $build
+
# Build Apache Axis2/C
sudo apt-get -y install pkg-config libxml2-dev
if [ "$?" != "0" ]; then
@@ -119,7 +135,7 @@ sudo apt-get -y install openjdk-6-jdk
if [ "$?" != "0" ]; then
exit $?
fi
-curl -o vysper-0.5-bin.tar.gz https://repository.apache.org/content/repositories/orgapachemina-007/org/apache/vysper/vysper/0.5/vysper-0.5-bin.tar.gz
+curl -o vysper-0.5-bin.tar.gz https://repository.apache.org/content/repositories/orgapachemina-019/org/apache/vysper/vysper/0.5/vysper-0.5-bin.tar.gz
tar xzf vysper-0.5-bin.tar.gz
if [ "$?" != "0" ]; then
exit $?
@@ -146,7 +162,7 @@ git clone git://git.apache.org/tuscany-s
cd tuscany-sca-cpp
cp etc/git-exclude .git/info/exclude
./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin --with-libcurl=$build/curl-7.19.5-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --enable-threads --enable-python --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe --with-vysper=$build/vysper-0.5
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-libcurl=$build/curl-7.19.5-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --with-memcached=$build/memcached-1.4.4-bin --enable-threads --enable-python --enable-java --with-java=/usr/lib/jvm/java-6-openjdk --enable-webservice --with-axis2c=$build/axis2c-1.6.0-bin --enable-queue --with-qpidc=$build/qpidc-0.6-bin --enable-chat --with-libstrophe=$build/libstrophe --with-vysper=$build/vysper-0.5
make
make install
if [ "$?" != "0" ]; then