diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-07 00:36:25 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-07 00:36:25 +0000 |
| commit | bb4b895471e3165c71bdfd1fdae5e1ffde8f1696 (patch) | |
| tree | 57bec175bb5dbf43303f7334162b9b2b4bda03c6 /sca-cpp/trunk/components/webservice/server-test | |
| parent | 00f9947613624b251551ba709824f97f1b6c2fb1 (diff) | |
Moved server configuration to HTTPD postConfig phase, to avoid running configuration commands twice and added a way for runtime modules and components to handle start/restart/stop events. Improved build scripts a little, to not depend on external environment variables.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@907352 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/components/webservice/server-test')
| -rwxr-xr-x | sca-cpp/trunk/components/webservice/server-test | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sca-cpp/trunk/components/webservice/server-test b/sca-cpp/trunk/components/webservice/server-test index eb3d53a33a..7d33223b3d 100755 --- a/sca-cpp/trunk/components/webservice/server-test +++ b/sca-cpp/trunk/components/webservice/server-test @@ -23,18 +23,17 @@ ../../modules/server/scheme-conf tmp ./axis2-conf tmp cat >>tmp/conf/httpd.conf <<EOF - -<Location /> SCAContribution `pwd`/ SCAComposite webservice.composite -</Location> EOF -apachectl -k start -d `pwd`/tmp +../../modules/http/httpd-start tmp -axis2="$AXIS2C_HOME/bin/axis2_http_server" +axis2_prefix=`cat axis2c.prefix` +export AXIS2C_HOME=$axis2_prefix +axis2="$axis2_prefix/bin/axis2_http_server" pwd=`pwd` -cd $AXIS2C_HOME/bin +cd "$axis2_prefix/bin" $axis2 & cd $pwd sleep 2 @@ -44,7 +43,7 @@ sleep 2 rc=$? # Cleanup -kill `ps -f | grep -v grep | grep "$axis2" | awk '{ print $2 }'` -apachectl -k stop -d `pwd`/tmp +kill `ps -f | grep -v grep | grep "${axis2}" | awk '{ print $2 }'` +../../modules/http/httpd-stop tmp sleep 2 return $rc |