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 2012/07/16 08:47:40 UTC

svn commit: r1361914 [2/3] - in /tuscany/sca-cpp/trunk: ./ hosting/server/ hosting/server/htdocs/ hosting/server/htdocs/account/ hosting/server/htdocs/app/ hosting/server/htdocs/clone/ hosting/server/htdocs/create/ hosting/server/htdocs/delete/ hosting...

Copied: tuscany/sca-cpp/trunk/hosting/server/logic-test (from r1343580, tuscany/sca-cpp/trunk/hosting/server/server-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/logic-test?p2=tuscany/sca-cpp/trunk/hosting/server/logic-test&p1=tuscany/sca-cpp/trunk/hosting/server/server-test&r1=1343580&r2=1361914&rev=1361914&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/hosting/server/proxy-start (from r1343580, tuscany/sca-cpp/trunk/hosting/server/start)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/proxy-start?p2=tuscany/sca-cpp/trunk/hosting/server/proxy-start&p1=tuscany/sca-cpp/trunk/hosting/server/start&r1=1343580&r2=1361914&rev=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/start (original)
+++ tuscany/sca-cpp/trunk/hosting/server/proxy-start Mon Jul 16 06:47:37 2012
@@ -22,8 +22,6 @@
 # 127.0.0.1 www.example.com
 
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
-jsprefix=`echo "import os; print os.path.realpath('$here/../../modules/js')" | python`
-host=`hostname`
 
 # Configure and start logging
 if [ -x ../../components/log/scribe-cat ]; then
@@ -38,7 +36,7 @@ fi
 ../../components/cache/memcached-start tmp 11212
 
 # Configure server
-../../modules/http/httpd-conf tmp www.example.com 8090 htdocs
+../../modules/http/httpd-conf tmp www.example.com 9090 htdocs
 ../../modules/http/httpd-event-conf tmp
 
 # Configure Python component support
@@ -48,38 +46,34 @@ fi
 # Configure server log streaming
 if [ -x ../../components/log/scribe-cat ]; then
     cat >tmp/conf/log.conf <<EOF
-# Generated by: start $*
+# Generated by: proxy-start $*
 LogLevel notice
-ErrorLog "|$here/../../components/log/scribe-cat $host server"
-CustomLog "|$here/../../components/log/scribe-cat $host server" combined
-
-EOF
-
-else
-    cat >tmp/conf/log.conf <<EOF
-# Generated by: start $*
-ErrorLog $here/tmp/logs/error_log
-CustomLog $here/tmp/logs/access_log combined
+ErrorLog "|$here/../../components/log/scribe-cat localhost server"
+CustomLog "|$here/../../components/log/scribe-cat localhost server" combined
 
 EOF
 
 fi
+#../../modules/http/httpd-loglevel-conf tmp debug
 
 # Configure error pages
 cat >>tmp/conf/svhost.conf <<EOF
-# Generated by: start $*
+# Generated by: proxy-start $*
 # Error pages
 ErrorDocument 404 /public/notfound/
 ErrorDocument 401 /public/notauth/
 ErrorDocument 403 /public/notauth/
-ErrorDocument 500 /public/oops/
+ErrorDocument 400 /public/oops/
 ErrorDocument 405 /public/oops/
+ErrorDocument 500 /public/oops/
+ErrorDocument 502 /public/oops/
+ErrorDocument 503 /public/oops/
 
 EOF
 
 # Configure SCA contributions
 cat >>tmp/conf/httpd.conf <<EOF
-# Generated by: start $*
+# Generated by: proxy-start $*
 # Configure SCA Composite
 SCAContribution $here/
 SCAComposite server.composite
@@ -89,11 +83,14 @@ SCAComposite server.composite
 #SCAVirtualComposite app.composite
 SCAVirtualContributor Composites
 
+# Configure SCA wiring timeout
+SCAWiringTimeout 10
+
 EOF
 
 # Configure resource aliases
 cat >>tmp/conf/httpd.conf <<EOF
-# Generated by: start $*
+# Generated by: proxy-start $*
 Alias /home/home.png $here/htdocs/home/home.png
 Alias /home/home.b64 $here/htdocs/home/home.b64
 Alias /proxy/public/config.js $here/htdocs/public/config.js
@@ -101,23 +98,67 @@ Alias /proxy/public/config-min.js $here/
 
 EOF
 
-# Create app implementation resource links
-if [ ! -e "nuvem" ]; then
-    ln -s "../../../nuvem/nuvem-parallel/nuvem" "nuvem"
-fi
-if [ ! -e "lib" ]; then
-    ln -s "../../components" "lib"
-fi
-
 # Configure app resource aliases
 cat >>tmp/conf/svhost.conf <<EOF
-# Generated by: start $*
+# Generated by: proxy-start $*
 # Map /v/<app-name>/<path> to htdocs/app/<path>
 AliasMatch /v/([^/]+)(.*)$ $here/htdocs/app\$2
 
 EOF
 
 # Start server
-#../../modules/http/httpd-loglevel-conf tmp debug
 ../../modules/http/httpd-start tmp
 
+# Clear document cache
+rm -rf tmp/proxy/cache
+
+# Configure proxy balancer
+../../modules/http/httpd-conf tmp/proxy www.example.com 8090 tmp/htdocs
+../../modules/http/alt-host-conf tmp/proxy ww1.example.com
+../../modules/http/alt-host-conf tmp/proxy ww2.example.com
+../../modules/http/proxy-conf tmp/proxy
+../../modules/js/js-conf tmp/proxy
+../../modules/http/httpd-event-conf tmp/proxy
+#../../modules/http/cache-conf tmp/proxy
+
+# Configure proxy balancer members
+../../modules/http/proxy-member-conf tmp/proxy localhost 9090
+
+# Configure proxy log streaming
+if [ -x ../../components/log/scribe-cat ]; then
+    cat >tmp/proxy/conf/log.conf <<EOF
+# Generated by: proxy-start $*
+ErrorLog "|$here/../../components/log/scribe-cat www.example.com proxy"
+CustomLog "|$here/../../components/log/scribe-cat www.example.com access" combined
+
+EOF
+
+fi
+#../../modules/http/httpd-loglevel-conf tmp/proxy debug
+
+# Configure resource aliases
+cat >>tmp/proxy/conf/httpd.conf <<EOF
+# Generated by: proxy-start $*
+Alias /proxy/public/config.js $here/htdocs/public/config.js
+Alias /proxy/public/config-min.js $here/htdocs/public/config-min.js
+
+EOF
+
+# Configure error pages
+cat >>tmp/proxy/conf/vhost.conf <<EOF
+# Generated by: proxy-start $*
+# Error pages
+ErrorDocument 404 /proxy/public/oops/
+ErrorDocument 401 /proxy/public/oops/
+ErrorDocument 403 /proxy/public/oops/
+ErrorDocument 400 /proxy/public/oops/
+ErrorDocument 405 /proxy/public/oops/
+ErrorDocument 500 /proxy/public/oops/
+ErrorDocument 502 /proxy/public/oops/
+ErrorDocument 503 /proxy/public/oops/
+
+EOF
+
+# Start proxy balancer
+../../modules/http/httpd-start tmp/proxy
+

Modified: tuscany/sca-cpp/trunk/hosting/server/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/server-test?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/server-test (original)
+++ tuscany/sca-cpp/trunk/hosting/server/server-test Mon Jul 16 06:47:37 2012
@@ -17,12 +17,15 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Run Python test cases
-here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
-python_prefix=`cat $here/../../modules/python/python.prefix`
-export LD_LIBRARY_PATH=$python_prefix/lib:$LD_LIBRARY_PATH
+# Setup
+./ssl-proxy-start
+sleep 2
 
-$python_prefix/bin/python test.py 2>/dev/null
+# Test
+./client-test 2>/dev/null
 rc=$?
 
+# Cleanup
+./stop
+sleep 2
 exit $rc

Added: tuscany/sca-cpp/trunk/hosting/server/ssl-proxy-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/ssl-proxy-start?rev=1361914&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/ssl-proxy-start (added)
+++ tuscany/sca-cpp/trunk/hosting/server/ssl-proxy-start Mon Jul 16 06:47:37 2012
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+# For this module to work, add the www.example.com domain to your /etc/hosts as
+# follows:
+# 127.0.0.1 www.example.com
+
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
+
+# Configure and start logging
+if [ -x ../../components/log/scribe-cat ]; then
+    ../../components/log/scribed-central-conf tmp
+    ../../components/log/scribed-client-conf tmp localhost
+    ../../components/log/scribed-central-start tmp
+    ../../components/log/scribed-client-start tmp
+fi
+
+# Start memcached
+../../components/cache/memcached-start tmp 11211
+../../components/cache/memcached-start tmp 11212
+
+# Configure server
+../../modules/http/httpd-conf tmp www.example.com 9090 htdocs
+../../modules/http/httpd-event-conf tmp
+
+# Configure HTTP basic auth
+../../modules/http/basic-auth-conf tmp component
+
+# Configure OAuth authentication
+# Configure your OAuth app keys here
+../../modules/oauth/oauth-conf tmp component
+../../modules/oauth/oauth-memcached-conf tmp localhost 11212
+../../modules/oauth/oauth2-appkey-conf tmp facebook.com 12345 67890
+../../modules/oauth/oauth2-appkey-conf tmp google.com 12345 67890
+
+# Configure form-based authentication
+../../modules/http/open-auth-conf tmp component 80b67f38-b79e-4a72-bb5c-22c69fb00820
+
+# Configure authorized admins
+../../modules/http/passwd-auth-conf tmp admin admin
+
+# Configure Python component support
+../../modules/server/server-conf tmp
+../../modules/python/python-conf tmp
+
+# Configure server log streaming
+if [ -x ../../components/log/scribe-cat ]; then
+    cat >tmp/conf/log.conf <<EOF
+# Generated by: ssl-proxy-start $*
+LogLevel notice
+ErrorLog "|$here/../../components/log/scribe-cat localhost server"
+CustomLog "|$here/../../components/log/scribe-cat localhost server" combined
+
+EOF
+
+fi
+../../modules/http/httpd-loglevel-conf tmp debug
+
+# Configure error pages
+cat >>tmp/conf/svhost.conf <<EOF
+# Generated by: ssl-proxy-start $*
+# Error pages
+ErrorDocument 404 /public/notfound/
+ErrorDocument 401 /public/notauth/
+ErrorDocument 403 /public/notauth/
+ErrorDocument 400 /public/oops/
+ErrorDocument 405 /public/oops/
+ErrorDocument 500 /public/oops/
+ErrorDocument 502 /public/oops/
+ErrorDocument 503 /public/oops/
+
+EOF
+
+# Configure SCA contributions
+cat >>tmp/conf/httpd.conf <<EOF
+# Generated by: ssl-proxy-start $*
+# Configure SCA Composite
+SCAContribution $here/
+SCAComposite server.composite
+
+# Configure SCA Composite for mass dynamic virtual Hosting
+SCAVirtualContributor Composites
+
+# Configure SCA Authenticator component
+SCAAuthenticator Authenticator
+
+# Configure SCA wiring timeout
+SCAWiringTimeout 10
+
+EOF
+
+# Configure resource aliases
+cat >>tmp/conf/httpd.conf <<EOF
+# Generated by: ssl-proxy-start $*
+Alias /home/home.png $here/htdocs/home/home.png
+Alias /home/home.b64 $here/htdocs/home/home.b64
+Alias /proxy/public/config.js $here/htdocs/public/config.js
+Alias /proxy/public/config-min.js $here/public/config-min.js
+
+EOF
+
+# Configure app resource aliases
+cat >>tmp/conf/svhost-ssl.conf <<EOF
+# Generated by: ssl-proxy-start $*
+# Map /v/<app-name>/<path> to htdocs/app/<path>
+AliasMatch /v/([^/]+)(.*)$ $here/htdocs/app\$2
+
+EOF
+
+# Configure admin access to server status and info
+cat >tmp/conf/adminauth.conf <<EOF
+# Generated by: ssl-proxy-start $*
+# Allow the server admin to view the server status and info
+<Location /server-status>
+AuthType None
+Require all granted
+</Location>
+
+<Location /server-info>
+AuthType None
+Require all granted
+</Location>
+
+EOF
+
+# Configure admin access to components
+cat >>tmp/conf/locauth-ssl.conf <<EOF
+# Generated by: ssl-proxy-start $*
+# Allow the server admin to access all components
+<Location /c>
+Require user admin
+</Location>
+<Location /r>
+Require user admin
+</Location>
+<Location /r/Editor>
+Require valid-user
+</Location>
+<Location /r/App>
+Require valid-user
+</Location>
+EOF
+
+# Start server
+../../modules/http/httpd-start tmp
+sleep 2
+
+# Configure authorized users
+./put-auth tmp admin admin admin admin
+./put-auth tmp admin admin john john
+./put-auth tmp admin admin jane jane
+# Configure the email addresses associated with your OAuth ids here
+./put-auth tmp admin admin /oauth1/john@example.com password
+./put-auth tmp admin admin /oauth2/jane@example.com password
+
+# Clear document cache
+rm -rf tmp/proxy/cache
+
+# Create SSL certificates
+../../modules/http/ssl-ca-conf tmp/proxy www.example.com
+../../modules/http/ssl-cert-conf tmp/proxy www.example.com server
+
+# Configure proxy balancer
+../../modules/http/httpd-conf tmp/proxy www.example.com 8090 tmp/htdocs
+../../modules/http/alt-host-conf tmp/proxy ww1.example.com
+../../modules/http/alt-host-conf tmp/proxy ww2.example.com
+../../modules/http/proxy-conf tmp/proxy
+../../modules/js/js-conf tmp/proxy
+../../modules/http/httpd-event-conf tmp/proxy
+#../../modules/http/cache-conf tmp/proxy
+../../modules/http/httpd-ssl-conf tmp/proxy 8453
+../../modules/http/proxy-ssl-conf tmp/proxy
+#../../modules/http/cache-ssl-conf tmp/proxy
+
+# Configure password authentication
+../../modules/http/basic-auth-conf tmp/proxy file /balancer-manager
+../../modules/http/basic-auth-conf tmp/proxy file /server-status
+../../modules/http/passwd-auth-conf tmp/proxy file admin admin
+
+# Configure mod-security
+../../modules/http/mod-security-conf tmp/proxy
+#../../modules/http/mod-security-audit-conf tmp/proxy
+
+# Configure proxy balancer members
+../../modules/http/proxy-ssl-nossl-member-conf tmp/proxy localhost 9090
+
+# Configure proxy log streaming
+if [ -x ../../components/log/scribe-cat ]; then
+    cat >tmp/proxy/conf/log.conf <<EOF
+# Generated by: ssl-proxy-start $*
+ErrorLog "|$here/../../components/log/scribe-cat www.example.com proxy"
+CustomLog "|$here/../../components/log/scribe-cat www.example.com access" combined
+
+EOF
+
+    cat >tmp/proxy/conf/log-ssl.conf <<EOF
+# Generated by: ssl-proxy-start $*
+CustomLog "|$here/../../components/log/scribe-cat www.example.com access" sslcombined
+
+EOF
+
+#    cat >tmp/proxy/conf/mod-security-audit-log.conf <<EOF
+## Generated by: start $*
+#SecAuditLog "|$here/../../components/log/scribe-cat $host secaudit secaudit"
+#
+#EOF
+
+fi
+../../modules/http/httpd-loglevel-conf tmp/proxy debug
+
+# Configure resource aliases
+cat >>tmp/proxy/conf/httpd.conf <<EOF
+# Generated by: ssl-proxy-start $*
+Alias /proxy/public/config.js $here/htdocs/public/config.js
+Alias /proxy/public/config-min.js $here/htdocs/public/config-min.js
+
+EOF
+
+# Configure error pages
+cat >>tmp/proxy/conf/vhost-ssl.conf <<EOF
+# Generated by: ssl-proxy-start $*
+# Error pages
+ErrorDocument 404 /proxy/public/oops/
+ErrorDocument 401 /proxy/public/oops/
+ErrorDocument 403 /proxy/public/oops/
+ErrorDocument 400 /proxy/public/oops/
+ErrorDocument 405 /proxy/public/oops/
+ErrorDocument 500 /proxy/public/oops/
+ErrorDocument 502 /proxy/public/oops/
+ErrorDocument 503 /proxy/public/oops/
+
+EOF
+
+# Start proxy balancer
+../../modules/http/httpd-start tmp/proxy
+

Propchange: tuscany/sca-cpp/trunk/hosting/server/ssl-proxy-start
------------------------------------------------------------------------------
    svn:executable = *

Modified: tuscany/sca-cpp/trunk/hosting/server/start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/start?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/start (original)
+++ tuscany/sca-cpp/trunk/hosting/server/start Mon Jul 16 06:47:37 2012
@@ -22,7 +22,6 @@
 # 127.0.0.1 www.example.com
 
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
-jsprefix=`echo "import os; print os.path.realpath('$here/../../modules/js')" | python`
 host=`hostname`
 
 # Configure and start logging
@@ -37,9 +36,15 @@ fi
 ../../components/cache/memcached-start tmp 11211
 ../../components/cache/memcached-start tmp 11212
 
+# Clear document cache
+rm -rf tmp/cache
+
 # Configure server
 ../../modules/http/httpd-conf tmp www.example.com 8090 htdocs
+../../modules/http/alt-host-conf tmp ww1.example.com
+../../modules/http/alt-host-conf tmp ww2.example.com
 ../../modules/http/httpd-event-conf tmp
+#../../modules/http/cache-conf tmp
 
 # Configure Python component support
 ../../modules/server/server-conf tmp
@@ -64,6 +69,7 @@ CustomLog $here/tmp/logs/access_log comb
 EOF
 
 fi
+#../../modules/http/httpd-loglevel-conf tmp debug
 
 # Configure error pages
 cat >>tmp/conf/svhost.conf <<EOF
@@ -72,8 +78,11 @@ cat >>tmp/conf/svhost.conf <<EOF
 ErrorDocument 404 /public/notfound/
 ErrorDocument 401 /public/notauth/
 ErrorDocument 403 /public/notauth/
-ErrorDocument 500 /public/oops/
+ErrorDocument 400 /public/oops/
 ErrorDocument 405 /public/oops/
+ErrorDocument 500 /public/oops/
+ErrorDocument 502 /public/oops/
+ErrorDocument 503 /public/oops/
 
 EOF
 
@@ -89,6 +98,9 @@ SCAComposite server.composite
 #SCAVirtualComposite app.composite
 SCAVirtualContributor Composites
 
+# Configure SCA wiring timeout
+SCAWiringTimeout 10
+
 EOF
 
 # Configure resource aliases
@@ -101,14 +113,6 @@ Alias /proxy/public/config-min.js $here/
 
 EOF
 
-# Create app implementation resource links
-if [ ! -e "nuvem" ]; then
-    ln -s "../../../nuvem/nuvem-parallel/nuvem" "nuvem"
-fi
-if [ ! -e "lib" ]; then
-    ln -s "../../components" "lib"
-fi
-
 # Configure app resource aliases
 cat >>tmp/conf/svhost.conf <<EOF
 # Generated by: start $*
@@ -118,6 +122,5 @@ AliasMatch /v/([^/]+)(.*)$ $here/htdocs/
 EOF
 
 # Start server
-#../../modules/http/httpd-loglevel-conf tmp debug
 ../../modules/http/httpd-start tmp
 

Modified: tuscany/sca-cpp/trunk/hosting/server/stop
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/stop?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/stop (original)
+++ tuscany/sca-cpp/trunk/hosting/server/stop Mon Jul 16 06:47:37 2012
@@ -17,6 +17,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+../../modules/http/httpd-stop tmp/proxy
 ../../modules/http/httpd-stop tmp
 
 ../../components/cache/memcached-stop tmp 11211

Modified: tuscany/sca-cpp/trunk/modules/http/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/Makefile.am?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/http/Makefile.am Mon Jul 16 06:47:37 2012
@@ -20,7 +20,7 @@ INCLUDES = -I${HTTPD_INCLUDE}
 incl_HEADERS = *.hpp
 incldir = $(prefix)/include/modules/http
 
-dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf basic-auth-conf cert-auth-conf form-auth-conf open-auth-conf passwd-auth-conf group-auth-conf proxy-conf proxy-base-conf proxy-ssl-conf proxy-balancer-conf proxy-member-conf proxy-ssl-member-conf proxy-ssl-nossl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf httpd-worker-conf httpd-event-conf httpd-loglevel-conf minify-html minify-js minify-css
+dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf basic-auth-conf cert-auth-conf form-auth-conf open-auth-conf passwd-auth-conf group-auth-conf cache-conf cache-ssl-conf cache-manifest proxy-conf proxy-base-conf proxy-ssl-conf proxy-balancer-conf proxy-member-conf proxy-ssl-member-conf proxy-ssl-nossl-member-conf alt-host-conf mass-host-conf mass-host-ssl-conf httpd-tunnel-ssl-conf tunnel-ssl-conf httpd-worker-conf httpd-event-conf httpd-loglevel-conf minify-html minify-js minify-css
 moddir = $(prefix)/modules/http
 
 curl_test_SOURCES = curl-test.cpp

Copied: tuscany/sca-cpp/trunk/modules/http/alt-host-conf (from r1343580, tuscany/sca-cpp/trunk/hosting/server/server-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/alt-host-conf?p2=tuscany/sca-cpp/trunk/modules/http/alt-host-conf&p1=tuscany/sca-cpp/trunk/hosting/server/server-test&r1=1343580&r2=1361914&rev=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/server-test (original)
+++ tuscany/sca-cpp/trunk/modules/http/alt-host-conf Mon Jul 16 06:47:37 2012
@@ -17,12 +17,16 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Run Python test cases
+# Generate an alternate host name configuration
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
-python_prefix=`cat $here/../../modules/python/python.prefix`
-export LD_LIBRARY_PATH=$python_prefix/lib:$LD_LIBRARY_PATH
+mkdir -p $1
+root=`echo "import os; print os.path.realpath('$1')" | python`
 
-$python_prefix/bin/python test.py 2>/dev/null
-rc=$?
+host=$2
+
+cat >>$root/conf/hostcond.conf <<EOF
+# Generated by: alt-host-conf $*
+RewriteCond %{HTTP_HOST} !^$host [NC]
+
+EOF
 
-exit $rc

Copied: tuscany/sca-cpp/trunk/modules/http/cache-conf (from r1343580, tuscany/sca-cpp/trunk/hosting/server/server-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/cache-conf?p2=tuscany/sca-cpp/trunk/modules/http/cache-conf&p1=tuscany/sca-cpp/trunk/hosting/server/server-test&r1=1343580&r2=1361914&rev=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/server-test (original)
+++ tuscany/sca-cpp/trunk/modules/http/cache-conf Mon Jul 16 06:47:37 2012
@@ -17,12 +17,25 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Run Python test cases
+# Generate a minimal HTTPD cache configuration
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
-python_prefix=`cat $here/../../modules/python/python.prefix`
-export LD_LIBRARY_PATH=$python_prefix/lib:$LD_LIBRARY_PATH
+mkdir -p $1
+root=`echo "import os; print os.path.realpath('$1')" | python`
 
-$python_prefix/bin/python test.py 2>/dev/null
-rc=$?
+mkdir -p $root/cache
+
+cat >>$root/conf/vhost.conf <<EOF
+# Generated by: cache-conf $*
+
+# Enable caching
+CacheEnable disk / 
+CacheQuickHandler Off
+CacheRoot $root/cache
+CacheHeader On
+#CacheDetailHeader On
+CacheIgnoreQueryString On
+CacheIgnoreCacheControl On
+CacheIgnoreHeaders Set-Cookie
+
+EOF
 
-exit $rc

Copied: tuscany/sca-cpp/trunk/modules/http/cache-manifest (from r1343580, tuscany/sca-cpp/trunk/hosting/server/stop)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/cache-manifest?p2=tuscany/sca-cpp/trunk/modules/http/cache-manifest&p1=tuscany/sca-cpp/trunk/hosting/server/stop&r1=1343580&r2=1361914&rev=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/stop (original)
+++ tuscany/sca-cpp/trunk/modules/http/cache-manifest Mon Jul 16 06:47:37 2012
@@ -17,13 +17,10 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-../../modules/http/httpd-stop tmp
-
-../../components/cache/memcached-stop tmp 11211
-../../components/cache/memcached-stop tmp 11212
-
-if [ -x ../../components/log/scribe-cat ]; then
-    ../../components/log/scribed-client-stop tmp
-    ../../components/log/scribed-central-stop tmp
-fi
+# Generate a cache-manifest.cmf file from a template and the list
+# of files in the cached application
+root=$1
+shift
+sha=`cat $* | shasum | awk '{ print $1 }'`
+cat $root/cache-template.cmf | sed -e "s/SHA1/$sha/" >$root/cache-manifest.cmf
 

Copied: tuscany/sca-cpp/trunk/modules/http/cache-ssl-conf (from r1343580, tuscany/sca-cpp/trunk/hosting/server/server-test)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/cache-ssl-conf?p2=tuscany/sca-cpp/trunk/modules/http/cache-ssl-conf&p1=tuscany/sca-cpp/trunk/hosting/server/server-test&r1=1343580&r2=1361914&rev=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/server-test (original)
+++ tuscany/sca-cpp/trunk/modules/http/cache-ssl-conf Mon Jul 16 06:47:37 2012
@@ -17,12 +17,25 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Run Python test cases
+# Generate a minimal HTTPD cache configuration
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
-python_prefix=`cat $here/../../modules/python/python.prefix`
-export LD_LIBRARY_PATH=$python_prefix/lib:$LD_LIBRARY_PATH
+mkdir -p $1
+root=`echo "import os; print os.path.realpath('$1')" | python`
 
-$python_prefix/bin/python test.py 2>/dev/null
-rc=$?
+mkdir -p $root/cache
+
+cat >>$root/conf/vhost-ssl.conf <<EOF
+# Generated by: cache-conf $*
+
+# Enable caching
+CacheEnable disk / 
+CacheQuickHandler Off
+CacheRoot $root/cache
+CacheHeader On
+#CacheDetailHeader On
+CacheIgnoreQueryString On
+CacheIgnoreCacheControl On
+CacheIgnoreHeaders Set-Cookie
+
+EOF
 
-exit $rc

Modified: tuscany/sca-cpp/trunk/modules/http/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/http/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -22,7 +22,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>It works</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/http/htdocs/login/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/htdocs/login/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/htdocs/login/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/http/htdocs/login/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign in</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/http/htdocs/logout/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/htdocs/logout/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/htdocs/logout/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/http/htdocs/logout/index.html Mon Jul 16 06:47:37 2012
@@ -23,8 +23,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign out</title>
 </head>
 <h1>Sign out</h1>

Modified: tuscany/sca-cpp/trunk/modules/http/httpd-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-conf?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-conf Mon Jul 16 06:47:37 2012
@@ -22,8 +22,6 @@ here=`echo "import os; print os.path.rea
 mkdir -p $1
 root=`echo "import os; print os.path.realpath('$1')" | python`
 
-jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python`
-
 host=$2
 port=`$here/httpd-addr port $3`
 pport=`$here/httpd-addr pport $3`
@@ -44,8 +42,10 @@ group=`id -gn`
 uname=`uname -s`
 if [ $uname = "Darwin" ]; then
     libsuffix=".dylib"
+    sendfile=Off
 else
     libsuffix=".so"
+    sendfile=On
 fi
 
 modules_prefix=`cat $here/httpd-modules.prefix`
@@ -76,6 +76,8 @@ Timeout 45
 RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
 LimitRequestBody 1048576
 HostNameLookups Off
+#MaxKeepAliveRequests 25
+#MaxConnectionsPerChild 100
 
 # Log HTTP requests
 # [timestamp] [access] remote-host remote-ident remote-user "request-line"
@@ -92,9 +94,13 @@ AddCharset utf-8 .html .js .css
 # Configure cache control
 <Directory />
 ExpiresActive On
-ExpiresDefault M604800
+ExpiresDefault A604800
+Header onsuccess merge Cache-Control public env=!private-cache
 </Directory>
 
+# Enable Linux Kernel sendfile
+EnableSendFile $sendfile
+
 # Configure auth modules
 Include conf/auth.conf
 
@@ -133,7 +139,7 @@ ServerName http://$host$pportsuffix
 
 <Location />
 RewriteEngine on
-RewriteCond %{HTTP_HOST} !^$host [NC]
+Include conf/hostcond.conf
 RewriteCond %{HTTP:X-Forwarded-Server} ^$ [NC]
 RewriteCond %{REQUEST_URI} !^/server-status [NC]
 RewriteCond %{REQUEST_URI} !^/balancer-manager [NC]
@@ -166,11 +172,16 @@ cat >$root/conf/mpm.conf <<EOF
 # Generated by: httpd-conf $*
 LoadModule mpm_prefork_module ${modules_prefix}/modules/mod_mpm_prefork.so
 
+EOF
+
+if [ $uname = "Darwin" ]; then
+    cat >>$root/conf/mpm.conf <<EOF
 # Generated by: httpd-conf $*
 # Set thread stack size
 ThreadStackSize 2097152
 
 EOF
+fi
 
 # Generate modules list
 cat >$root/conf/modules.conf <<EOF
@@ -181,6 +192,7 @@ cat >$root/conf/modules.conf <<EOF
 LoadModule headers_module ${modules_prefix}/modules/mod_headers.so
 LoadModule alias_module ${modules_prefix}/modules/mod_alias.so
 LoadModule authn_file_module ${modules_prefix}/modules/mod_authn_file.so
+LoadModule authn_socache_module ${modules_prefix}/modules/mod_authn_socache.so
 LoadModule authn_core_module ${modules_prefix}/modules/mod_authn_core.so
 LoadModule authz_host_module ${modules_prefix}/modules/mod_authz_host.so
 LoadModule authz_groupfile_module ${modules_prefix}/modules/mod_authz_groupfile.so
@@ -197,8 +209,9 @@ LoadModule proxy_connect_module ${module
 LoadModule proxy_http_module ${modules_prefix}/modules/mod_proxy_http.so
 LoadModule proxy_balancer_module ${modules_prefix}/modules/mod_proxy_balancer.so
 LoadModule lbmethod_byrequests_module ${modules_prefix}/modules/mod_lbmethod_byrequests.so
-LoadModule ssl_module ${modules_prefix}/modules/mod_ssl.so
 LoadModule socache_shmcb_module ${modules_prefix}/modules/mod_socache_shmcb.so
+LoadModule cache_module ${modules_prefix}/modules/mod_cache.so
+LoadModule cache_disk_module ${modules_prefix}/modules/mod_cache_disk.so
 LoadModule rewrite_module ${modules_prefix}/modules/mod_rewrite.so
 LoadModule mime_module ${modules_prefix}/modules/mod_mime.so
 LoadModule status_module ${modules_prefix}/modules/mod_status.so
@@ -218,12 +231,10 @@ LoadModule actions_module ${modules_pref
 LoadModule unixd_module ${modules_prefix}/modules/mod_unixd.so
 LoadModule session_module ${modules_prefix}/modules/mod_session.so
 LoadModule session_crypto_module ${modules_prefix}/modules/mod_session_crypto.so
-LoadModule session_cookie_module ${modules_prefix}/modules/mod_session_cookie.so
 LoadModule slotmem_shm_module ${modules_prefix}/modules/mod_slotmem_shm.so
 LoadModule ratelimit_module ${modules_prefix}/modules/mod_ratelimit.so
 LoadModule reqtimeout_module ${modules_prefix}/modules/mod_reqtimeout.so
-
-LoadModule mod_tuscany_ssltunnel $here/libmod_tuscany_ssltunnel$libsuffix
+LoadModule ssl_module ${modules_prefix}/modules/mod_ssl.so
 
 EOF
 
@@ -303,7 +314,6 @@ cat >$root/conf/httpd.groups <<EOF
 # Generated by: httpd-conf $*
 EOF
 
-
 # Allow public access to server resources
 cat >$root/conf/noauth.conf <<EOF
 # Generated by: httpd-conf $*
@@ -331,7 +341,7 @@ UseCanonicalName Off
 
 # Enable HTTP reverse proxy
 ProxyRequests Off
-ProxyPreserveHost Off
+ProxyPreserveHost On
 ProxyStatus On
 
 # Enable server status
@@ -356,3 +366,10 @@ Include conf/vhost.conf
 
 EOF
 
+# Generate host name check condition
+cat >$root/conf/hostcond.conf <<EOF
+# Generated by: httpd-conf $*
+RewriteCond %{HTTP_HOST} !^$host [NC]
+
+EOF
+

Modified: tuscany/sca-cpp/trunk/modules/http/httpd.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd.hpp?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd.hpp Mon Jul 16 06:47:37 2012
@@ -26,6 +26,7 @@
  * HTTPD module implementation functions.
  */
 
+extern "C" {
 #include <apr_strings.h>
 #include <apr_fnmatch.h>
 #include <apr_lib.h>
@@ -72,6 +73,7 @@
 #include <ap_provider.h>
 #include <mod_auth.h>
 #include <mod_session.h>
+}
 
 #include "string.hpp"
 #include "stream.hpp"
@@ -154,6 +156,14 @@ const string hostName(request_rec* r, co
 }
 
 /**
+ * Convert a host name to a realm.
+ */
+const string realm(const string& host) {
+    const string pre = substr(host, 0, 4);
+    return pre == "www." || pre == "ww1." || pre == "ww2." || pre == "ww3."? substr(host, 4) : host;
+}
+
+/**
  * Return the protocol scheme for a server.
  */
 const string scheme(const server_rec* s, const string& def = "http") {
@@ -410,6 +420,7 @@ const failable<int> writeResult(const fa
     // Make sure browsers come back and check for updated dynamic content
     apr_table_set(r->headers_out, "Cache-Control", "must-revalidate, max-age=0");
     apr_table_set(r->headers_out, "Expires", "Tue, 01 Jan 1980 00:00:00 GMT");
+    apr_table_set(r->subprocess_env, "private-cache", "1");
 
     // Compute and return an Etag for the returned content
     const string etag(ap_md5_binary(r->pool, (const unsigned char*)c_str(ob), (int)length(ob)));
@@ -474,9 +485,9 @@ const bool redirectFilters(ap_filter_t* 
  * Create an HTTPD internal redirect request.
  * Similar to httpd/modules/http/http_request.c::internal_internal_redirect.
  */
-const failable<request_rec*, int> internalRedirectRequest(const string& nr_uri, request_rec* r) {
+const failable<request_rec*> internalRedirectRequest(const string& nr_uri, request_rec* r) {
     if (ap_is_recursion_limit_exceeded(r))
-        return mkfailure<request_rec*, int>(HTTP_INTERNAL_SERVER_ERROR);
+        return mkfailure<request_rec*>("Redirect recursion limit exceeded", HTTP_INTERNAL_SERVER_ERROR);
 
     // Create a new request
     request_rec* nr = (request_rec*)apr_pcalloc(r->pool, sizeof(request_rec));
@@ -532,7 +543,7 @@ const failable<request_rec*, int> intern
     redirectFilters(nr->output_filters, r, nr);
     const int rrc = ap_run_post_read_request(nr);
     if (rrc != OK && rrc != DECLINED)
-        return mkfailure<request_rec*, int>(rrc);
+        return mkfailure<request_rec*>("Error handling internal redirect", rrc);
 
     return nr;
 }
@@ -561,9 +572,9 @@ const int internalRedirect(request_rec* 
  */
 const int internalRedirect(const string& uri, request_rec* r) {
     debug(uri, "httpd::internalRedirect");
-    const failable<request_rec*, int> nr = httpd::internalRedirectRequest(uri, r);
+    const failable<request_rec*> nr = httpd::internalRedirectRequest(uri, r);
     if (!hasContent(nr))
-        return reason(nr);
+        return rcode(nr);
     return httpd::internalRedirect(content(nr));
 }
 
@@ -571,9 +582,9 @@ const int internalRedirect(const string&
  * Create an HTTPD sub request.
  * Similar to httpd/server/request.c::make_sub_request
  */
-const failable<request_rec*, int> internalSubRequest(const string& nr_uri, request_rec* r) {
+const failable<request_rec*> internalSubRequest(const string& nr_uri, request_rec* r) {
     if (ap_is_recursion_limit_exceeded(r))
-        return mkfailure<request_rec*, int>(HTTP_INTERNAL_SERVER_ERROR);
+        return mkfailure<request_rec*>("Redirect recursion limit exceeded", HTTP_INTERNAL_SERVER_ERROR);
 
     // Create a new sub pool
     apr_pool_t *nrp;
@@ -640,7 +651,8 @@ const int externalRedirect(const string&
     debug(uri, "httpd::externalRedirect");
     r->status = HTTP_MOVED_TEMPORARILY;
     apr_table_setn(r->headers_out, "Location", apr_pstrdup(r->pool, c_str(uri)));
-    apr_table_setn(r->headers_out, "Cache-Control", "no-cache");
+    apr_table_setn(r->headers_out, "Cache-Control", "no-store");
+    apr_table_addn(r->err_headers_out, "Cache-Control", "no-store");
     r->filename = apr_pstrdup(r->pool, c_str(string("/redirect:/") + uri));
     return HTTP_MOVED_TEMPORARILY;
 }
@@ -705,7 +717,7 @@ int debugNote(unused void* r, const char
  * Log a request.
  */
 const bool debugRequest(request_rec* r, const string& msg) {
-    gc_scoped_pool();
+    gc_scoped_pool pool;
     cdebug << msg << ":" << endl;
     cdebug << "  unparsed uri: " << debugOptional(r->unparsed_uri) << endl;
     cdebug << "  uri: " << debugOptional(r->uri) << endl;

Copied: tuscany/sca-cpp/trunk/modules/http/mass-host-conf (from r1343580, tuscany/sca-cpp/trunk/modules/http/vhost-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/mass-host-conf?p2=tuscany/sca-cpp/trunk/modules/http/mass-host-conf&p1=tuscany/sca-cpp/trunk/modules/http/vhost-conf&r1=1343580&r2=1361914&rev=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/vhost-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/mass-host-conf Mon Jul 16 06:47:37 2012
@@ -37,7 +37,7 @@ mkdir -p $htdocs
 htdocs=`echo "import os; print os.path.realpath('$htdocs')" | python`
 
 cat >>$root/conf/httpd.conf <<EOF
-# Generated by: vhost-conf $*
+# Generated by: mass-host-conf $*
 # Enable mass dynamic virtual hosting
 NameVirtualHost $vhost
 
@@ -52,7 +52,7 @@ Include conf/dvhost.conf
 
 # Configure authentication
 Include conf/noauth.conf
-Include conf/auth.conf
+Include conf/locauth.conf
 Include conf/pubauth.conf
 Include conf/adminauth.conf
 

Copied: tuscany/sca-cpp/trunk/modules/http/mass-host-ssl-conf (from r1343580, tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/mass-host-ssl-conf?p2=tuscany/sca-cpp/trunk/modules/http/mass-host-ssl-conf&p1=tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf&r1=1343580&r2=1361914&rev=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/mass-host-ssl-conf Mon Jul 16 06:47:37 2012
@@ -31,7 +31,7 @@ sslport=`$here/httpd-addr port $ssladdr`
 sslpport=`$here/httpd-addr pport $ssladdr`
 sslvhost=`$here/httpd-addr vhost $ssladdr`
 
-vhostconf=`cat $root/conf/httpd.conf | grep "# Generated by: vhost-conf"`
+vhostconf=`cat $root/conf/httpd.conf | grep "# Generated by: mass-host-conf"`
 vroot=`echo $vhostconf | awk '{ print $6 }'`; vroot=`echo "import os; print os.path.realpath('$vroot')" | python`
 vhtdocs=`echo $vhostconf | awk '{ print $7 }'`
 
@@ -40,7 +40,7 @@ mkdir -p $htdocs
 htdocs=`echo "import os; print os.path.realpath('$htdocs')" | python`
 
 cat >>$root/conf/httpd.conf <<EOF
-# Generated by: vhost-ssl-conf $*
+# Generated by: mass-host-ssl-conf $*
 # Enable mass dynamic virtual hosting over HTTPS
 SSLStrictSNIVHostCheck Off
 
@@ -57,9 +57,12 @@ Include conf/dvhost-ssl.conf
 
 # Configure authentication
 Include conf/noauth-ssl.conf
-Include conf/auth-ssl.conf
+Include conf/locauth-ssl.conf
 Include conf/pubauth-ssl.conf
 Include conf/adminauth-ssl.conf
 
+# Configure tracking
+Include conf/tracking-ssl.conf
+
 </VirtualHost>
 

Modified: tuscany/sca-cpp/trunk/modules/js/htdocs/ui.css
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/js/htdocs/ui.css?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/js/htdocs/ui.css (original)
+++ tuscany/sca-cpp/trunk/modules/js/htdocs/ui.css Mon Jul 16 06:47:37 2012
@@ -34,7 +34,7 @@ visibility: hidden;
 }
 
 .fixed {
-position: absolute;
+position: fixed;
 }
 
 .devicewidth {
@@ -175,13 +175,95 @@ overflow: hidden;
 
 .viewheadbackground {
 position: absolute; left: 0px; top: 35px; height: 35px; line-height: 35px; width: 2500px; z-index: 7;
-font-size: 110%; font-weight: bold; background-color: #f1f1f1; color: #000000;
+background-color: #f1f1f1;
 border-top: 1px; border-bottom: 1px; border-left: 0px; border-right: 0px;
 border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #e5e5e5;
 overflow: hidden;
 -webkit-backface-visibility: hidden;
 }
 
+.viewfoot {
+position: absolute; left: 0px; bottom: 0px; height: 25px; line-height: 25px; width: 100%; z-index: 8;
+font-size: 12px; background-color: #ffffff; color: #404040;
+border-top: 1px; border-bottom: 1px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-backface-visibility: hidden;
+}
+
+.status {
+position: absolute; left: 0px; bottom: 0px; height: 35px; line-height: 35px; width: 100%; z-index: 9;
+font-size: 12px; background-color: #ffffff; color: #404040;
+border-top: 0px; border-bottom: 0px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-transform: translate(0px, 0px);
+-moz-transform: translate(0px, 0px);
+-ms-transform: translate(0px, 0px);
+-o-transform: translate(0px, 0px);
+transform: translate(0px, 0px);
+-webkit-backface-visibility: hidden;
+}
+
+.statusout3 {
+position: absolute; left: 0px; bottom: 0px; height: 35px; line-height: 35px; width: 100%; z-index: 9;
+font-size: 12px; background-color: #ffffff; color: #404040;
+border-top: 0px; border-bottom: 0px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-transition: -webkit-transform 0.4s ease-in-out 3s;
+-moz-transition: -moz-transform 0.4s ease-in-out 3s;
+-ms-transition: -ms-transform 0.4s ease-in-out 3s;
+-o-transition: -o-transform 0.4s ease-in-out 3s;
+transition: transform 0.4s ease-in-out 3s;
+-webkit-transform: translate(0px, 35px);
+-moz-transform: translate(0px, 35px);
+-ms-transform: translate(0px, 35px);
+-o-transform: translate(0px, 35px);
+transform: translate(0px, 35px);
+-webkit-backface-visibility: hidden;
+}
+
+.statusout1 {
+position: absolute; left: 0px; bottom: 0px; height: 35px; line-height: 35px; width: 100%; z-index: 9;
+font-size: 12px; background-color: #ffffff; color: #404040;
+border-top: 0px; border-bottom: 0px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-transition: -webkit-transform 0.4s ease-in-out 1s;
+-moz-transition: -moz-transform 0.4s ease-in-out 1s;
+-ms-transition: -ms-transform 0.4s ease-in-out 1s;
+-o-transition: -o-transform 0.4s ease-in-out 1s;
+transition: transform 0.4s ease-in-out 1s;
+-webkit-transform: translate(0px, 35px);
+-moz-transform: translate(0px, 35px);
+-ms-transform: translate(0px, 35px);
+-o-transform: translate(0px, 35px);
+transform: translate(0px, 35px);
+-webkit-backface-visibility: hidden;
+}
+
+.okstatus {
+font-size: 110%; font-weight: bold; padding-left: 6px; padding-right: 6px; white-space: nowrap; text-decoration: none;
+background-color: #f1f1f1; color: #000000;
+width: 100%; margin-left: auto; margin-right: auto; text-align: center; float: right;
+}
+
+.errorstatus {
+font-size: 110%; font-weight: bold; padding-left: 6px; padding-right: 6px; white-space: nowrap; text-decoration: none;
+background-color: #d14836; color: #ffffff;
+width: 100%; margin-left: auto; margin-right: auto; text-align: center; float: right;
+}
+
+.viewfootbackground {
+position: absolute; left: 0px; bottom: 0px; height: 25px; line-height: 25px; width: 2500px; z-index: 7;
+background-color: #ffffff;
+border-top: 1px; border-bottom: 1px; border-left: 0px; border-right: 0px;
+border-style: solid; border-top-color: #e5e5e5; border-bottom-color: #ffffff;
+overflow: hidden;
+-webkit-backface-visibility: hidden;
+}
+
 .viewcontent {
 position: absolute; left: 0px; top: 38px; width: 100%;
 -webkit-backface-visibility: hidden;

Modified: tuscany/sca-cpp/trunk/modules/js/htdocs/ui.js
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/js/htdocs/ui.js?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/js/htdocs/ui.js (original)
+++ tuscany/sca-cpp/trunk/modules/js/htdocs/ui.js Mon Jul 16 06:47:37 2012
@@ -178,28 +178,6 @@ ui.isMobile = function() {
 };
 
 /**
- * Convert a host name to a home page title.
- */
-ui.hometitle = function(host) {
-    if (!isNil(window.top.config.hometitle))
-        return window.top.config.hometitle;
-    var h = reverse(host.split('.'));
-    var d = isNil(cdr(h))? car(h) : cadr(h);
-    return d.substr(0, 1).toUpperCase() + d.substr(1);
-};
-
-/**
- * Convert a host name to a window title.
- */
-ui.windowtitle = function(host) {
-    if (!isNil(window.top.config.windowtitle))
-        return window.top.config.windowtitle;
-    var h = reverse(host.split('.'));
-    var d = isNil(cdr(h))? car(h) : cadr(h);
-    return d.substr(0, 1).toUpperCase() + d.substr(1);
-};
-
-/**
  * Convert a CSS position to a numeric position.
  */
 ui.numpos = function(p) {
@@ -264,62 +242,75 @@ ui.navigate = function(url, win) {
     //log('navigate', url, win);
 
     // Open a new window
-    if (win == '_blank')
-        return window.top.open(url, win);
+    if (win == '_blank') {
+        window.top.open(url, win);
+        return false;
+    }
 
     // Open a new document in the current window
-    if (win == '_self')
-        return window.top.open(url, win);
+    if (win == '_self') {
+        window.top.open(url, win);
+        return false;
+    }
 
     // Reload the current window
     if (win == '_reload') {
         window.top.location = url;
-        return window.top.location.reload();
+        window.top.location.reload();
+        return false;
     }
 
     // Let the current top window handle the navigation
     if (win == '_view') {
         if (!window.top.onnavigate)
             return window.top.open(url, '_self');
-        return window.top.onnavigate(url);
+        window.top.onnavigate(url);
+        return false;
     }
 
-    return window.top.open(url, win);
+    window.top.open(url, win);
+    return false;
 }
 
 /**
  * Build a portable <a href> tag.
  */
-ui.ahref = function(loc, target, html) {
+ui.href = function(id, loc, target, html) {
     if (target == '_blank')
-        return '<a href="' + loc + '" target="_blank">' + html + '</a>';
-    return '<a href="javascript:void(0)" onclick="ui.navigate(\'' + loc + '\', \'' + target + '\');">' + html + '</a>';
+        return '<a id="' + id + '" href="' + loc + '" target="_blank">' + html + '</a>';
+    return '<a id="' + id + '" href="' + loc + '" onclick="return ui.navigate(\'' + loc + '\', \'' + target + '\');">' + html + '</a>';
 };
 
 /**
  * Build a menu bar.
  */ 
-ui.menu = function(name, href, target, hilight) {
+ui.menu = function(id, name, href, target, hilight) {
     function Menu() {
         this.content = function() {
-            if (hilight)
-                return ui.ahref(href, target, '<span class="tbarsmenu">' + name + '</span>');
-            return ui.ahref(href, target, '<span class="tbaramenu">' + name + '</span>');
+            if (hilight == true)
+                return ui.href(id, href, target, '<span class="tbarsmenu">' + name + '</span>');
+            else if (hilight == false)
+                return ui.href(id, href, target, '<span class="tbaramenu">' + name + '</span>');
+            else
+                return ui.href(id, href, target, '<span class="' + hilight + '">' + name + '</span>');
         };
     }
     return new Menu();
 };
 
-ui.menufunc = function(name, fun, hilight) {
+ui.menufunc = function(id, name, fun, hilight) {
     function Menu() {
         this.content = function() {
-            function href(fun, html) {
-                return '<a href="javascript:void(0)" onclick="' + fun + '">' + html + '</a>';
+            function href(id, fun, html) {
+                return '<a id="' + id + '" href="/" onclick="' + fun + '">' + html + '</a>';
             }
 
-            if (hilight)
-                return href(fun, '<span class="tbarsmenu">' + name + '</span>');
-            return href(fun, '<span class="tbaramenu">' + name + '</span>');
+            if (hilight == true)
+                return href(id, fun, '<span class="tbarsmenu">' + name + '</span>');
+            else if (hilight == false)
+                return href(id, fun, '<span class="tbaramenu">' + name + '</span>');
+            else
+                return href(id, fun, '<span class="' + hilight + '">' + name + '</span>');
         };
     }
     return new Menu();

Modified: tuscany/sca-cpp/trunk/modules/js/js-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/js/js-conf?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/js/js-conf (original)
+++ tuscany/sca-cpp/trunk/modules/js/js-conf Mon Jul 16 06:47:37 2012
@@ -25,47 +25,27 @@ root=`echo "import os; print os.path.rea
 cat >>$root/conf/httpd.conf <<EOF
 # Generated by: js-conf $*
 # Serve JavaScript scripts and CSS
-Alias /ui.css $here/htdocs/ui.css
 Alias /ui-min.css $here/htdocs/ui-min.css
-Alias /all.js $here/htdocs/all.js
 Alias /all-min.js $here/htdocs/all-min.js
-Alias /proxy/ui.css $here/htdocs/ui.css
 Alias /proxy/ui-min.css $here/htdocs/ui-min.css
-Alias /proxy/all.js $here/htdocs/all.js
 Alias /proxy/all-min.js $here/htdocs/all-min.js
 
 EOF
 
 cat >>$root/conf/pubauth.conf <<EOF
 # Generated by: js-conf $*
-<Location /ui.css>
-AuthType None
-Require all granted
-</Location>
 <Location /ui-min.css>
 AuthType None
 Require all granted
 </Location>
-<Location /all.js>
-AuthType None
-Require all granted
-</Location>
 <Location /all-min.js>
 AuthType None
 Require all granted
 </Location>
-<Location /proxy/ui.css>
-AuthType None
-Require all granted
-</Location>
 <Location /proxy/ui-min.css>
 AuthType None
 Require all granted
 </Location>
-<Location /proxy/all.js>
-AuthType None
-Require all granted
-</Location>
 <Location /proxy/all-min.js>
 AuthType None
 Require all granted

Modified: tuscany/sca-cpp/trunk/modules/oauth/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -22,9 +22,9 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 <script type="text/javascript">
 var protected = sca.component("Protected");
 var userInfo = sca.defun(sca.reference(protected, "userInfo"), "getuser", "getemail", "getnickname", "getfullname", "getfirstname", "getlastname", "getrealm");

Modified: tuscany/sca-cpp/trunk/modules/oauth/htdocs/login/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/htdocs/login/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/htdocs/login/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/htdocs/login/index.html Mon Jul 16 06:47:37 2012
@@ -22,7 +22,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Sign in</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/oauth/htdocs/login/mixed.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/htdocs/login/mixed.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/htdocs/login/mixed.html (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/htdocs/login/mixed.html Mon Jul 16 06:47:37 2012
@@ -22,7 +22,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Sign in</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/oauth/htdocs/logout/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/htdocs/logout/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/htdocs/logout/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/htdocs/logout/index.html Mon Jul 16 06:47:37 2012
@@ -22,7 +22,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Sign out</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/oauth/htdocs/public/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/oauth/htdocs/public/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/oauth/htdocs/public/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/oauth/htdocs/public/index.html Mon Jul 16 06:47:37 2012
@@ -22,7 +22,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Unprotected area</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/openid/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/openid/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/openid/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var protected = sca.component("Protected");

Modified: tuscany/sca-cpp/trunk/modules/openid/htdocs/login/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/htdocs/login/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/openid/htdocs/login/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/openid/htdocs/login/index.html Mon Jul 16 06:47:37 2012
@@ -22,7 +22,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Sign in</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/openid/htdocs/logout/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/htdocs/logout/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/openid/htdocs/logout/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/openid/htdocs/logout/index.html Mon Jul 16 06:47:37 2012
@@ -22,7 +22,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Sign out</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/openid/htdocs/public/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/htdocs/public/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/openid/htdocs/public/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/openid/htdocs/public/index.html Mon Jul 16 06:47:37 2012
@@ -22,7 +22,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Unprotected area</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/server/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/server/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -22,7 +22,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>It works</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/modules/wsgi/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,7 +21,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>It works</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/relay-gae/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/relay-gae/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/relay-gae/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/relay-gae/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,7 +21,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Relay</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/relay-python/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/relay-python/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/relay-python/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/relay-python/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,7 +21,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Relay</title>
 <body>
 

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Jane's Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign in</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign out</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Joe's Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign in</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign out</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,7 +21,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Store</title>
 </head>
 

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/login/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign in</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/logout/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign out</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf Mon Jul 16 06:47:37 2012
@@ -24,7 +24,7 @@ set -x
 
 # Configure a proxy balancer
 ../../modules/http/httpd-conf $root sca-store.com $port/80 $root/htdocs
-../../modules/http/vhost-conf $root $root/domains htdocs
+../../modules/http/mass-host-conf $root $root/domains htdocs
 ../../modules/http/proxy-conf $root
 ../../modules/http/httpd-event-conf $root
 

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf Mon Jul 16 06:47:37 2012
@@ -25,12 +25,13 @@ set -x
 
 # Configure an SSL-enabled proxy balancer
 ../../modules/http/httpd-conf $root sca-store.com $port $root/htdocs
-../../modules/http/vhost-conf $root $root/domains htdocs
+../../modules/http/mass-host-conf $root $root/domains htdocs
 ../../modules/http/proxy-conf $root
 ../../modules/http/httpd-event-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
-../../modules/http/vhost-ssl-conf $root
+../../modules/http/httpd-tunnel-ssl-conf $root
+../../modules/http/mass-host-ssl-conf $root
 ../../modules/http/proxy-ssl-conf $root
 
 # Aggregate proxy balancer logs

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/server-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/server-conf?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/server-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/server-conf Mon Jul 16 06:47:37 2012
@@ -25,7 +25,7 @@ set -x
 # Configure an app server
 ../../modules/http/httpd-conf $root sca-store.com $port/80 htdocs
 ../../modules/http/httpd-event-conf $root
-../../modules/http/vhost-conf $root domains htdocs
+../../modules/http/mass-host-conf $root domains htdocs
 ../../modules/server/server-conf $root
 ../../modules/python/python-conf $root
 cat >>$root/conf/httpd.conf <<EOF

Modified: tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf Mon Jul 16 06:47:37 2012
@@ -26,11 +26,12 @@ set -x
 # Configure an SSL-enabled app server
 ../../modules/http/httpd-conf $root sca-store.com $port htdocs
 ../../modules/http/httpd-event-conf $root
-../../modules/http/vhost-conf $root domains htdocs
+../../modules/http/mass-host-conf $root domains htdocs
 
 tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C $root -x
 ../../modules/http/httpd-ssl-conf $root $sslport
-../../modules/http/vhost-ssl-conf $root
+../../modules/http/httpd-tunnel-ssl-conf $root
+../../modules/http/mass-host-ssl-conf $root
 
 ../../modules/oauth/oauth-conf $root
 ../../modules/oauth/oauth-memcached-conf $root localhost 11211

Modified: tuscany/sca-cpp/trunk/samples/store-constdb/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-constdb/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-constdb/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-constdb/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-gae/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-gae/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-gae/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-gae/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-java/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-python/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-python/htdocs/login/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/htdocs/login/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/htdocs/login/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/htdocs/login/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign in</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html Mon Jul 16 06:47:37 2012
@@ -22,8 +22,8 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/all.js"></script>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
+<script type="text/javascript" src="/all-min.js"></script>
 <title>Sign out</title>
 </head>
 <body>

Modified: tuscany/sca-cpp/trunk/samples/store-scheme/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-sql/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-sql/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-sql/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-sql/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Jane's Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,10 +21,10 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Joe's Store</title>
 
-<script type="text/javascript" src="/all.js"></script>
+<script type="text/javascript" src="/all-min.js"></script>
 
 <script type="text/javascript">
 var store = sca.component("Store");

Modified: tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/index.html?rev=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/index.html Mon Jul 16 06:47:37 2012
@@ -21,7 +21,7 @@
 <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/> 
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
-<link rel="stylesheet" type="text/css" href="/ui.css"/>
+<link rel="stylesheet" type="text/css" href="/ui-min.css"/>
 <title>Store</title>
 </head>
 

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=1361914&r1=1361913&r2=1361914&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start Mon Jul 16 06:47:37 2012
@@ -25,9 +25,9 @@
 ../../modules/http/ssl-cert-conf tmp *.example.com vhost
 ../../modules/http/httpd-conf tmp example.com 8090 htdocs
 ../../modules/http/httpd-event-conf tmp
-../../modules/http/vhost-conf tmp domains htdocs
+../../modules/http/mass-host-conf tmp domains htdocs
 ../../modules/http/httpd-ssl-conf tmp 8453
-../../modules/http/vhost-ssl-conf tmp
+../../modules/http/mass-host-ssl-conf tmp
 ../../modules/http/basic-auth-conf tmp
 ../../modules/http/passwd-auth-conf tmp foo foo
 ../../modules/server/server-conf tmp