summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/server/server-test
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2009-12-26 03:25:34 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2009-12-26 03:25:34 +0000
commit0999fd565d6d629df87d3db38a84d4701b494b3b (patch)
tree287bb29d011a1c1616ca434ce6c51ab57b63dda2 /sca-cpp/trunk/modules/server/server-test
parentbd4c1d47aeaf1d4bca76d5713e705b0869d3f2f7 (diff)
Simplified server configuration, HTTPD modules now use deployment composite to route service requests, minor fixes to store integration test.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@893939 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/server/server-test')
-rwxr-xr-xsca-cpp/trunk/modules/server/server-test15
1 files changed, 3 insertions, 12 deletions
diff --git a/sca-cpp/trunk/modules/server/server-test b/sca-cpp/trunk/modules/server/server-test
index 9c517f38b6..4c90711a30 100755
--- a/sca-cpp/trunk/modules/server/server-test
+++ b/sca-cpp/trunk/modules/server/server-test
@@ -22,23 +22,14 @@
./server-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
-<Location /test>
-SetHandler mod_tuscany_eval
+<Location />
SCAContribution `pwd`/
SCAComposite domain-test.composite
-SCAComponent server-test
-</Location>
-
-<Location /cpp>
-SetHandler mod_tuscany_eval
-SCAContribution `pwd`/
-SCAComposite domain-test.composite
-SCAComponent cpp-test
</Location>
EOF
apachectl -k start -d `pwd`/tmp
-sleep 1
+sleep 2
# Test
./client-test 2>/dev/null
@@ -46,5 +37,5 @@ rc=$?
# Cleanup
apachectl -k stop -d `pwd`/tmp
-sleep 1
+sleep 2
return $rc