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.

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

9 files changed, 41 insertions, 20 deletions

diff --git a/sca-cpp/trunk/test/store-cpp/ssl-start b/sca-cpp/trunk/test/store-cpp/ssl-start
index 7ce9e86680..9cb5b88974 100755
--- a/sca-cpp/trunk/test/store-cpp/ssl-start
+++ b/sca-cpp/trunk/test/store-cpp/ssl-start
@@ -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
diff --git a/sca-cpp/trunk/test/store-cpp/start b/sca-cpp/trunk/test/store-cpp/start
index 4760dccbc3..7b9c0d6379 100755
--- a/sca-cpp/trunk/test/store-cpp/start
+++ b/sca-cpp/trunk/test/store-cpp/start
@@ -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
diff --git a/sca-cpp/trunk/test/store-java/ssl-start b/sca-cpp/trunk/test/store-java/ssl-start
index 314210359c..ec44ba1ac0 100755
--- a/sca-cpp/trunk/test/store-java/ssl-start
+++ b/sca-cpp/trunk/test/store-java/ssl-start
@@ -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
diff --git a/sca-cpp/trunk/test/store-java/start b/sca-cpp/trunk/test/store-java/start
index 7f5823ed66..c8146e9e46 100755
--- a/sca-cpp/trunk/test/store-java/start
+++ b/sca-cpp/trunk/test/store-java/start
@@ -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
diff --git a/sca-cpp/trunk/test/store-python/ssl-start b/sca-cpp/trunk/test/store-python/ssl-start
index c240e58d09..1e70d6edfb 100755
--- a/sca-cpp/trunk/test/store-python/ssl-start
+++ b/sca-cpp/trunk/test/store-python/ssl-start
@@ -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
diff --git a/sca-cpp/trunk/test/store-python/start b/sca-cpp/trunk/test/store-python/start
index 2874d5c3e6..8df7875634 100755
--- a/sca-cpp/trunk/test/store-python/start
+++ b/sca-cpp/trunk/test/store-python/start
@@ -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
diff --git a/sca-cpp/trunk/test/store-scheme/ssl-start b/sca-cpp/trunk/test/store-scheme/ssl-start
index 3d96c3b257..14b85f5342 100755
--- a/sca-cpp/trunk/test/store-scheme/ssl-start
+++ b/sca-cpp/trunk/test/store-scheme/ssl-start
@@ -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
diff --git a/sca-cpp/trunk/test/store-scheme/start b/sca-cpp/trunk/test/store-scheme/start
index 51c74fbea3..ffd7173ee2 100755
--- a/sca-cpp/trunk/test/store-scheme/start
+++ b/sca-cpp/trunk/test/store-scheme/start
@@ -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
diff --git a/sca-cpp/trunk/test/store-wsgi/htpasswd.py b/sca-cpp/trunk/test/store-wsgi/htpasswd.py
new file mode 100644
index 0000000000..75d94f58b6
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/htpasswd.py
@@ -0,0 +1,21 @@
+#  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
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+# Configure the user and password used for HTTP basic authentication
+user = "foo"
+passwd = "foo"
+