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/08/14 20:46:28 UTC
svn commit: r985561 [2/2] - in /tuscany/sca-cpp/trunk: ./ components/cache/
components/chat/ components/log/ components/nosqldb/ components/queue/
components/sqldb/ components/webservice/ etc/ kernel/ modules/http/
modules/json/ modules/server/ samples...
Modified: tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp Sat Aug 14 18:46:26 2010
@@ -37,7 +37,7 @@
#include "../atom/atom.hpp"
#include "../json/json.hpp"
#include "../scdl/scdl.hpp"
-#include "../http/curl.hpp"
+#include "../http/http.hpp"
#include "../http/httpd.hpp"
extern "C" {
@@ -113,7 +113,7 @@ const failable<int> get(request_rec* r,
const value func = c_str(json::funcName(string(cadr(ma))));
// Apply the requested function
- const failable<value> val = failableResult(impl(cons(func, httpd::queryParams(args))));
+ const failable<value> val = failableResult(impl(cons(func, json::queryParams(args))));
if (!hasContent(val))
return mkfailure<int>(reason(val));
@@ -250,6 +250,8 @@ const failable<int> del(request_rec* r,
* Translate a component request.
*/
int translate(request_rec *r) {
+ if(r->method_number != M_GET && r->method_number != M_POST && r->method_number != M_PUT && r->method_number != M_DELETE)
+ return DECLINED;
if (strncmp(r->uri, "/components/", 12) != 0)
return DECLINED;
r->handler = "mod_tuscany_eval";
@@ -544,8 +546,11 @@ const failable<bool> virtualHostCleanup(
* HTTP request handler.
*/
int handler(request_rec *r) {
+ if(r->method_number != M_GET && r->method_number != M_POST && r->method_number != M_PUT && r->method_number != M_DELETE)
+ return DECLINED;
if(strcmp(r->handler, "mod_tuscany_eval"))
return DECLINED;
+
gc_scoped_pool pool(r->pool);
ScopedRequest sr(r);
httpdDebugRequest(r, "modeval::handler::input");
Modified: tuscany/sca-cpp/trunk/modules/server/mod-wiring.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/mod-wiring.cpp?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/mod-wiring.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/mod-wiring.cpp Sat Aug 14 18:46:26 2010
@@ -299,13 +299,15 @@ const failable<bool> virtualHostConfig(S
* to the target component.
*/
int translate(request_rec *r) {
- gc_scoped_pool pool(r->pool);
+ if(r->method_number != M_GET && r->method_number != M_POST && r->method_number != M_PUT && r->method_number != M_DELETE)
+ return DECLINED;
- // No translation needed for a component request
+ // No translation needed for a component or tunnel request
if (!strncmp(r->uri, "/components/", 12))
return DECLINED;
// Get the server configuration
+ gc_scoped_pool pool(r->pool);
const ServerConf& sc = httpd::serverConf<ServerConf>(r, &mod_tuscany_wiring);
// Process dynamic virtual host configuration, if any
@@ -329,14 +331,17 @@ int translate(request_rec *r) {
* HTTP request handler, redirect to a target component.
*/
int handler(request_rec *r) {
- gc_scoped_pool pool(r->pool);
+ if(r->method_number != M_GET && r->method_number != M_POST && r->method_number != M_PUT && r->method_number != M_DELETE)
+ return DECLINED;
if(strcmp(r->handler, "mod_tuscany_wiring"))
return DECLINED;
+ if (r->filename == NULL || strncmp(r->filename, "/redirect:", 10) != 0)
+ return DECLINED;
+
+ gc_scoped_pool pool(r->pool);
httpdDebugRequest(r, "modwiring::handler::input");
// Do an internal redirect
- if (r->filename == NULL || strncmp(r->filename, "/redirect:", 10) != 0)
- return DECLINED;
debug(r->uri, "modwiring::handler::uri");
debug(r->filename, "modwiring::handler::filename");
debug(r->path_info, "modwiring::handler::path info");
@@ -364,7 +369,7 @@ const int postConfigMerge(const ServerCo
return postConfigMerge(mainsc, s->next);
}
-int postConfig(unused apr_pool_t *p, unused apr_pool_t *plog, unused apr_pool_t *ptemp, server_rec *s) {
+int postConfig(apr_pool_t *p, unused apr_pool_t *plog, unused apr_pool_t *ptemp, server_rec *s) {
gc_scoped_pool pool(p);
// Count the calls to post config, skip the first one as
Modified: tuscany/sca-cpp/trunk/modules/server/server-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/server-conf?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-conf (original)
+++ tuscany/sca-cpp/trunk/modules/server/server-conf Sat Aug 14 18:46:26 2010
@@ -57,27 +57,11 @@ ssl=`cat $root/conf/httpd.conf | grep "#
if [ "$ssl" != "" ]; then
cat >>$root/conf/httpd.conf <<EOF
# Configure SSL certificates
-SCAWiringSSLCACertificateFile "$root/conf/ca.crt"
-SCAWiringSSLCertificateFile "$root/conf/server.crt"
-SCAWiringSSLCertificateKeyFile "$root/conf/server.key"
+SCAWiringSSLCACertificateFile "$root/cert/ca.crt"
+SCAWiringSSLCertificateFile "$root/cert/server.crt"
+SCAWiringSSLCertificateKeyFile "$root/cert/server.key"
EOF
fi
-vhost=`cat $root/conf/httpd.conf | grep VirtualDocumentRoot`
-proxy=`cat $root/conf/httpd.conf | grep ProxyPass`
-
-vhost=`cat $root/conf/httpd.conf | grep "# Generated by: vhost-conf"`
-if [ "$vhost" != "" ]; then
- proxy=`cat $root/conf/httpd.conf | grep "# Generated by: proxy-conf"`
- if [ "$proxy" = "" ]; then
- cat >>$root/conf/httpd.conf <<EOF
-# Isolate requests from different virtual hosts
-MaxRequestsPerChild 1
-
-EOF
-
- fi
-fi
-
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/Makefile.am?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/Makefile.am Sat Aug 14 18:46:26 2010
@@ -21,7 +21,7 @@ if WANT_OPENID
if WANT_LOG
if WANT_QUEUE
-dist_sample_SCRIPTS = start stop ssl-start
+dist_sample_SCRIPTS = start stop ssl-start ssl-stop proxy-conf proxy-ssl-conf server-conf server-ssl-conf tunnel-ssl-conf
sampledir = $(prefix)/samples/store-cluster
nobase_dist_sample_DATA = htdocs/*.html htdocs/domains/*/*.html domains/*/*.py domains/*/*.composite
Copied: tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf (from r981352, tuscany/sca-cpp/trunk/modules/http/ssl-ls)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf?p2=tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf&p1=tuscany/sca-cpp/trunk/modules/http/ssl-ls&r1=981352&r2=985561&rev=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/ssl-ls (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf Sat Aug 14 18:46:26 2010
@@ -17,9 +17,10 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a test certification authority certificate
-here=`readlink -f $0`; here=`dirname $here`
-root=`readlink -f $1`
-
-ls $root/conf/*.crt $root/conf/*.key $root/conf/*.pem $root/conf/*.p12 2>/dev/null
+root=$1
+port=$2
+# Configure a proxy balancer
+../../modules/http/httpd-conf $root sca-store.com $port/80 $root/htdocs
+../../modules/http/vhost-conf $root
+../../modules/http/proxy-conf $root
Copied: tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf (from r981352, tuscany/sca-cpp/trunk/components/cache/memcached-start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf?p2=tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf&p1=tuscany/sca-cpp/trunk/components/cache/memcached-start&r1=981352&r2=985561&rev=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf Sat Aug 14 18:46:26 2010
@@ -17,13 +17,16 @@
# specific language governing permissions and limitations
# under the License.
-# Start memcached
-here=`readlink -f $0`; here=`dirname $here`
-port=$1
-if [ "$port" = "" ]; then
- port="11211"
-fi
+root=$1
+port=$2
+sslport=$3
-memcached_prefix=`cat $here/memcached.prefix`
-$memcached_prefix/bin/memcached -d -l 127.0.0.1 -m 4 -p $port
+# Configure an SSL-enabled proxy balancer
+../../modules/http/httpd-conf $root sca-store.com $port/80 $root/htdocs
+../../modules/http/vhost-conf $root
+../../modules/http/proxy-conf $root
+tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C $root -x
+../../modules/http/httpd-ssl-conf $root $sslport/443
+../../modules/http/vhost-ssl-conf $root
+../../modules/http/proxy-ssl-conf $root
Copied: tuscany/sca-cpp/trunk/samples/store-cluster/server-conf (from r981352, tuscany/sca-cpp/trunk/modules/http/proxy-ssl-member-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/server-conf?p2=tuscany/sca-cpp/trunk/samples/store-cluster/server-conf&p1=tuscany/sca-cpp/trunk/modules/http/proxy-ssl-member-conf&r1=981352&r2=985561&rev=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/proxy-ssl-member-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/server-conf Sat Aug 14 18:46:26 2010
@@ -17,17 +17,18 @@
# specific language governing permissions and limitations
# under the License.
-# Add a proxy balancer member
-here=`readlink -f $0`; here=`dirname $here`
-root=`readlink -f $1`
-host=$2
-sslport=`echo $3 | awk -F "/" '{ print $1 }'`
+root=$1
+port=$2
-cat >>$root/conf/vhost-ssl.conf <<EOF
-# Generated by: proxy-ssl-member-conf $*
-# Add proxy balancer member
-BalancerMember balancer://sslcluster https://$host:$sslport
-ProxyPassReverse / https://$host:$sslport/
+# Configure an app server
+../../modules/http/httpd-conf $root sca-store.com $port/80 htdocs
+../../modules/http/vhost-conf $root
+../../modules/server/server-conf $root
+../../modules/python/python-conf $root
+cat >>$root/conf/httpd.conf <<EOF
+# Configure SCA Composite for mass dynamic virtual hosting
+SCAVirtualContribution `pwd`/domains/
+SCAVirtualComposite store.composite
EOF
Copied: tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf (from r981352, tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf?p2=tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf&p1=tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start&r1=981352&r2=985561&rev=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf Sat Aug 14 18:46:26 2010
@@ -17,24 +17,24 @@
# specific language governing permissions and limitations
# under the License.
-# For this sample to work, add the sample domain to your /etc/hosts as follows:
-# 127.0.0.1 sca-store.com jane.sca-store.com joe.sca-store.com
+root=$1
+port=$2
+sslport=$3
-../../modules/http/ssl-ca-conf tmp sca-store.com
-../../modules/http/ssl-cert-conf tmp sca-store.com server
-../../modules/http/ssl-cert-conf tmp *.sca-store.com vhost
-../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
-../../modules/http/vhost-conf tmp
-../../modules/http/httpd-ssl-conf tmp 8453
-../../modules/http/vhost-ssl-conf tmp
-../../modules/server/server-conf tmp
-../../modules/python/python-conf tmp
-cat >>tmp/conf/httpd.conf <<EOF
-# Configure SCA Composite for mass dynamic virtual Hosting
+# Configure an SSL-enabled app server
+../../modules/http/httpd-conf $root sca-store.com $port/80 htdocs
+../../modules/http/vhost-conf $root
+tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C $root -x
+../../modules/http/httpd-ssl-conf $root $sslport/443
+../../modules/http/vhost-ssl-conf $root
+../../modules/openid/openid-conf $root
+../../modules/openid/openid-step2-conf $root
+../../modules/server/server-conf $root
+../../modules/python/python-conf $root
+cat >>$root/conf/httpd.conf <<EOF
+# Configure SCA Composite for mass dynamic virtual hosting
SCAVirtualContribution `pwd`/domains/
SCAVirtualComposite store.composite
EOF
-../../components/cache/memcached-start
-../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start Sat Aug 14 18:46:26 2010
@@ -22,67 +22,27 @@
../../modules/http/ssl-cert-conf tmp/ssl sca-store.com server
../../modules/http/ssl-cert-conf tmp/ssl *.sca-store.com vhost
../../modules/http/ssl-cert-conf tmp/ssl sca-store.com proxy
+../../modules/http/ssl-cert-conf tmp/ssl sca-store.com tunnel
-# Start three identical app servers
-../../modules/http/httpd-conf tmp/server1 sca-store.com 8101/80 htdocs
-../../modules/http/vhost-conf tmp/server1
-cp `../../modules/http/ssl-ls tmp/ssl` tmp/server1/conf
-../../modules/http/httpd-ssl-conf tmp/server1 8441/443
-../../modules/http/vhost-ssl-conf tmp/server1
-../../modules/openid/openid-conf tmp/server1
-../../modules/openid/openid-step2-conf tmp/server1
-../../modules/server/server-conf tmp/server1
-../../modules/python/python-conf tmp/server1
-cat >>tmp/server1/conf/httpd.conf <<EOF
-# Configure SCA Composite for mass dynamic virtual hosting
-SCAVirtualContribution `pwd`/domains/
-SCAVirtualComposite store.composite
+# Start three memcached servers and a tunnel server
+../../components/cache/memcached-start 127.0.0.1:11411
+../../components/cache/memcached-start 127.0.0.1:11412
+../../components/cache/memcached-start 127.0.0.1:11413
+./tunnel-ssl-conf tmp/tunnel1
+../../modules/http/httpd-start tmp/tunnel1
-EOF
+# Start three app servers
+./server-ssl-conf tmp/server1 8101 8441
../../modules/http/httpd-start tmp/server1
-../../modules/http/httpd-conf tmp/server2 sca-store.com 8102/80 htdocs
-../../modules/http/vhost-conf tmp/server2
-cp `../../modules/http/ssl-ls tmp/ssl` tmp/server2/conf
-../../modules/http/httpd-ssl-conf tmp/server2 8442/443
-../../modules/http/vhost-ssl-conf tmp/server2
-../../modules/openid/openid-conf tmp/server2
-../../modules/openid/openid-step2-conf tmp/server2
-../../modules/server/server-conf tmp/server2
-../../modules/python/python-conf tmp/server2
-cat >>tmp/server2/conf/httpd.conf <<EOF
-# Configure SCA Composite for mass dynamic virtual hosting
-SCAVirtualContribution `pwd`/domains/
-SCAVirtualComposite store.composite
-
-EOF
+./server-ssl-conf tmp/server2 8102 8442
../../modules/http/httpd-start tmp/server2
-../../modules/http/httpd-conf tmp/server3 sca-store.com 8103/80 htdocs
-../../modules/http/vhost-conf tmp/server3
-cp `../../modules/http/ssl-ls tmp/ssl` tmp/server3/conf
-../../modules/http/httpd-ssl-conf tmp/server3 8443/443
-../../modules/http/vhost-ssl-conf tmp/server3
-../../modules/openid/openid-conf tmp/server3
-../../modules/openid/openid-step2-conf tmp/server3
-../../modules/server/server-conf tmp/server3
-../../modules/python/python-conf tmp/server3
-cat >>tmp/server3/conf/httpd.conf <<EOF
-# Configure SCA Composite for mass dynamic virtual hosting
-SCAVirtualContribution `pwd`/domains/
-SCAVirtualComposite store.composite
-
-EOF
+./server-ssl-conf tmp/server3 8103 8443
../../modules/http/httpd-start tmp/server3
-# Start two identical proxy balancers
-../../modules/http/httpd-conf tmp/proxy1 sca-store.com 8091/80 tmp/proxy1/htdocs
-../../modules/http/vhost-conf tmp/proxy1
-../../modules/http/proxy-conf tmp/proxy1 sca-store.com 8091/80 tmp/proxy1/htdocs
-cp `../../modules/http/ssl-ls tmp/ssl` tmp/proxy1/conf
-../../modules/http/httpd-ssl-conf tmp/proxy1 8093/443
-../../modules/http/vhost-ssl-conf tmp/proxy1
-../../modules/http/proxy-ssl-conf tmp/proxy1
+# Start two proxy balancers
+./proxy-ssl-conf tmp/proxy1 8091 8093
../../modules/http/proxy-member-conf tmp/proxy1 localhost 8101
../../modules/http/proxy-ssl-member-conf tmp/proxy1 localhost 8441
../../modules/http/proxy-member-conf tmp/proxy1 localhost 8102
@@ -91,13 +51,7 @@ cp `../../modules/http/ssl-ls tmp/ssl` t
../../modules/http/proxy-ssl-member-conf tmp/proxy1 localhost 8443
../../modules/http/httpd-start tmp/proxy1
-../../modules/http/httpd-conf tmp/proxy2 sca-store.com 8092/80 tmp/proxy2/htdocs
-../../modules/http/vhost-conf tmp/proxy2
-../../modules/http/proxy-conf tmp/proxy2 sca-store.com 8092/80 tmp/proxy2/htdocs
-cp `../../modules/http/ssl-ls tmp/ssl` tmp/proxy2/conf
-../../modules/http/httpd-ssl-conf tmp/proxy2 8094/443
-../../modules/http/vhost-ssl-conf tmp/proxy2
-../../modules/http/proxy-ssl-conf tmp/proxy2
+./proxy-ssl-conf tmp/proxy2 8092 8094
../../modules/http/proxy-member-conf tmp/proxy2 localhost 8101
../../modules/http/proxy-ssl-member-conf tmp/proxy2 localhost 8441
../../modules/http/proxy-member-conf tmp/proxy2 localhost 8102
@@ -106,11 +60,6 @@ cp `../../modules/http/ssl-ls tmp/ssl` t
../../modules/http/proxy-ssl-member-conf tmp/proxy2 localhost 8443
../../modules/http/httpd-start tmp/proxy2
-# Start three memcached servers
-../../components/cache/memcached-start 11211
-../../components/cache/memcached-start 11212
-../../components/cache/memcached-start 11213
-
# Redirect traffic from port 80 to 8091 and use proxy1
#../../ubuntu/ip-redirect-all 80 8091
#../../ubuntu/ip-redirect-all 443 8093
Copied: tuscany/sca-cpp/trunk/samples/store-cluster/ssl-stop (from r981352, tuscany/sca-cpp/trunk/components/cache/memcached-start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/ssl-stop?p2=tuscany/sca-cpp/trunk/samples/store-cluster/ssl-stop&p1=tuscany/sca-cpp/trunk/components/cache/memcached-start&r1=981352&r2=985561&rev=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/memcached-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/ssl-stop Sat Aug 14 18:46:26 2010
@@ -17,13 +17,12 @@
# specific language governing permissions and limitations
# under the License.
-# Start memcached
-here=`readlink -f $0`; here=`dirname $here`
-port=$1
-if [ "$port" = "" ]; then
- port="11211"
-fi
-
-memcached_prefix=`cat $here/memcached.prefix`
-$memcached_prefix/bin/memcached -d -l 127.0.0.1 -m 4 -p $port
-
+../../modules/http/httpd-stop tmp/server1
+../../modules/http/httpd-stop tmp/server2
+../../modules/http/httpd-stop tmp/server3
+../../modules/http/httpd-stop tmp/proxy1
+../../modules/http/httpd-stop tmp/proxy2
+../../components/cache/memcached-stop 127.0.0.1:11411
+../../components/cache/memcached-stop 127.0.0.1:11412
+../../components/cache/memcached-stop 127.0.0.1:11413
+../../modules/http/httpd-stop tmp/tunnel1
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/start?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/start Sat Aug 14 18:46:26 2010
@@ -17,65 +17,34 @@
# specific language governing permissions and limitations
# under the License.
-# Start three identical app servers
-../../modules/http/httpd-conf tmp/server1 sca-store.com 8101/80 htdocs
-../../modules/http/vhost-conf tmp/server1
-../../modules/server/server-conf tmp/server1
-../../modules/python/python-conf tmp/server1
-cat >>tmp/server1/conf/httpd.conf <<EOF
-# Configure SCA Composite for mass dynamic virtual hosting
-SCAVirtualContribution `pwd`/domains/
-SCAVirtualComposite store.composite
+# Start three memcached servers
+../../components/cache/memcached-start 11211
+../../components/cache/memcached-start 11212
+../../components/cache/memcached-start 11213
-EOF
+# Start three app servers
+./server-conf tmp/server1 8101
../../modules/http/httpd-start tmp/server1
-../../modules/http/httpd-conf tmp/server2 sca-store.com 8102/80 htdocs
-../../modules/http/vhost-conf tmp/server2
-../../modules/server/server-conf tmp/server2
-../../modules/python/python-conf tmp/server2
-cat >>tmp/server2/conf/httpd.conf <<EOF
-# Configure SCA Composite for mass dynamic virtual hosting
-SCAVirtualContribution `pwd`/domains/
-SCAVirtualComposite store.composite
-
-EOF
+./server-conf tmp/server2 8102
../../modules/http/httpd-start tmp/server2
-../../modules/http/httpd-conf tmp/server3 sca-store.com 8103/80 htdocs
-../../modules/http/vhost-conf tmp/server3
-../../modules/server/server-conf tmp/server3
-../../modules/python/python-conf tmp/server3
-cat >>tmp/server3/conf/httpd.conf <<EOF
-# Configure SCA Composite for mass dynamic virtual hosting
-SCAVirtualContribution `pwd`/domains/
-SCAVirtualComposite store.composite
-
-EOF
+./server-conf tmp/server3 8103
../../modules/http/httpd-start tmp/server3
-# Start two identical proxy balancers
-../../modules/http/httpd-conf tmp/proxy1 sca-store.com 8091/80 tmp/proxy1/htdocs
-../../modules/http/vhost-conf tmp/proxy1
-../../modules/http/proxy-conf tmp/proxy1
+# Start two proxy balancers
+./proxy-conf tmp/proxy1 8091
../../modules/http/proxy-member-conf tmp/proxy1 localhost 8101
../../modules/http/proxy-member-conf tmp/proxy1 localhost 8102
../../modules/http/proxy-member-conf tmp/proxy1 localhost 8103
../../modules/http/httpd-start tmp/proxy1
-../../modules/http/httpd-conf tmp/proxy2 sca-store.com 8092/80 tmp/proxy2/htdocs
-../../modules/http/vhost-conf tmp/proxy2
-../../modules/http/proxy-conf tmp/proxy2
+./proxy-conf tmp/proxy2 8092
../../modules/http/proxy-member-conf tmp/proxy2 localhost 8101
../../modules/http/proxy-member-conf tmp/proxy2 localhost 8102
../../modules/http/proxy-member-conf tmp/proxy2 localhost 8103
../../modules/http/httpd-start tmp/proxy2
-# Start three memcached servers
-../../components/cache/memcached-start 11211
-../../components/cache/memcached-start 11212
-../../components/cache/memcached-start 11213
-
# Redirect traffic from port 80 to 8091 and use proxy1
#../../ubuntu/ip-redirect-all 80 8091
Copied: tuscany/sca-cpp/trunk/samples/store-cluster/tunnel-ssl-conf (from r981352, tuscany/sca-cpp/trunk/samples/store-java/ssl-start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/tunnel-ssl-conf?p2=tuscany/sca-cpp/trunk/samples/store-cluster/tunnel-ssl-conf&p1=tuscany/sca-cpp/trunk/samples/store-java/ssl-start&r1=981352&r2=985561&rev=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/tunnel-ssl-conf Sat Aug 14 18:46:26 2010
@@ -17,20 +17,17 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/ssl-ca-conf tmp localhost
-../../modules/http/ssl-cert-conf tmp localhost
-../../modules/http/httpd-conf tmp localhost 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp 8453
-../../modules/server/server-conf tmp
-../../modules/java/java-conf tmp
-cat >>tmp/conf/httpd.conf <<EOF
-# Configure SCA Composite
-SCAContribution `pwd`/
-SCAComposite store.composite
+root=$1
-EOF
+# Configure SSL tunnels to the memcached servers
+../../modules/http/httpd-conf $root localhost 127.0.0.1:11210 htdocs
+tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C $root -x
+../../modules/http/tunnel-ssl-conf $root 11211 localhost 8441 11411
+../../modules/http/tunnel-ssl-conf $root 11212 localhost 8442 11412
+../../modules/http/tunnel-ssl-conf $root 11213 localhost 8443 11413
-export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd`
+# Configure SSL tunnels to the postgresql servers
+../../modules/http/tunnel-ssl-conf $root 5532 localhost 8441 5432
+../../modules/http/tunnel-ssl-conf $root 5533 localhost 8441 5433
+../../modules/http/tunnel-ssl-conf $root 5534 localhost 8441 5433
-../../components/cache/memcached-start
-../../modules/http/httpd-start tmp
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start Sat Aug 14 18:46:26 2010
@@ -21,6 +21,7 @@
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
+../../modules/http/httpd-auth-conf tmp
../../modules/server/server-conf tmp
../../modules/server/cpp-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-java/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/ssl-start?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/ssl-start Sat Aug 14 18:46:26 2010
@@ -21,6 +21,7 @@
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
+../../modules/http/httpd-auth-conf tmp
../../modules/server/server-conf tmp
../../modules/java/java-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start Sat Aug 14 18:46:26 2010
@@ -21,6 +21,7 @@
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
+../../modules/http/httpd-auth-conf tmp
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start Sat Aug 14 18:46:26 2010
@@ -21,6 +21,7 @@
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/http/httpd-ssl-conf tmp 8453
+../../modules/http/httpd-auth-conf tmp
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start Sat Aug 14 18:46:26 2010
@@ -27,6 +27,7 @@
../../modules/http/vhost-conf tmp
../../modules/http/httpd-ssl-conf tmp 8453
../../modules/http/vhost-ssl-conf tmp
+../../modules/http/httpd-auth-conf tmp
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all?rev=985561&r1=985560&r2=985561&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ubuntu-install-all Sat Aug 14 18:46:26 2010
@@ -44,10 +44,10 @@ sudo apt-get -y install libssl-dev
if [ "$?" != "0" ]; then
exit $?
fi
-wget http://www.apache.org/dist/httpd/httpd-2.2.15.tar.gz
-tar xzf httpd-2.2.15.tar.gz
-cd httpd-2.2.15
-./configure --enable-ssl --enable-proxy --enable-mods-shared=most --with-included-apr --with-mpm=prefork --prefix=$build/httpd-2.2.15-bin
+wget http://www.apache.org/dist/httpd/httpd-2.2.16.tar.gz
+tar xzf httpd-2.2.16.tar.gz
+cd httpd-2.2.16
+./configure --enable-ssl --enable-proxy --enable-mods-shared=most --with-included-apr --with-mpm=prefork --prefix=$build/httpd-2.2.16-bin
make
make install
if [ "$?" != "0" ]; then
@@ -135,7 +135,7 @@ fi
wget 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-libxml2 LIBXML2_CFLAGS="-I$build/libxml2-2.7.7-bin/include/libxml2" LIBXML2_LIBS="-L$build/libxml2-2.7.7-bin/lib -lxml2" --enable-openssl --with-apache2=$build/httpd-2.2.15-bin/include --prefix=$build/axis2c-1.6.0-bin
+./configure --enable-libxml2 LIBXML2_CFLAGS="-I$build/libxml2-2.7.7-bin/include/libxml2" LIBXML2_LIBS="-L$build/libxml2-2.7.7-bin/lib -lxml2" --enable-openssl --with-apache2=$build/httpd-2.2.16-bin/include --prefix=$build/axis2c-1.6.0-bin
make
make install
if [ "$?" != "0" ]; then
@@ -237,7 +237,7 @@ sudo apt-get -y install libpcre3-dev lib
git clone git://github.com/jsdelfino/mod_auth_openid.git
cd mod_auth_openid
./autogen.sh
-./configure --prefix=$build/mod-auth-openid-bin --with-apr=$build/httpd-2.2.15-bin --with-httpd=$build/httpd-2.2.15-bin --with-curl=$build/curl-7.19.5-bin --with-libopkele=$build/libopkele-bin
+./configure --prefix=$build/mod-auth-openid-bin --with-apr=$build/httpd-2.2.16-bin --with-httpd=$build/httpd-2.2.16-bin --with-curl=$build/curl-7.19.5-bin --with-libopkele=$build/libopkele-bin
make
make install
if [ "$?" != "0" ]; then
@@ -250,9 +250,9 @@ sudo apt-get -y install libreadline-dev
if [ "$?" != "0" ]; then
exit $?
fi
-wget ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v9.0beta1/postgresql-9.0beta1.tar.gz
-tar xzf postgresql-9.0beta1.tar.gz
-cd postgresql-9.0beta1
+wget ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v9.0beta4/postgresql-9.0beta4.tar.gz
+tar xzf postgresql-9.0beta4.tar.gz
+cd postgresql-9.0beta4
./configure --prefix=$build/postgresql-9.0-bin
make
make install
@@ -323,7 +323,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-curl=$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 --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-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
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/httpd-2.2.16-bin --with-httpd=$build/httpd-2.2.16-bin --with-memcached=$build/memcached-1.4.4-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-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
make
make install
if [ "$?" != "0" ]; then
@@ -332,5 +332,5 @@ fi
cd $build
# 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.2.15-bin tracemonkey-bin google_appengine libstrophe-bin memcached-1.4.4-bin tinycdb-0.77-bin qpidc-0.6-bin vysper-0.5 postgresql-9.0-bin thrift-0.2.0-bin scribe-2.2-bin libcloud-0.3.1-bin htmltidy-bin libopkele-bin mod-auth-openid-bin
+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.2.16-bin tracemonkey-bin google_appengine libstrophe-bin memcached-1.4.4-bin tinycdb-0.77-bin qpidc-0.6-bin vysper-0.5 postgresql-9.0-bin thrift-0.2.0-bin scribe-2.2-bin libcloud-0.3.1-bin htmltidy-bin libopkele-bin mod-auth-openid-bin