Use curl configured at build time instead of curl found on system path.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@930634 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 72 insertions, 48 deletions

diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am
index 6d477c2946..180529620c 100644
--- a/sca-cpp/trunk/modules/http/Makefile.am
+++ b/sca-cpp/trunk/modules/http/Makefile.am
@@ -23,10 +23,12 @@ mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart
 curl_test_SOURCES = curl-test.cpp
 curl_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
-prefix_DATA = httpd.prefix
+prefix_DATA = httpd.prefix curl.prefix
 prefixdir=$(prefix)/modules/http
 httpd.prefix: $(top_builddir)/config.status
 	echo ${HTTPD_PREFIX} >httpd.prefix
+curl.prefix: $(top_builddir)/config.status
+	echo ${CURL_PREFIX} >curl.prefix
 
 noinst_PROGRAMS = curl-test
 TESTS = httpd-test http-test
diff --git a/sca-cpp/trunk/modules/http/httpd-test b/sca-cpp/trunk/modules/http/httpd-test
index ca6b3e19a1..a3b9145871 100755
--- a/sca-cpp/trunk/modules/http/httpd-test
+++ b/sca-cpp/trunk/modules/http/httpd-test
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ./httpd-conf tmp localhost 8090 htdocs
@@ -25,7 +27,7 @@ echo "Testing..."
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html htdocs/index.html
 rc=$?
 
diff --git a/sca-cpp/trunk/modules/java/wiring-test b/sca-cpp/trunk/modules/java/wiring-test
index 1300f56ffb..dcbaa3e1cc 100755
--- a/sca-cpp/trunk/modules/java/wiring-test
+++ b/sca-cpp/trunk/modules/java/wiring-test
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ../http/httpd-conf tmp localhost 8090 ../server/htdocs
@@ -34,37 +36,37 @@ export CLASSPATH="`pwd`/libmod-tuscany-java-1.0.jar:`pwd`"
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html ../server/htdocs/index.html
 rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml ../server/htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml ../server/htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    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
+    $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
     rc=$?
 fi
diff --git a/sca-cpp/trunk/modules/python/wiring-test b/sca-cpp/trunk/modules/python/wiring-test
index 9f2aae342d..42df9d4ff3 100755
--- a/sca-cpp/trunk/modules/python/wiring-test
+++ b/sca-cpp/trunk/modules/python/wiring-test
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ../http/httpd-conf tmp localhost 8090 ../server/htdocs
@@ -32,37 +34,37 @@ EOF
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html ../server/htdocs/index.html
 rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml ../server/htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml ../server/htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    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
+    $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
     rc=$?
 fi
diff --git a/sca-cpp/trunk/modules/server/httpd-test b/sca-cpp/trunk/modules/server/httpd-test
index 8ab3000f2a..13347ea83f 100755
--- a/sca-cpp/trunk/modules/server/httpd-test
+++ b/sca-cpp/trunk/modules/server/httpd-test
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ../http/httpd-conf tmp localhost 8090 htdocs
@@ -32,37 +34,37 @@ EOF
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/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
+    $curl_prefix/bin/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
+    $curl_prefix/bin/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
+    $curl_prefix/bin/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
+    $curl_prefix/bin/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
+    $curl_prefix/bin/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
+    $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
     rc=$?
 fi
diff --git a/sca-cpp/trunk/modules/server/wiring-test b/sca-cpp/trunk/modules/server/wiring-test
index ae4dce51e4..f821d15256 100755
--- a/sca-cpp/trunk/modules/server/wiring-test
+++ b/sca-cpp/trunk/modules/server/wiring-test
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ../http/httpd-conf tmp localhost 8090 htdocs
@@ -32,37 +34,37 @@ EOF
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/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/client/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    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
+    $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
     rc=$?
 fi
diff --git a/sca-cpp/trunk/modules/wsgi/wiring-test b/sca-cpp/trunk/modules/wsgi/wiring-test
index c3a8d09ae7..e7747484f7 100755
--- a/sca-cpp/trunk/modules/wsgi/wiring-test
+++ b/sca-cpp/trunk/modules/wsgi/wiring-test
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 uri=$1
 if [ "$uri" = "" ]; then
     uri="http://localhost:8090"
@@ -29,37 +31,37 @@ mkdir -p tmp
 sleep 2
 
 # Test HTTP GET
-curl $uri/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl $uri/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html htdocs/index.html
 rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    curl $uri/client/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl $uri/client/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl $uri/client/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl $uri/client/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl $uri/client/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl $uri/client/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    curl $uri/client/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
+    $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
     rc=$?
 fi
diff --git a/sca-cpp/trunk/modules/wsgi/wsgi-test b/sca-cpp/trunk/modules/wsgi/wsgi-test
index 8b71f2e839..ed73940c94 100755
--- a/sca-cpp/trunk/modules/wsgi/wsgi-test
+++ b/sca-cpp/trunk/modules/wsgi/wsgi-test
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 mkdir -p tmp
@@ -25,37 +27,37 @@ mkdir -p tmp
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/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/wsgi/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/wsgi/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/wsgi/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/wsgi/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    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/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/wsgi/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/wsgi/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    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
+    $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
     rc=$?
 fi
diff --git a/sca-cpp/trunk/test/store-cpp/server-test b/sca-cpp/trunk/test/store-cpp/server-test
index 64315d7d92..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-cpp/server-test
+++ b/sca-cpp/trunk/test/store-cpp/server-test
@@ -18,13 +18,15 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
 ./start
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
 diff tmp/store.html htdocs/store.html
 rc=$?
 
diff --git a/sca-cpp/trunk/test/store-java/server-test b/sca-cpp/trunk/test/store-java/server-test
index 64315d7d92..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-java/server-test
+++ b/sca-cpp/trunk/test/store-java/server-test
@@ -18,13 +18,15 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
 ./start
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
 diff tmp/store.html htdocs/store.html
 rc=$?
 
diff --git a/sca-cpp/trunk/test/store-python/server-test b/sca-cpp/trunk/test/store-python/server-test
index 64315d7d92..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-python/server-test
+++ b/sca-cpp/trunk/test/store-python/server-test
@@ -18,13 +18,15 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
 ./start
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
 diff tmp/store.html htdocs/store.html
 rc=$?
 
diff --git a/sca-cpp/trunk/test/store-scheme/server-test b/sca-cpp/trunk/test/store-scheme/server-test
index 64315d7d92..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-scheme/server-test
+++ b/sca-cpp/trunk/test/store-scheme/server-test
@@ -18,13 +18,15 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
 ./start
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
 diff tmp/store.html htdocs/store.html
 rc=$?