Author: jsdelfino
Date: Sun Mar 28 07:29:13 2010
New Revision: 928352
URL: http://svn.apache.org/viewvc?rev=928352&view=rev
Log:
Add a host parameter to the conf scripts to allow an external DNS host name to
be used. Add HTTP basic auth to WSGI integration.
Added:
tuscany/sca-cpp/trunk/test/store-wsgi/htpasswd.py (contents, props
changed)
- copied, changed from r928231,
tuscany/sca-cpp/trunk/modules/http/http-test
Modified:
tuscany/sca-cpp/trunk/components/cache/server-test
tuscany/sca-cpp/trunk/components/chat/server-test
tuscany/sca-cpp/trunk/components/queue/server-test
tuscany/sca-cpp/trunk/components/webservice/server-test
tuscany/sca-cpp/trunk/modules/http/http-test
tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf
tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf
tuscany/sca-cpp/trunk/modules/http/httpd-conf
tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
tuscany/sca-cpp/trunk/modules/http/httpd-test
tuscany/sca-cpp/trunk/modules/java/server-test
tuscany/sca-cpp/trunk/modules/java/wiring-test
tuscany/sca-cpp/trunk/modules/python/server-test
tuscany/sca-cpp/trunk/modules/python/wiring-test
tuscany/sca-cpp/trunk/modules/server/httpd-test
tuscany/sca-cpp/trunk/modules/server/server-test
tuscany/sca-cpp/trunk/modules/server/wiring-test
tuscany/sca-cpp/trunk/modules/wsgi/httputil.py
tuscany/sca-cpp/trunk/test/store-cpp/ssl-start
tuscany/sca-cpp/trunk/test/store-cpp/start
tuscany/sca-cpp/trunk/test/store-java/ssl-start
tuscany/sca-cpp/trunk/test/store-java/start
tuscany/sca-cpp/trunk/test/store-python/ssl-start
tuscany/sca-cpp/trunk/test/store-python/start
tuscany/sca-cpp/trunk/test/store-scheme/ssl-start
tuscany/sca-cpp/trunk/test/store-scheme/start
Modified: tuscany/sca-cpp/trunk/components/cache/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/cache/server-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/cache/server-test (original)
+++ tuscany/sca-cpp/trunk/components/cache/server-test Sun Mar 28 07:29:13 2010
@@ -18,7 +18,7 @@
# under the License.
# Setup
-../../modules/http/httpd-conf tmp 8090 ../../modules/http/htdocs
+../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/components/chat/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/chat/server-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/chat/server-test (original)
+++ tuscany/sca-cpp/trunk/components/chat/server-test Sun Mar 28 07:29:13 2010
@@ -18,7 +18,7 @@
# under the License.
# Setup
-../../modules/http/httpd-conf tmp 8090 ../../modules/http/htdocs
+../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/components/queue/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/queue/server-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/queue/server-test (original)
+++ tuscany/sca-cpp/trunk/components/queue/server-test Sun Mar 28 07:29:13 2010
@@ -18,7 +18,7 @@
# under the License.
# Setup
-../../modules/http/httpd-conf tmp 8090 ../../modules/http/htdocs
+../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/components/webservice/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/components/webservice/server-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/components/webservice/server-test (original)
+++ tuscany/sca-cpp/trunk/components/webservice/server-test Sun Mar 28 07:29:13
2010
@@ -18,7 +18,7 @@
# under the License.
# Setup
-../../modules/http/httpd-conf tmp 8090 ../../modules/http/htdocs
+../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
./axis2-conf tmp
Modified: tuscany/sca-cpp/trunk/modules/http/http-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/http-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/http-test (original)
+++ tuscany/sca-cpp/trunk/modules/http/http-test Sun Mar 28 07:29:13 2010
@@ -18,7 +18,7 @@
# under the License.
# Setup
-./httpd-conf tmp 8090 htdocs
+./httpd-conf tmp localhost 8090 htdocs
./httpd-start tmp
sleep 2
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-ca-conf Sun Mar 28 07:29:13 2010
@@ -21,11 +21,8 @@
here=`readlink -f $0`; here=`dirname $here`
root=`readlink -f $1`
host=$2
-if [ "$host" = "" ]; then
- host=`hostname -f`
-fi
-# Don't regenerate the certificate if it already exists
+# Don't override existing certificate
if [ -f $root/conf/ca.crt ]; then
return 0
fi
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-cert-conf Sun Mar 28 07:29:13 2010
@@ -21,9 +21,6 @@
here=`readlink -f $0`; here=`dirname $here`
root=`readlink -f $1`
host=$2
-if [ "$host" = "" ]; then
- host=`hostname -f`
-fi
# Don't regenerate the certificate if it already exists
if [ -f $root/conf/server.crt ]; then
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-conf?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-conf Sun Mar 28 07:29:13 2010
@@ -20,9 +20,9 @@
# Generate a minimal HTTPD configuration
here=`readlink -f $0`; here=`dirname $here`
root=`readlink -f $1`
-port=$2
-htdocs=`readlink -f $3`
-host=`hostname -f`
+host=$2
+port=$3
+htdocs=`readlink -f $4`
user=`id -un`
group=`id -gn`
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf Sun Mar 28 07:29:13 2010
@@ -20,13 +20,9 @@
# Generate a minimal HTTPD SSL configuration
here=`readlink -f $0`; here=`dirname $here`
root=`readlink -f $1`
-port=$2
-if [ "$port" != "80" ]; then
- sslport=`echo "$port + 443" | bc`
-else
- sslport="443"
-fi
-host=`hostname -f`
+host=$2
+sslport=$3
+htdocs=`readlink -f $4`
# Extract organization name from our CA certificate
org=`openssl x509 -noout -subject -nameopt multiline -in $root/conf/ca.crt |
grep organizationName | awk -F "= " '{ print $2 }'`
@@ -61,7 +57,12 @@ SSLCACertificateFile "$root/conf/ca.crt"
SSLCertificateFile "$root/conf/server.crt"
SSLCertificateKeyFile "$root/conf/server.key"
BrowserMatch ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0
force-response-1.0
+
+# Logging
CustomLog "$root/logs/ssl_request_log" "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x
\"%r\" %b"
+LogFormat "%h %l %u %t %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %>s %b
\"%{Referer}i\" \"%{User-agent}i\"" sslcombined
+CustomLog $root/logs/ssl_access_log sslcombined
+LogLevel warn
# Require clients to present either:
# a certificate signed with our CA certificate of authority
@@ -91,9 +92,7 @@ SCASSLCertificateKeyFile "$root/conf/ser
EOF
# Create test users for HTTP basic authentication
-htpasswd -bc $root/conf/httpd.passwd admin admin 2>/dev/null
-htpasswd -b $root/conf/httpd.passwd user password 2>/dev/null
-htpasswd -b $root/conf/httpd.passwd test test 2>/dev/null
+htpasswd -bc $root/conf/httpd.passwd test test 2>/dev/null
htpasswd -b $root/conf/httpd.passwd foo foo 2>/dev/null
htpasswd -b $root/conf/httpd.passwd bar bar 2>/dev/null
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-test (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-test Sun Mar 28 07:29:13 2010
@@ -20,7 +20,7 @@
echo "Testing..."
# Setup
-./httpd-conf tmp 8090 htdocs
+./httpd-conf tmp localhost 8090 htdocs
./httpd-start tmp
sleep 2
Modified: tuscany/sca-cpp/trunk/modules/java/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/java/server-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/server-test (original)
+++ tuscany/sca-cpp/trunk/modules/java/server-test Sun Mar 28 07:29:13 2010
@@ -18,7 +18,7 @@
# under the License.
# Setup
-../http/httpd-conf tmp 8090 ../server/htdocs
+../http/httpd-conf tmp localhost 8090 ../server/htdocs
../server/server-conf tmp
./java-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/modules/java/wiring-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/java/wiring-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/wiring-test (original)
+++ tuscany/sca-cpp/trunk/modules/java/wiring-test Sun Mar 28 07:29:13 2010
@@ -20,7 +20,7 @@
echo "Testing..."
# Setup
-../http/httpd-conf tmp 8090 ../server/htdocs
+../http/httpd-conf tmp localhost 8090 ../server/htdocs
../server/server-conf tmp
./java-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/modules/python/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/python/server-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/server-test (original)
+++ tuscany/sca-cpp/trunk/modules/python/server-test Sun Mar 28 07:29:13 2010
@@ -18,7 +18,7 @@
# under the License.
# Setup
-../http/httpd-conf tmp 8090 ../server/htdocs
+../http/httpd-conf tmp localhost 8090 ../server/htdocs
../server/server-conf tmp
./python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/modules/python/wiring-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/python/wiring-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/wiring-test (original)
+++ tuscany/sca-cpp/trunk/modules/python/wiring-test Sun Mar 28 07:29:13 2010
@@ -20,7 +20,7 @@
echo "Testing..."
# Setup
-../http/httpd-conf tmp 8090 ../server/htdocs
+../http/httpd-conf tmp localhost 8090 ../server/htdocs
../server/server-conf tmp
./python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/modules/server/httpd-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/httpd-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/httpd-test (original)
+++ tuscany/sca-cpp/trunk/modules/server/httpd-test Sun Mar 28 07:29:13 2010
@@ -20,7 +20,7 @@
echo "Testing..."
# Setup
-../http/httpd-conf tmp 8090 htdocs
+../http/httpd-conf tmp localhost 8090 htdocs
./server-conf tmp
./scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/modules/server/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/server-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-test (original)
+++ tuscany/sca-cpp/trunk/modules/server/server-test Sun Mar 28 07:29:13 2010
@@ -18,7 +18,7 @@
# under the License.
# Setup
-../http/httpd-conf tmp 8090 htdocs
+../http/httpd-conf tmp localhost 8090 htdocs
./server-conf tmp
./scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/modules/server/wiring-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/wiring-test?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/wiring-test (original)
+++ tuscany/sca-cpp/trunk/modules/server/wiring-test Sun Mar 28 07:29:13 2010
@@ -20,7 +20,7 @@
echo "Testing..."
# Setup
-../http/httpd-conf tmp 8090 htdocs
+../http/httpd-conf tmp localhost 8090 htdocs
./server-conf tmp
./scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/modules/wsgi/httputil.py
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/httputil.py?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/httputil.py (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/httputil.py Sun Mar 28 07:29:13 2010
@@ -22,6 +22,9 @@ from httplib import HTTPConnection, HTTP
from urlparse import urlparse
from StringIO import StringIO
import os.path
+from string import strip
+from base64 import b64encode
+from sys import stderr
from util import *
from atomutil import *
from jsonutil import *
@@ -34,24 +37,35 @@ class client:
self.uri = urlparse(uri)
def __call__(self, func, *args):
- global id
- req = StringIO()
- writeStrings(jsonRequest(id, func, args), req)
- id = id + 1
- print "HTTP connect:", self.uri.hostname
+
+ # Connect to the configured URI
+ print >> stderr, "Client POST", self.uri.geturl()
c = None
+ headers = {"Content-type": "application/json-rpc"}
if self.uri.scheme == "https":
+
+ # With HTTPS, use a cerficate or HTTP basic authentication
if os.path.exists("server.key"):
c = HTTPSConnection(self.uri.hostname, 443 if self.uri.port ==
None else self.uri.port, "server.key", "server.crt")
else:
c = HTTPSConnection(self.uri.hostname, 443 if self.uri.port ==
None else self.uri.port)
+
+ # For HTTP basic authentication the user and password are
+ # provided by htpasswd.py
+ import htpasswd
+ auth = 'Basic ' + b64encode(htpasswd.user + ':' +
htpasswd.passwd)
+ headers["Authorization"] = auth
else:
c = HTTPConnection(self.uri.hostname, 80 if self.uri.port == None
else self.uri.port)
- print "HTTP connection:", c
- c.request("POST", self.uri.path, req.getvalue(), {"Content-type":
"application/json-rpc"})
+
+ # POST the JSON-RPC request
+ global id
+ req = StringIO()
+ writeStrings(jsonRequest(id, func, args), req)
+ id = id + 1
+ c.request("POST", self.uri.path, req.getvalue(), headers)
res = c.getresponse()
- print "HTTP response:", res
- print "HTTP status:", res.status
+ print >> stderr, "Client status", res.status
if res.status != 200:
return None
return jsonResultValue((res.read(),))
Modified: tuscany/sca-cpp/trunk/test/store-cpp/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-cpp/ssl-start?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-cpp/ssl-start (original)
+++ tuscany/sca-cpp/trunk/test/store-cpp/ssl-start Sun Mar 28 07:29:13 2010
@@ -17,10 +17,10 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/httpd-ca-conf tmp
-../../modules/http/httpd-cert-conf tmp
-../../modules/http/httpd-conf tmp 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp 8090
+../../modules/http/httpd-ca-conf tmp localhost
+../../modules/http/httpd-cert-conf tmp localhost
+../../modules/http/httpd-conf tmp localhost 8090 htdocs
+../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
../../modules/server/server-conf tmp
../../modules/server/cpp-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/test/store-cpp/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-cpp/start?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-cpp/start (original)
+++ tuscany/sca-cpp/trunk/test/store-cpp/start Sun Mar 28 07:29:13 2010
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/httpd-conf tmp 8090 htdocs
+../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/server/server-conf tmp
../../modules/server/cpp-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/test/store-java/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-java/ssl-start?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-java/ssl-start (original)
+++ tuscany/sca-cpp/trunk/test/store-java/ssl-start Sun Mar 28 07:29:13 2010
@@ -17,10 +17,10 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/httpd-ca-conf tmp
-../../modules/http/httpd-cert-conf tmp
-../../modules/http/httpd-conf tmp 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp 8090
+../../modules/http/httpd-ca-conf tmp localhost
+../../modules/http/httpd-cert-conf tmp localhost
+../../modules/http/httpd-conf tmp localhost 8090 htdocs
+../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
../../modules/server/server-conf tmp
../../modules/java/java-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/test/store-java/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-java/start?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-java/start (original)
+++ tuscany/sca-cpp/trunk/test/store-java/start Sun Mar 28 07:29:13 2010
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/httpd-conf tmp 8090 htdocs
+../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/server/server-conf tmp
../../modules/java/java-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/test/store-python/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/ssl-start?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/ssl-start (original)
+++ tuscany/sca-cpp/trunk/test/store-python/ssl-start Sun Mar 28 07:29:13 2010
@@ -17,10 +17,10 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/httpd-ca-conf tmp
-../../modules/http/httpd-cert-conf tmp
-../../modules/http/httpd-conf tmp 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp 8090
+../../modules/http/httpd-ca-conf tmp localhost
+../../modules/http/httpd-cert-conf tmp localhost
+../../modules/http/httpd-conf tmp localhost 8090 htdocs
+../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/test/store-python/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/start?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/start (original)
+++ tuscany/sca-cpp/trunk/test/store-python/start Sun Mar 28 07:29:13 2010
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/httpd-conf tmp 8090 htdocs
+../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/test/store-scheme/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/ssl-start?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/ssl-start (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/ssl-start Sun Mar 28 07:29:13 2010
@@ -17,10 +17,10 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/httpd-ca-conf tmp
-../../modules/http/httpd-cert-conf tmp
-../../modules/http/httpd-conf tmp 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp 8090
+../../modules/http/httpd-ca-conf tmp localhost
+../../modules/http/httpd-cert-conf tmp localhost
+../../modules/http/httpd-conf tmp localhost 8090 htdocs
+../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/test/store-scheme/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/start?rev=928352&r1=928351&r2=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/start (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/start Sun Mar 28 07:29:13 2010
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/httpd-conf tmp 8090 htdocs
+../../modules/http/httpd-conf tmp localhost 8090 htdocs
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Copied: tuscany/sca-cpp/trunk/test/store-wsgi/htpasswd.py (from r928231,
tuscany/sca-cpp/trunk/modules/http/http-test)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-wsgi/htpasswd.py?p2=tuscany/sca-cpp/trunk/test/store-wsgi/htpasswd.py&p1=tuscany/sca-cpp/trunk/modules/http/http-test&r1=928231&r2=928352&rev=928352&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/http-test (original)
+++ tuscany/sca-cpp/trunk/test/store-wsgi/htpasswd.py Sun Mar 28 07:29:13 2010
@@ -1,5 +1,3 @@
-#!/bin/sh
-
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -17,16 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-# Setup
-./httpd-conf tmp 8090 htdocs
-./httpd-start tmp
-sleep 2
-
-# Test
-./curl-test
-rc=$?
+# Configure the user and password used for HTTP basic authentication
+user = "foo"
+passwd = "foo"
-# Cleanup
-./httpd-stop tmp
-sleep 2
-return $rc
