diff options
Diffstat (limited to '')
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-test | 41 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/server/httpd-test.composite (renamed from sca-cpp/trunk/modules/http/httpd-test.composite) | 0 | ||||
| -rw-r--r-- | sca-cpp/trunk/modules/server/httpd-test.scm (renamed from sca-cpp/trunk/modules/http/httpd-test.scm) | 0 |
3 files changed, 0 insertions, 41 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-test b/sca-cpp/trunk/modules/http/httpd-test index 1d9b3cb34d..57c35c5cc9 100755 --- a/sca-cpp/trunk/modules/http/httpd-test +++ b/sca-cpp/trunk/modules/http/httpd-test @@ -21,16 +21,6 @@ echo "Testing..." # Setup ./httpd-conf tmp 8090 htdocs -cat >>tmp/conf/httpd.conf <<EOF - -<Location /test> -SetHandler mod_tuscany_eval -SCAContribution `pwd`/ -SCAComposite httpd-test.composite -SCAComponent httpd-test -</Location> -EOF - apachectl -k start -d `pwd`/tmp sleep 1 @@ -39,37 +29,6 @@ curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html diff tmp/index.html htdocs/index.html rc=$? -# Test ATOMPub -if [ "$rc" = "0" ]; then - curl http://localhost:8090/test/ >tmp/feed.xml 2>/dev/null - diff tmp/feed.xml htdocs/feed.xml - rc=$? -fi -if [ "$rc" = "0" ]; then - curl http://localhost:8090/test/111 >tmp/entry.xml 2>/dev/null - diff tmp/entry.xml htdocs/entry.xml - rc=$? -fi -if [ "$rc" = "0" ]; then - curl http://localhost:8090/test/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null - rc=$? -fi -if [ "$rc" = "0" ]; then - curl http://localhost:8090/test/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null - rc=$? -fi -if [ "$rc" = "0" ]; then - curl http://localhost:8090/test/111 -X DELETE 2>/dev/null - rc=$? -fi - -# Test JSON-RPC -if [ "$rc" = "0" ]; then - curl http://localhost:8090/test/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null - diff tmp/json-result.txt htdocs/json-result.txt - rc=$? -fi - # Cleanup apachectl -k stop -d `pwd`/tmp sleep 2 diff --git a/sca-cpp/trunk/modules/http/httpd-test.composite b/sca-cpp/trunk/modules/server/httpd-test.composite index 875d26ae1b..875d26ae1b 100644 --- a/sca-cpp/trunk/modules/http/httpd-test.composite +++ b/sca-cpp/trunk/modules/server/httpd-test.composite diff --git a/sca-cpp/trunk/modules/http/httpd-test.scm b/sca-cpp/trunk/modules/server/httpd-test.scm index 0566eaf36f..0566eaf36f 100644 --- a/sca-cpp/trunk/modules/http/httpd-test.scm +++ b/sca-cpp/trunk/modules/server/httpd-test.scm |