summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp/trunk/modules')
-rwxr-xr-xsca-cpp/trunk/modules/java/wiring-test12
-rwxr-xr-xsca-cpp/trunk/modules/python/wiring-test12
-rw-r--r--sca-cpp/trunk/modules/server/htdocs/test/entry.xml (renamed from sca-cpp/trunk/modules/server/htdocs/entry.xml)0
-rw-r--r--sca-cpp/trunk/modules/server/htdocs/test/feed.xml (renamed from sca-cpp/trunk/modules/server/htdocs/feed.xml)0
-rw-r--r--sca-cpp/trunk/modules/server/htdocs/test/json-request.txt (renamed from sca-cpp/trunk/modules/server/htdocs/json-request.txt)0
-rw-r--r--sca-cpp/trunk/modules/server/htdocs/test/json-result.txt (renamed from sca-cpp/trunk/modules/server/htdocs/json-result.txt)0
-rwxr-xr-xsca-cpp/trunk/modules/server/httpd-test12
-rwxr-xr-xsca-cpp/trunk/modules/server/wiring-test12
-rw-r--r--sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml (renamed from sca-cpp/trunk/modules/wsgi/htdocs/entry.xml)0
-rw-r--r--sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml (renamed from sca-cpp/trunk/modules/wsgi/htdocs/feed.xml)0
-rw-r--r--sca-cpp/trunk/modules/wsgi/htdocs/test/json-request.txt (renamed from sca-cpp/trunk/modules/wsgi/htdocs/json-request.txt)0
-rw-r--r--sca-cpp/trunk/modules/wsgi/htdocs/test/json-result.txt (renamed from sca-cpp/trunk/modules/wsgi/htdocs/json-result.txt)0
-rwxr-xr-xsca-cpp/trunk/modules/wsgi/wiring-test12
-rwxr-xr-xsca-cpp/trunk/modules/wsgi/wsgi-test12
14 files changed, 36 insertions, 36 deletions
diff --git a/sca-cpp/trunk/modules/java/wiring-test b/sca-cpp/trunk/modules/java/wiring-test
index dcbaa3e1cc..fb2ad48efc 100755
--- a/sca-cpp/trunk/modules/java/wiring-test
+++ b/sca-cpp/trunk/modules/java/wiring-test
@@ -43,20 +43,20 @@ rc=$?
# Test ATOMPub
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
- diff tmp/feed.xml ../server/htdocs/feed.xml
+ diff tmp/feed.xml ../server/htdocs/test/feed.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
- diff tmp/entry.xml ../server/htdocs/entry.xml
+ diff tmp/entry.xml ../server/htdocs/test/entry.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml" --data @../server/htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml" --data @../server/htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml" --data @../server/htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml" --data @../server/htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
@@ -66,8 +66,8 @@ fi
# Test JSON-RPC
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc" --data @../server/htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
- diff tmp/json-result.txt ../server/htdocs/json-result.txt
+ $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc" --data @../server/htdocs/test/json-request.txt >tmp/json-result.txt 2>/dev/null
+ diff tmp/json-result.txt ../server/htdocs/test/json-result.txt
rc=$?
fi
diff --git a/sca-cpp/trunk/modules/python/wiring-test b/sca-cpp/trunk/modules/python/wiring-test
index 42df9d4ff3..c571981bbd 100755
--- a/sca-cpp/trunk/modules/python/wiring-test
+++ b/sca-cpp/trunk/modules/python/wiring-test
@@ -41,20 +41,20 @@ rc=$?
# Test ATOMPub
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
- diff tmp/feed.xml ../server/htdocs/feed.xml
+ diff tmp/feed.xml ../server/htdocs/test/feed.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
- diff tmp/entry.xml ../server/htdocs/entry.xml
+ diff tmp/entry.xml ../server/htdocs/test/entry.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml" --data @../server/htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml" --data @../server/htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml" --data @../server/htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml" --data @../server/htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
@@ -64,8 +64,8 @@ fi
# Test JSON-RPC
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc" --data @../server/htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
- diff tmp/json-result.txt ../server/htdocs/json-result.txt
+ $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc" --data @../server/htdocs/test/json-request.txt >tmp/json-result.txt 2>/dev/null
+ diff tmp/json-result.txt ../server/htdocs/test/json-result.txt
rc=$?
fi
diff --git a/sca-cpp/trunk/modules/server/htdocs/entry.xml b/sca-cpp/trunk/modules/server/htdocs/test/entry.xml
index 86b8a10547..86b8a10547 100644
--- a/sca-cpp/trunk/modules/server/htdocs/entry.xml
+++ b/sca-cpp/trunk/modules/server/htdocs/test/entry.xml
diff --git a/sca-cpp/trunk/modules/server/htdocs/feed.xml b/sca-cpp/trunk/modules/server/htdocs/test/feed.xml
index 5e37de6580..5e37de6580 100644
--- a/sca-cpp/trunk/modules/server/htdocs/feed.xml
+++ b/sca-cpp/trunk/modules/server/htdocs/test/feed.xml
diff --git a/sca-cpp/trunk/modules/server/htdocs/json-request.txt b/sca-cpp/trunk/modules/server/htdocs/test/json-request.txt
index b4bd07fc46..b4bd07fc46 100644
--- a/sca-cpp/trunk/modules/server/htdocs/json-request.txt
+++ b/sca-cpp/trunk/modules/server/htdocs/test/json-request.txt
diff --git a/sca-cpp/trunk/modules/server/htdocs/json-result.txt b/sca-cpp/trunk/modules/server/htdocs/test/json-result.txt
index 121bf74902..121bf74902 100644
--- a/sca-cpp/trunk/modules/server/htdocs/json-result.txt
+++ b/sca-cpp/trunk/modules/server/htdocs/test/json-result.txt
diff --git a/sca-cpp/trunk/modules/server/httpd-test b/sca-cpp/trunk/modules/server/httpd-test
index 13347ea83f..050becdb24 100755
--- a/sca-cpp/trunk/modules/server/httpd-test
+++ b/sca-cpp/trunk/modules/server/httpd-test
@@ -41,20 +41,20 @@ rc=$?
# Test ATOMPub
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/test/ >tmp/feed.xml 2>/dev/null
- diff tmp/feed.xml htdocs/feed.xml
+ diff tmp/feed.xml htdocs/test/feed.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/test/111 >tmp/entry.xml 2>/dev/null
- diff tmp/entry.xml htdocs/entry.xml
+ diff tmp/entry.xml htdocs/test/entry.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/test/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/test/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/test/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/test/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
@@ -64,8 +64,8 @@ fi
# Test JSON-RPC
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/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
+ $curl_prefix/bin/curl http://localhost:8090/test/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/test/json-request.txt >tmp/json-result.txt 2>/dev/null
+ diff tmp/json-result.txt htdocs/test/json-result.txt
rc=$?
fi
diff --git a/sca-cpp/trunk/modules/server/wiring-test b/sca-cpp/trunk/modules/server/wiring-test
index f821d15256..e791ec555b 100755
--- a/sca-cpp/trunk/modules/server/wiring-test
+++ b/sca-cpp/trunk/modules/server/wiring-test
@@ -41,20 +41,20 @@ rc=$?
# Test ATOMPub
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
- diff tmp/feed.xml htdocs/feed.xml
+ diff tmp/feed.xml htdocs/test/feed.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
- diff tmp/entry.xml htdocs/entry.xml
+ diff tmp/entry.xml htdocs/test/entry.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
@@ -64,8 +64,8 @@ fi
# Test JSON-RPC
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/client/ -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
+ $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/test/json-request.txt >tmp/json-result.txt 2>/dev/null
+ diff tmp/json-result.txt htdocs/test/json-result.txt
rc=$?
fi
diff --git a/sca-cpp/trunk/modules/wsgi/htdocs/entry.xml b/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml
index 5796cd655f..5796cd655f 100644
--- a/sca-cpp/trunk/modules/wsgi/htdocs/entry.xml
+++ b/sca-cpp/trunk/modules/wsgi/htdocs/test/entry.xml
diff --git a/sca-cpp/trunk/modules/wsgi/htdocs/feed.xml b/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml
index d15b265f15..d15b265f15 100644
--- a/sca-cpp/trunk/modules/wsgi/htdocs/feed.xml
+++ b/sca-cpp/trunk/modules/wsgi/htdocs/test/feed.xml
diff --git a/sca-cpp/trunk/modules/wsgi/htdocs/json-request.txt b/sca-cpp/trunk/modules/wsgi/htdocs/test/json-request.txt
index b4bd07fc46..b4bd07fc46 100644
--- a/sca-cpp/trunk/modules/wsgi/htdocs/json-request.txt
+++ b/sca-cpp/trunk/modules/wsgi/htdocs/test/json-request.txt
diff --git a/sca-cpp/trunk/modules/wsgi/htdocs/json-result.txt b/sca-cpp/trunk/modules/wsgi/htdocs/test/json-result.txt
index 121bf74902..121bf74902 100644
--- a/sca-cpp/trunk/modules/wsgi/htdocs/json-result.txt
+++ b/sca-cpp/trunk/modules/wsgi/htdocs/test/json-result.txt
diff --git a/sca-cpp/trunk/modules/wsgi/wiring-test b/sca-cpp/trunk/modules/wsgi/wiring-test
index f1d0e8332f..f3c1bbb840 100755
--- a/sca-cpp/trunk/modules/wsgi/wiring-test
+++ b/sca-cpp/trunk/modules/wsgi/wiring-test
@@ -38,20 +38,20 @@ rc=$?
# Test ATOMPub
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl $uri/client/ >tmp/feed.xml 2>/dev/null
- diff tmp/feed.xml htdocs/feed.xml
+ diff tmp/feed.xml htdocs/test/feed.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl $uri/client/111 >tmp/entry.xml 2>/dev/null
- diff tmp/entry.xml htdocs/entry.xml
+ diff tmp/entry.xml htdocs/test/entry.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl $uri/client/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl $uri/client/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl $uri/client/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl $uri/client/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
@@ -61,8 +61,8 @@ fi
# Test JSON-RPC
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl $uri/client/ -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
+ $curl_prefix/bin/curl $uri/client/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/test/json-request.txt >tmp/json-result.txt 2>/dev/null
+ diff tmp/json-result.txt htdocs/test/json-result.txt
rc=$?
fi
diff --git a/sca-cpp/trunk/modules/wsgi/wsgi-test b/sca-cpp/trunk/modules/wsgi/wsgi-test
index 3dce709a3b..369ca5a677 100755
--- a/sca-cpp/trunk/modules/wsgi/wsgi-test
+++ b/sca-cpp/trunk/modules/wsgi/wsgi-test
@@ -34,20 +34,20 @@ rc=$?
# Test ATOMPub
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/wsgi/ >tmp/feed.xml 2>/dev/null
- diff tmp/feed.xml htdocs/feed.xml
+ diff tmp/feed.xml htdocs/test/feed.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
$curl_prefix/bin/curl http://localhost:8090/wsgi/111 >tmp/entry.xml 2>/dev/null
- diff tmp/entry.xml htdocs/entry.xml
+ diff tmp/entry.xml htdocs/test/entry.xml
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/wsgi/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
+ $curl_prefix/bin/curl http://localhost:8090/wsgi/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/test/entry.xml 2>/dev/null
rc=$?
fi
if [ "$rc" = "0" ]; then
@@ -57,8 +57,8 @@ fi
# Test JSON-RPC
if [ "$rc" = "0" ]; then
- $curl_prefix/bin/curl http://localhost:8090/wsgi/ -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
+ $curl_prefix/bin/curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/test/json-request.txt >tmp/json-result.txt 2>/dev/null
+ diff tmp/json-result.txt htdocs/test/json-result.txt
rc=$?
fi