25 files changed, 101 insertions, 29 deletions
diff --git a/sca-cpp/trunk/samples/loan-python/htdocs/index.html b/sca-cpp/trunk/samples/loan-python/htdocs/index.html
index bb05427a37..fe9ed4fd6a 100644
--- a/sca-cpp/trunk/samples/loan-python/htdocs/index.html
+++ b/sca-cpp/trunk/samples/loan-python/htdocs/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var component = new tuscany.sca.Component("Store");
diff --git a/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html b/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html
index c1c38c9d6e..3d9a74103c 100644
--- a/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html
+++ b/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html b/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html
index cce2939f1a..bd3ced57f9 100644
--- a/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html
+++ b/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-cluster/server-ssl-conf b/sca-cpp/trunk/samples/store-cluster/server-ssl-conf
index 06ca590efb..8799fbdf6d 100755
--- a/sca-cpp/trunk/samples/store-cluster/server-ssl-conf
+++ b/sca-cpp/trunk/samples/store-cluster/server-ssl-conf
@@ -31,7 +31,7 @@ tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C $root -x
 ../../modules/http/httpd-ssl-conf $root $sslport/443
 ../../modules/http/vhost-ssl-conf $root
 
-#../../modules/http/httpd-auth-conf $root
+#../../modules/http/basic-auth-conf $root
 ../../modules/oauth/oauth-conf $root
 ../../modules/oauth/oauth-memcached-conf $root localhost 11211
 ../../modules/oauth/oauth-memcached-conf $root localhost 11212
diff --git a/sca-cpp/trunk/samples/store-cluster/start b/sca-cpp/trunk/samples/store-cluster/start
index 5f233135b3..98293d3f98 100755
--- a/sca-cpp/trunk/samples/store-cluster/start
+++ b/sca-cpp/trunk/samples/store-cluster/start
@@ -59,21 +59,21 @@ sleep 1
 sleep 1
 
 # Start two proxy balancers
-./proxy-conf tmp/proxy1 8091
+./proxy-conf tmp/proxy1 8090
 ../../modules/http/proxy-member-conf tmp/proxy1 localhost 8101
 ../../modules/http/proxy-member-conf tmp/proxy1 localhost 8102
 ../../modules/http/proxy-member-conf tmp/proxy1 localhost 8103
 ../../modules/http/httpd-start tmp/proxy1
 
-./proxy-conf tmp/proxy2 8092
+./proxy-conf tmp/proxy2 8091
 ../../modules/http/proxy-member-conf tmp/proxy2 localhost 8101
 ../../modules/http/proxy-member-conf tmp/proxy2 localhost 8102
 ../../modules/http/proxy-member-conf tmp/proxy2 localhost 8103
 ../../modules/http/httpd-start tmp/proxy2
 
 # Redirect traffic from port 80 to proxy1
-#sudo ../../ubuntu/ip-redirect-all 80 8091
+#sudo ../../ubuntu/ip-redirect-all 80 8090
 
 # Redirect traffic from port 80 to proxy2
-#sudo ../../ubuntu/ip-redirect-all 80 8092
+#sudo ../../ubuntu/ip-redirect-all 80 8091
 
diff --git a/sca-cpp/trunk/samples/store-cpp/htdocs/index.html b/sca-cpp/trunk/samples/store-cpp/htdocs/index.html
index 27007eb09d..e5560d7b83 100644
--- a/sca-cpp/trunk/samples/store-cpp/htdocs/index.html
+++ b/sca-cpp/trunk/samples/store-cpp/htdocs/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-cpp/ssl-start b/sca-cpp/trunk/samples/store-cpp/ssl-start
index 247c77db67..f65b951c24 100755
--- a/sca-cpp/trunk/samples/store-cpp/ssl-start
+++ b/sca-cpp/trunk/samples/store-cpp/ssl-start
@@ -21,7 +21,7 @@
 ../../modules/http/ssl-cert-conf tmp localhost
 ../../modules/http/httpd-conf tmp localhost 8090 htdocs
 ../../modules/http/httpd-ssl-conf tmp 8453
-../../modules/http/httpd-auth-conf tmp
+../../modules/http/basic-auth-conf tmp
 ../../modules/server/server-conf tmp
 ../../modules/server/cpp-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
diff --git a/sca-cpp/trunk/samples/store-gae/Makefile.am b/sca-cpp/trunk/samples/store-gae/Makefile.am
index 98e5814dca..a472e3d9f6 100644
--- a/sca-cpp/trunk/samples/store-gae/Makefile.am
+++ b/sca-cpp/trunk/samples/store-gae/Makefile.am
@@ -22,19 +22,19 @@ dist_sample_SCRIPTS = start stop
 sampledir = $(prefix)/samples/store-gae
 
 BUILT_SOURCES = target.stamp 
-target.stamp: app.yaml *.py *.composite $(top_builddir)/modules/wsgi/*.py htdocs/* $(top_builddir)/modules/server/htdocs/js/*
+target.stamp: app.yaml *.py *.composite $(top_builddir)/modules/wsgi/*.py htdocs/* $(top_builddir)/modules/server/htdocs/wiring/*
 	mkdir -p target
 	cp app.yaml *.py *.composite `ls $(top_builddir)/modules/wsgi/*.py | grep -v "\-test"` target
 	mkdir -p target/htdocs
 	cp -R htdocs/* target/htdocs
-	mkdir -p target/htdocs/js
-	cp -R $(top_builddir)/modules/server/htdocs/js/* target/htdocs/js
+	mkdir -p target/htdocs/wiring
+	cp -R $(top_builddir)/modules/server/htdocs/wiring/* target/htdocs/wiring
 	touch target.stamp
 
 clean-local:
 	rm -rf target.stamp target
 
-nobase_sample_DATA = target/app.yaml target/*.py target/*.composite target/htdocs/*.html target/htdocs/js/*.js
+nobase_sample_DATA = target/app.yaml target/*.py target/*.composite target/htdocs/*.html target/htdocs/wiring/*.js
 
 EXTRA_DIST = app.yaml *.composite *.py htdocs/*.html
 
diff --git a/sca-cpp/trunk/samples/store-gae/htdocs/index.html b/sca-cpp/trunk/samples/store-gae/htdocs/index.html
index 3823f58f14..cd61b7cabb 100644
--- a/sca-cpp/trunk/samples/store-gae/htdocs/index.html
+++ b/sca-cpp/trunk/samples/store-gae/htdocs/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-java/htdocs/index.html b/sca-cpp/trunk/samples/store-java/htdocs/index.html
index 27007eb09d..e5560d7b83 100644
--- a/sca-cpp/trunk/samples/store-java/htdocs/index.html
+++ b/sca-cpp/trunk/samples/store-java/htdocs/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-java/ssl-start b/sca-cpp/trunk/samples/store-java/ssl-start
index 4948ddda40..daad068cb5 100755
--- a/sca-cpp/trunk/samples/store-java/ssl-start
+++ b/sca-cpp/trunk/samples/store-java/ssl-start
@@ -21,7 +21,7 @@
 ../../modules/http/ssl-cert-conf tmp localhost
 ../../modules/http/httpd-conf tmp localhost 8090 htdocs
 ../../modules/http/httpd-ssl-conf tmp 8453
-../../modules/http/httpd-auth-conf tmp
+../../modules/http/basic-auth-conf tmp
 ../../modules/server/server-conf tmp
 ../../modules/java/java-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
diff --git a/sca-cpp/trunk/samples/store-nosql/htdocs/index.html b/sca-cpp/trunk/samples/store-nosql/htdocs/index.html
index 27007eb09d..e5560d7b83 100644
--- a/sca-cpp/trunk/samples/store-nosql/htdocs/index.html
+++ b/sca-cpp/trunk/samples/store-nosql/htdocs/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-nosql/ssl-start b/sca-cpp/trunk/samples/store-nosql/ssl-start
index 4b910d6c12..067ea4640f 100755
--- a/sca-cpp/trunk/samples/store-nosql/ssl-start
+++ b/sca-cpp/trunk/samples/store-nosql/ssl-start
@@ -21,7 +21,7 @@
 ../../modules/http/ssl-cert-conf tmp localhost
 ../../modules/http/httpd-conf tmp localhost 8090 htdocs
 ../../modules/http/httpd-ssl-conf tmp 8453
-../../modules/http/httpd-auth-conf tmp
+../../modules/http/basic-auth-conf tmp
 ../../modules/server/server-conf tmp
 ../../modules/server/scheme-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
diff --git a/sca-cpp/trunk/samples/store-python/Makefile.am b/sca-cpp/trunk/samples/store-python/Makefile.am
index 7a38fa50f3..8db150cc0e 100644
--- a/sca-cpp/trunk/samples/store-python/Makefile.am
+++ b/sca-cpp/trunk/samples/store-python/Makefile.am
@@ -20,7 +20,7 @@ if WANT_PYTHON
 dist_sample_SCRIPTS = start stop ssl-start uec2-start
 sampledir = $(prefix)/samples/store-python
 
-nobase_dist_sample_DATA = currency-converter.py fruits-catalog.py shopping-cart.py store.py store.composite htdocs/*.html
+nobase_dist_sample_DATA = currency-converter.py fruits-catalog.py shopping-cart.py store.py store.composite htdocs/*.html htdocs/login/*.html htdocs/logout/*.html
 
 dist_noinst_SCRIPTS = server-test
 TESTS = server-test
diff --git a/sca-cpp/trunk/samples/store-python/htdocs/index.html b/sca-cpp/trunk/samples/store-python/htdocs/index.html
index 27007eb09d..e5560d7b83 100644
--- a/sca-cpp/trunk/samples/store-python/htdocs/index.html
+++ b/sca-cpp/trunk/samples/store-python/htdocs/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-python/htdocs/login/index.html b/sca-cpp/trunk/samples/store-python/htdocs/login/index.html
new file mode 100644
index 0000000000..f3542f1524
--- /dev/null
+++ b/sca-cpp/trunk/samples/store-python/htdocs/login/index.html
@@ -0,0 +1,39 @@
+<!--
+   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.
+-->
+
+<html><body><h1>Sign in</h1>
+
+<script type="text/javascript">
+function submitFormSignin() {
+    document.formSignin.httpd_location.value = '/';
+    document.formSignin.submit();
+}
+</script>
+
+<form name="formSignin" method="POST" action="/login/dologin">
+<table border="0">
+<tr><td>Username:</td><td><input type="text" name="httpd_username" value=""/></td></tr>
+<tr><td>Password:</td><td><input type="password" name="httpd_password" value=""/></td></tr>
+<tr><td><input type="button" onclick="submitFormSignin()" value="Sign in"/></td><td></td></tr>
+</table>
+<input type="hidden" name="httpd_location" value="/"/>
+</form>
+
+</body>
+</html>
diff --git a/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html b/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html
new file mode 100644
index 0000000000..1ac6e39a1c
--- /dev/null
+++ b/sca-cpp/trunk/samples/store-python/htdocs/logout/index.html
@@ -0,0 +1,33 @@
+<!--
+   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.
+-->
+
+<html><body>
+<h1>Sign out</h1>
+
+<form name="signout" action="/login" method="GET">
+<script type="text/javascript">
+function submitSignout() {
+    document.cookie = 'TuscanyFormAuth=;expires=' + new Date(1970,01,01).toGMTString() + ';path=/;secure=TRUE';
+    document.signout.submit();
+    return true;
+}
+</script>
+<input type="button" onclick="submitSignout()" value="Sign out"/>
+</form>
+</body></html>
diff --git a/sca-cpp/trunk/samples/store-python/ssl-start b/sca-cpp/trunk/samples/store-python/ssl-start
index 83f7a5a271..fdcd16c6c4 100755
--- a/sca-cpp/trunk/samples/store-python/ssl-start
+++ b/sca-cpp/trunk/samples/store-python/ssl-start
@@ -21,7 +21,7 @@
 ../../modules/http/ssl-cert-conf tmp localhost
 ../../modules/http/httpd-conf tmp localhost 8090 htdocs
 ../../modules/http/httpd-ssl-conf tmp 8453
-../../modules/http/httpd-auth-conf tmp
+../../modules/http/open-auth-conf tmp
 ../../modules/server/server-conf tmp
 ../../modules/python/python-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
diff --git a/sca-cpp/trunk/samples/store-scheme/htdocs/index.html b/sca-cpp/trunk/samples/store-scheme/htdocs/index.html
index 27007eb09d..e5560d7b83 100644
--- a/sca-cpp/trunk/samples/store-scheme/htdocs/index.html
+++ b/sca-cpp/trunk/samples/store-scheme/htdocs/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-scheme/ssl-start b/sca-cpp/trunk/samples/store-scheme/ssl-start
index 13ef8c8aed..667e2593cc 100755
--- a/sca-cpp/trunk/samples/store-scheme/ssl-start
+++ b/sca-cpp/trunk/samples/store-scheme/ssl-start
@@ -21,7 +21,7 @@
 ../../modules/http/ssl-cert-conf tmp localhost
 ../../modules/http/httpd-conf tmp localhost 8090 htdocs
 ../../modules/http/httpd-ssl-conf tmp 8453
-../../modules/http/httpd-auth-conf tmp
+../../modules/http/basic-auth-conf tmp
 ../../modules/server/server-conf tmp
 ../../modules/server/scheme-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
diff --git a/sca-cpp/trunk/samples/store-sql/htdocs/index.html b/sca-cpp/trunk/samples/store-sql/htdocs/index.html
index 27007eb09d..e5560d7b83 100644
--- a/sca-cpp/trunk/samples/store-sql/htdocs/index.html
+++ b/sca-cpp/trunk/samples/store-sql/htdocs/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-sql/ssl-start b/sca-cpp/trunk/samples/store-sql/ssl-start
index 9263e16dfb..2287d2a546 100755
--- a/sca-cpp/trunk/samples/store-sql/ssl-start
+++ b/sca-cpp/trunk/samples/store-sql/ssl-start
@@ -21,7 +21,7 @@
 ../../modules/http/ssl-cert-conf tmp localhost
 ../../modules/http/httpd-conf tmp localhost 8090 htdocs
 ../../modules/http/httpd-ssl-conf tmp 8453
-../../modules/http/httpd-auth-conf tmp
+../../modules/http/basic-auth-conf tmp
 ../../modules/server/server-conf tmp
 ../../modules/server/scheme-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
diff --git a/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html b/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html
index c1c38c9d6e..3d9a74103c 100644
--- a/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html
+++ b/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html b/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html
index cce2939f1a..bd3ced57f9 100644
--- a/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html
+++ b/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html
@@ -20,7 +20,7 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="/js/ref.js"></script>
+<script type="text/javascript" src="/wiring/ref.js"></script>
 
 <script type="text/javascript">
 var store = component("Store");
diff --git a/sca-cpp/trunk/samples/store-vhost/ssl-start b/sca-cpp/trunk/samples/store-vhost/ssl-start
index 719f54fae2..e4f2e58524 100755
--- a/sca-cpp/trunk/samples/store-vhost/ssl-start
+++ b/sca-cpp/trunk/samples/store-vhost/ssl-start
@@ -27,7 +27,7 @@
 ../../modules/http/vhost-conf tmp
 ../../modules/http/httpd-ssl-conf tmp 8453
 ../../modules/http/vhost-ssl-conf tmp
-../../modules/http/httpd-auth-conf tmp
+../../modules/http/basic-auth-conf tmp
 ../../modules/server/server-conf tmp
 ../../modules/python/python-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF