diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-20 07:20:22 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-20 07:20:22 +0000 |
commit | 4f245967cb241021844b678e75ff48c6783113d3 (patch) | |
tree | 3375eb90f619656950d07a14090abf9d3e381707 /sca-cpp/trunk/hosting | |
parent | 8fdc6a6dc4b2b23b923d8cbfba5190933155e95d (diff) |
Optimize server modules a bit. Pass individual config elements instead of the whole server config. Load target composite once into the request. Enable loading of shared component implementations from the main contribution.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1291134 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/hosting')
-rwxr-xr-x | sca-cpp/trunk/hosting/server/ssl-start | 17 | ||||
-rwxr-xr-x | sca-cpp/trunk/hosting/server/start | 27 |
2 files changed, 22 insertions, 22 deletions
diff --git a/sca-cpp/trunk/hosting/server/ssl-start b/sca-cpp/trunk/hosting/server/ssl-start index 9be614fa8e..4689566176 100755 --- a/sca-cpp/trunk/hosting/server/ssl-start +++ b/sca-cpp/trunk/hosting/server/ssl-start @@ -80,7 +80,6 @@ fi if [ -x ../../components/log/scribe-cat ]; then cat >tmp/conf/log.conf <<EOF # Generated by: ssl-start $* -LogLevel notice ErrorLog "|$here/../../components/log/scribe-cat server" CustomLog "|$here/../../components/log/scribe-cat server" combined @@ -101,7 +100,6 @@ EOF else cat >tmp/conf/log.conf <<EOF # Generated by: ssl=start $* -LogLevel debug ErrorLog $here/tmp/logs/error_log CustomLog $here/tmp/logs/access_log combined @@ -137,6 +135,7 @@ cat >>tmp/conf/svhost-ssl.conf <<EOF # Error pages ErrorDocument 404 /public/notfound/ ErrorDocument 401 /public/notauth/ +ErrorDocument 403 /public/notauth/ ErrorDocument 500 /public/oops/ ErrorDocument 405 /public/oops/ @@ -150,8 +149,9 @@ SCAContribution $here/ SCAComposite server.composite # Configure SCA Composite for mass dynamic virtual Hosting -SCAVirtualContribution $here/apps/ -SCAVirtualComposite app.composite +#SCAVirtualContribution $here/data/apps/ +#SCAVirtualComposite app.composite +SCAVirtualContributor Composites EOF @@ -163,8 +163,13 @@ Alias /home/home.b64 $here/htdocs/home/home.b64 EOF -# Create app resource links -./mkapplinks data ../../../../.. ../../../../../../nuvem +# 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-ssl.conf <<EOF diff --git a/sca-cpp/trunk/hosting/server/start b/sca-cpp/trunk/hosting/server/start index da0dcecf40..a74581aa59 100755 --- a/sca-cpp/trunk/hosting/server/start +++ b/sca-cpp/trunk/hosting/server/start @@ -53,12 +53,6 @@ CustomLog "|$here/../../components/log/scribe-cat server" combined EOF - cat >tmp/conf/log-ssl.conf <<EOF -# Generated by: start $* -CustomLog "|$here/../../components/log/scribe-cat server" sslcombined - -EOF - else cat >tmp/conf/log.conf <<EOF # Generated by: start $* @@ -68,12 +62,6 @@ CustomLog $here/tmp/logs/access_log combined EOF - cat >tmp/conf/log-ssl.conf <<EOF -# Generated by: start $* -CustomLog $here/tmp/logs/ssl_access_log sslcombined - -EOF - fi # Configure error pages @@ -82,6 +70,7 @@ cat >>tmp/conf/svhost.conf <<EOF # Error pages ErrorDocument 404 /public/notfound/ ErrorDocument 401 /public/notauth/ +ErrorDocument 403 /public/notauth/ ErrorDocument 500 /public/oops/ ErrorDocument 405 /public/oops/ @@ -95,8 +84,9 @@ SCAContribution $here/ SCAComposite server.composite # Configure SCA Composite for mass dynamic virtual Hosting -SCAVirtualContribution $here/data/apps/ -SCAVirtualComposite app.composite +#SCAVirtualContribution $here/data/apps/ +#SCAVirtualComposite app.composite +SCAVirtualContributor Composites EOF @@ -108,8 +98,13 @@ Alias /home/home.b64 $here/htdocs/home/home.b64 EOF -# Create app resource links -./mkapplinks data ../../../../.. ../../../../../../nuvem +# 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 |