summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/server/wiring-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/wiring-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/wiring-test')
-rwxr-xr-xsca-cpp/trunk/modules/server/wiring-test21
1 files changed, 3 insertions, 18 deletions
diff --git a/sca-cpp/trunk/modules/server/wiring-test b/sca-cpp/trunk/modules/server/wiring-test
index 5f77d4c6f8..5b3a678f7f 100755
--- a/sca-cpp/trunk/modules/server/wiring-test
+++ b/sca-cpp/trunk/modules/server/wiring-test
@@ -24,29 +24,14 @@ echo "Testing..."
./server-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
-<Location /test>
-SetHandler mod_tuscany_eval
-SCAContribution `pwd`/
-SCAComposite domain-test.composite
-SCAComponent server-test
-</Location>
-
-<Location /client>
-SetHandler mod_tuscany_eval
-SCAContribution `pwd`/
-SCAComposite domain-test.composite
-SCAComponent client-test
-</Location>
-
-<Location /references>
-SetHandler mod_tuscany_wiring
+<Location />
SCAContribution `pwd`/
SCAComposite domain-test.composite
</Location>
EOF
apachectl -k start -d `pwd`/tmp
-sleep 1
+sleep 2
# Test HTTP GET
curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
@@ -86,7 +71,7 @@ fi
# Cleanup
apachectl -k stop -d `pwd`/tmp
-sleep 1
+sleep 2
if [ "$rc" = "0" ]; then
echo "OK"
fi