diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-05-28 04:39:44 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-05-28 04:39:44 +0000 |
| commit | 7519724a171bb85246bb86bce453cbdd408691d9 (patch) | |
| tree | 3fd959c40a09fc496bf1f84d9fd25eaf9741fd5e /sca-cpp/trunk/modules/server/server-conf | |
| parent | 4a28afdf7a6b193942f180862d443a7d818c5789 (diff) | |
Cleanup sample and test HTML pages. Remove crlf, fix links to the Javascript scripts, and remove unused CSS stylesheets.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1343140 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/server/server-conf')
| -rwxr-xr-x | sca-cpp/trunk/modules/server/server-conf | 82 |
1 files changed, 3 insertions, 79 deletions
diff --git a/sca-cpp/trunk/modules/server/server-conf b/sca-cpp/trunk/modules/server/server-conf index 83eea0cc6c..bfa5ac8473 100755 --- a/sca-cpp/trunk/modules/server/server-conf +++ b/sca-cpp/trunk/modules/server/server-conf @@ -22,86 +22,10 @@ here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $h mkdir -p $1 root=`echo "import os; print os.path.realpath('$1')" | python` -jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python` - -uname=`uname -s` -if [ $uname = "Darwin" ]; then - libsuffix=".dylib" -else - libsuffix=".so" -fi - -cat >>$root/conf/httpd.conf <<EOF -# Generated by: server-conf $* -# Serve JavaScript client scripts -Alias /component.js $jsprefix/htdocs/component.js -Alias /util.js $jsprefix/htdocs/util.js -Alias /elemutil.js $jsprefix/htdocs/elemutil.js -Alias /xmlutil.js $jsprefix/htdocs/xmlutil.js -Alias /atomutil.js $jsprefix/htdocs/atomutil.js -Alias /jsonutil.js $jsprefix/htdocs/jsonutil.js -Alias /ui.js $jsprefix/htdocs/ui.js -Alias /ui.css $jsprefix/htdocs/ui.css -Alias /ui-min.css $jsprefix/htdocs/ui-min.css -Alias /scdl.js $jsprefix/htdocs/scdl.js -Alias /all.js $jsprefix/htdocs/all.js -Alias /all-min.js $jsprefix/htdocs/all-min.js - -EOF - -cat >>$root/conf/pubauth.conf <<EOF -# Generated by: server-conf $* -<Location /component.js> -AuthType None -Require all granted -</Location> -<Location /util.js> -AuthType None -Require all granted -</Location> -<Location /elemutil.js> -AuthType None -Require all granted -</Location> -<Location /xmlutil.js> -AuthType None -Require all granted -</Location> -<Location /atomutil.js> -AuthType None -Require all granted -</Location> -<Location /jsonutil.js> -AuthType None -Require all granted -</Location> -<Location /ui.js> -AuthType None -Require all granted -</Location> -<Location /ui.css> -AuthType None -Require all granted -</Location> -<Location /ui-min.css> -AuthType None -Require all granted -</Location> -<Location /scdl.js> -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> - -EOF +# Serve Javascript scripts and CSS +$here/../js/js-conf $1 +# Configure SSL cert used for wiring ssl=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-ssl-conf"` if [ "$ssl" != "" ]; then cat >>$root/conf/httpd.conf <<EOF |