From 14f1ada7b2bb66c6c3dae496d3963e9af3f0ab38 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 28 Nov 2010 07:17:11 +0000
Subject: Use different servers for cert-based and password-based auth and use
 event MPMs for tunnel and proxy servers.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1039840 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/components/cache/memcached-ssl-test | 2 ++
 sca-cpp/trunk/components/webservice/axis2-conf    | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'sca-cpp/trunk/components')

diff --git a/sca-cpp/trunk/components/cache/memcached-ssl-test b/sca-cpp/trunk/components/cache/memcached-ssl-test
index 7e55cfdee6..88143490f8 100755
--- a/sca-cpp/trunk/components/cache/memcached-ssl-test
+++ b/sca-cpp/trunk/components/cache/memcached-ssl-test
@@ -27,6 +27,7 @@
 ./memcached-start 11413
 
 ../../modules/http/httpd-conf tmp/tunnel localhost 8089 htdocs
+../../modules/http/httpd-event-conf tmp/tunnel
 tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C tmp/tunnel -x
 ../../modules/http/tunnel-ssl-conf tmp/tunnel 11211 localhost 8453 11411
 ../../modules/http/tunnel-ssl-conf tmp/tunnel 11212 localhost 8453 11412
@@ -36,6 +37,7 @@ tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C tmp/tunnel
 ../../modules/http/httpd-conf tmp/server localhost 8090 htdocs
 tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C tmp/server -x
 ../../modules/http/httpd-ssl-conf tmp/server 8453
+../../modules/http/cert-auth-conf tmp/server
 ../../modules/http/httpd-start tmp/server
 sleep 1
 
diff --git a/sca-cpp/trunk/components/webservice/axis2-conf b/sca-cpp/trunk/components/webservice/axis2-conf
index c11e6c50d5..af5d189b24 100755
--- a/sca-cpp/trunk/components/webservice/axis2-conf
+++ b/sca-cpp/trunk/components/webservice/axis2-conf
@@ -42,11 +42,17 @@ ln -f -s $here/services.xml $root/axis2c/services/tuscany/services.xml
 cp $here/axis2.xml $root/axis2c/axis2.xml
 
 # Configure HTTPD Axis2 module
+cat >>$root/conf/modules.conf <<EOF
+# Generated by: axis2-conf $*
+# Support for Web Services
+LoadModule axis2_module $root/axis2c/lib/libmod_axis2.so
+
+EOF
+
 cat >>$root/conf/httpd.conf <<EOF
 # Generated by: axis2-conf $*
 # Support for Web Services
 SCASetEnv AXIS2C_HOME $root/axis2c
-LoadModule axis2_module $root/axis2c/lib/libmod_axis2.so
 Axis2RepoPath $root/axis2c
 Axis2LogFile $root/axis2c/logs/mod_axis2.log
 Axis2LogLevel debug
@@ -55,3 +61,4 @@ Axis2LogLevel debug
 </Location>
 
 EOF
+
-- 
cgit v1.2.3