diff options
Diffstat (limited to 'sca-cpp/trunk/modules/server')
-rw-r--r-- | sca-cpp/trunk/modules/server/Makefile.am | 4 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/server/server-conf | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sca-cpp/trunk/modules/server/Makefile.am b/sca-cpp/trunk/modules/server/Makefile.am index efe8874ecb..30c89da85d 100644 --- a/sca-cpp/trunk/modules/server/Makefile.am +++ b/sca-cpp/trunk/modules/server/Makefile.am @@ -23,9 +23,7 @@ incldir = $(prefix)/include/modules/server dist_mod_SCRIPTS = cpp-conf scheme-conf server-conf moddir = $(prefix)/modules/server -nobase_dist_mod_DATA = htdocs/wiring/*.js - -EXTRA_DIST = domain-test.composite client-test.scm server-test.scm htdocs/*.xml htdocs/*.txt htdocs/*.html htdocs/wiring/*.js +EXTRA_DIST = domain-test.composite client-test.scm server-test.scm htdocs/*.xml htdocs/*.txt htdocs/*.html mod_LTLIBRARIES = libmod_tuscany_eval.la libmod_tuscany_wiring.la noinst_DATA = libmod_tuscany_eval.so libmod_tuscany_wiring.so diff --git a/sca-cpp/trunk/modules/server/server-conf b/sca-cpp/trunk/modules/server/server-conf index 5a77125463..9f5740f5b6 100755 --- a/sca-cpp/trunk/modules/server/server-conf +++ b/sca-cpp/trunk/modules/server/server-conf @@ -22,6 +22,8 @@ here=`readlink -f $0`; here=`dirname $here` mkdir -p $1 root=`readlink -f $1` +jsprefix=`readlink -f $here/../js` + conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` host=`echo $conf | awk '{ print $6 }'` port=`echo $conf | awk '{ print $7 }' | awk -F "/" '{ print $1 }'` @@ -53,8 +55,11 @@ cat >>$root/conf/httpd.conf <<EOF # Route all wiring through the configured server name SCAWiringServerName $servername -# Serve HTTP binding JavaScript client code -Alias /wiring/ref.js $here/htdocs/wiring/ref.js +# Serve JavaScript client scripts +Alias /component.js $jsprefix/htdocs/component.js +Alias /scdl.js $jsprefix/htdocs/scdl.js +Alias /util.js $jsprefix/htdocs/util.js +Alias /ui.js $jsprefix/htdocs/ui.js EOF |