Upgrade to HTTPD 2.4.2, APR 1.4.6, Memcached 1.4.13, Python 2.7.3, Ubuntu 12.04, and Mac OS X 10.7.4.

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

5 files changed, 39 insertions, 18 deletions

diff --git a/sca-cpp/trunk/modules/http/httpd-event-conf b/sca-cpp/trunk/modules/http/httpd-event-conf
index a7cab03bc6..093bbe78d9 100755
--- a/sca-cpp/trunk/modules/http/httpd-event-conf
+++ b/sca-cpp/trunk/modules/http/httpd-event-conf
@@ -31,9 +31,15 @@ cat >$root/conf/mpm.conf <<EOF
 # Use HTTPD event MPM
 LoadModule mpm_event_module ${modules_prefix}/modules/mod_mpm_event.so
 
-# Generated by: httpd-event-conf $*
+EOF
+
+uname=`uname -s`
+if [ $uname = "Darwin" ]; then
+    cat >>$root/conf/mpm.conf <<EOF
+# Generated by: httpd-conf $*
 # Set thread stack size
 ThreadStackSize 2097152
 
 EOF
+fi
 
diff --git a/sca-cpp/trunk/modules/http/httpd-worker-conf b/sca-cpp/trunk/modules/http/httpd-worker-conf
index 84fe6b4a54..0a061dbffa 100755
--- a/sca-cpp/trunk/modules/http/httpd-worker-conf
+++ b/sca-cpp/trunk/modules/http/httpd-worker-conf
@@ -31,9 +31,15 @@ cat >$root/conf/mpm.conf <<EOF
 # Use HTTPD worker MPM
 LoadModule mpm_worker_module ${modules_prefix}/modules/mod_mpm_worker.so
 
-# Generated by: httpd-event-conf $*
+EOF
+
+uname=`uname -s`
+if [ $uname = "Darwin" ]; then
+    cat >>$root/conf/mpm.conf <<EOF
+# Generated by: httpd-conf $*
 # Set thread stack size
 ThreadStackSize 2097152
 
 EOF
+fi
 
diff --git a/sca-cpp/trunk/modules/http/proxy-ssl-conf b/sca-cpp/trunk/modules/http/proxy-ssl-conf
index 1d6ed9693a..ad7f26d83a 100755
--- a/sca-cpp/trunk/modules/http/proxy-ssl-conf
+++ b/sca-cpp/trunk/modules/http/proxy-ssl-conf
@@ -52,16 +52,16 @@ EOF
 cat >>$root/conf/svhost-ssl.conf <<EOF
 # Generated by: proxy-ssl-conf $*
 # Declare proxy SSL client certificates
-SSLProxyCACertificateFile "$root/cert/ca.crt"
-SSLProxyMachineCertificateFile "$root/cert/proxy.pem"
+#SSLProxyCACertificateFile "$root/cert/ca.crt"
+#SSLProxyMachineCertificateFile "$root/cert/proxy.pem"
 
 EOF
 
 cat >>$root/conf/dvhost-ssl.conf <<EOF
 # Generated by: proxy-ssl-conf $*
 # Declare proxy SSL client certificates
-SSLProxyCACertificateFile "$root/cert/ca.crt"
-SSLProxyMachineCertificateFile "$root/cert/proxy.pem"
+#SSLProxyCACertificateFile "$root/cert/ca.crt"
+#SSLProxyMachineCertificateFile "$root/cert/proxy.pem"
 
 EOF
 
diff --git a/sca-cpp/trunk/modules/js/Makefile.am b/sca-cpp/trunk/modules/js/Makefile.am
index 03cf04685f..38627678a1 100644
--- a/sca-cpp/trunk/modules/js/Makefile.am
+++ b/sca-cpp/trunk/modules/js/Makefile.am
@@ -18,22 +18,30 @@
 incl_HEADERS = *.hpp
 incldir = $(prefix)/include/modules/js
 
-BUILT_SOURCES = htdocs/all.js htdocs/all-min.js htdocs/ui-min.css
-htdocs/all.js: htdocs/util.js htdocs/elemutil.js htdocs/xmlutil.js htdocs/atomutil.js htdocs/jsonutil.js htdocs/scdl.js htdocs/ui.js htdocs/component.js
-	cat htdocs/util.js htdocs/elemutil.js htdocs/xmlutil.js htdocs/atomutil.js htdocs/jsonutil.js htdocs/scdl.js htdocs/ui.js htdocs/component.js >htdocs/all.js
+jsfiles = htdocs/util.js htdocs/elemutil.js htdocs/xmlutil.js htdocs/atomutil.js htdocs/jsonutil.js htdocs/scdl.js htdocs/ui.js htdocs/component.js
 
-htdocs/all-min.js: htdocs/all.js
-	../http/minify-js htdocs/all.js htdocs/all-min.js
+BUILT_SOURCES = htdocs/all.js
+htdocs/all.js: ${jsfiles}
+	cat $^ >htdocs/all.js
 
-htdocs/ui-min.css: htdocs/ui.css
-	../http/minify-css htdocs/ui.css htdocs/ui-min.css
+minified = htdocs/all-min.js htdocs/ui-min.css
 
-CLEANFILES = htdocs/all.js htdocs/all-min.js htdocs/ui-min.css
+SUFFIXES = -min.html -min.js -min.css
+.html-min.html:
+	../../modules/http/minify-html $< $@
+
+.js-min.js:
+	../../modules/http/minify-js $< $@
+
+.css-min.css:
+	../../modules/http/minify-css $< $@
+
+CLEANFILES = htdocs/all.js ${minified}
 
 dist_mod_SCRIPTS = js-conf
 moddir = $(prefix)/modules/js
-nobase_dist_mod_DATA = htdocs/*.js htdocs/*.css
-EXTRA_DIST = htdocs/*.js htdocs/*.css htdocs/all.js
+nobase_dist_mod_DATA = ${minified}
+EXTRA_DIST = ${jsfiles} htdocs/ui.css
 
 js_test_SOURCES = js-test.cpp
 js_test_LDFLAGS = -lmozjs 
@@ -45,3 +53,4 @@ noinst_PROGRAMS = js-test
 mod_PROGRAMS = js-shell
 dist_noinst_SCRIPTS = util-test
 TESTS = js-test util-test
+
diff --git a/sca-cpp/trunk/modules/wsgi/Makefile.am b/sca-cpp/trunk/modules/wsgi/Makefile.am
index c41e2bc118..43cffb2254 100644
--- a/sca-cpp/trunk/modules/wsgi/Makefile.am
+++ b/sca-cpp/trunk/modules/wsgi/Makefile.am
@@ -48,11 +48,11 @@ client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 noinst_PROGRAMS = client-test
 
 dist_noinst_SCRIPTS = util-test wsgi-test wiring-test http-test server-test
-TESTS = util-test wsgi-test wiring-test http-test server-test
+TESTS = util-test
 
 if WANT_GAE
 dist_noinst_SCRIPTS += gae-test
-TESTS += gae-test
+TESTS += wsgi-test wiring-test http-test server-test gae-test
 endif
 
 endif