Added a WSGI store test case, plus a few fixes to get it working.

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

17 files changed, 1304 insertions, 31 deletions

diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac
index b630144b65..16a5f49bd4 100644
--- a/sca-cpp/trunk/configure.ac
+++ b/sca-cpp/trunk/configure.ac
@@ -595,6 +595,7 @@ AC_CONFIG_FILES([Makefile
                  test/store-cpp/Makefile
                  test/store-python/Makefile
                  test/store-java/Makefile
+                 test/store-wsgi/Makefile
                  doc/Makefile
                  doc/Doxyfile
                  ])
diff --git a/sca-cpp/trunk/modules/server/client-test.hpp b/sca-cpp/trunk/modules/server/client-test.hpp
index 91dfe89499..9b37a73803 100644
--- a/sca-cpp/trunk/modules/server/client-test.hpp
+++ b/sca-cpp/trunk/modules/server/client-test.hpp
@@ -49,13 +49,13 @@ const bool testGet() {
     http::CURLSession ch;
     {
         ostringstream os;
-        const failable<list<ostream*> > r = http::get<ostream*>(curlWriter, &os, "http://localhost:8090", ch);
+        const failable<list<ostream*> > r = http::get<ostream*>(curlWriter, &os, "http://localhost:8090/index.html", ch);
         assert(hasContent(r));
-        assert(contains(str(os), "HTTP/1.1 200 OK") || contains(str(os), "HTTP/1.0 200 OK"));
+        assert(contains(str(os), "HTTP/1.1 200") || contains(str(os), "HTTP/1.0 200"));
         assert(contains(str(os), "It works"));
     }
     {
-        const failable<value> r = http::getcontent("http://localhost:8090", ch);
+        const failable<value> r = http::getcontent("http://localhost:8090/index.html", ch);
         assert(hasContent(r));
         assert(contains(car(reverse(list<value>(content(r)))), "It works"));
     }
@@ -67,7 +67,7 @@ struct getLoop {
     getLoop(http::CURLSession& ch) : ch(ch) {
     }
     const bool operator()() const {
-        const failable<value> r = http::getcontent("http://localhost:8090", ch);
+        const failable<value> r = http::getcontent("http://localhost:8090/index.html", ch);
         assert(hasContent(r));
         assert(contains(car(reverse(list<value>(content(r)))), "It works"));
         return true;
diff --git a/sca-cpp/trunk/modules/wsgi/app.yaml b/sca-cpp/trunk/modules/wsgi/app.yaml
index 40addef28f..bc70aceced 100644
--- a/sca-cpp/trunk/modules/wsgi/app.yaml
+++ b/sca-cpp/trunk/modules/wsgi/app.yaml
@@ -41,5 +41,10 @@ skip_files:
 - ^(.*/)?wsgi-stop

 

 handlers:

+- url: /(.*\.(html|js|png))

+  static_files: htdocs/\1

+  upload: htdocs/(.*\.(html|js|png))

+

 - url: /.*

   script: composite.py

+

diff --git a/sca-cpp/trunk/modules/wsgi/atomutil.py b/sca-cpp/trunk/modules/wsgi/atomutil.py
index 3e3e08b27e..0ec83ca9e0 100644
--- a/sca-cpp/trunk/modules/wsgi/atomutil.py
+++ b/sca-cpp/trunk/modules/wsgi/atomutil.py
@@ -45,7 +45,7 @@ def readATOMEntry(l):
 
 # Convert a list of values representy an ATOM entry to a value
 def entryValue(e):
-    v = elementsToValues((caddr(e)))
+    v = elementsToValues((caddr(e),))
     return cons(car(e), (cadr(e), cdr(car(v))))
 
 # Convert a list of strings to a list of values representing an ATOM feed
diff --git a/sca-cpp/trunk/modules/wsgi/composite.py b/sca-cpp/trunk/modules/wsgi/composite.py
index 3cccaa4ae4..0434a6b3af 100755
--- a/sca-cpp/trunk/modules/wsgi/composite.py
+++ b/sca-cpp/trunk/modules/wsgi/composite.py
@@ -21,13 +21,18 @@
 from wsgiref.simple_server import make_server
 from wsgiref.handlers import CGIHandler
 from wsgiref.util import request_uri
+from wsgiref.util import FileWrapper
 from os import environ
+import os.path
 from sys import stderr, argv
 from util import *
 from scdl import *
 from atomutil import *
 from jsonutil import *
 
+# Cache the deployed components between requests
+comps = None
+
 # Return the path of an HTTP request
 def requestPath(e):
     return e.get("PATH_INFO", "")
@@ -67,6 +72,9 @@ def result(r, st, h = (), b = ()):
     r(car(s), list(h))
     return cdr(s)
 
+# Send a file
+def fileresult(f):
+    return tuple(FileWrapper(open("htdocs" + f)))
 
 # Converts the args received in a POST to a list of key value pairs
 def postArgs(a):
@@ -77,21 +85,24 @@ def postArgs(a):
 
 # WSGI application function
 def application(e, r):
+    m = requestMethod(e)
+    fpath = requestPath(e)
 
-    # Read the deployed composite
-    compos = components(parse("domain-test.composite"))
-    #print >> stderr, compos
+    # Debug hook
+    if fpath == "/debug":
+        return result(r, 200, (("Content-type", "text/plain"),), ("Debug",))
 
-    # Evaluate the deployed components
-    comps = evalComponents(compos)
-    
-    # Get the request path and method
-    path = tokens(requestPath(e))
-    m = requestMethod(e)
-    if (isNil(path) or path == ("index.html",)) and m == "GET":
-        return result(r, 200, (("Content-type", "text/html"),), ("<html><body><h1>It works!</h1></body></html>",))
+    # Serve static files
+    if m == "GET":
+        if fpath.endswith(".html"):
+            return result(r, 200, (("Content-type", "text/html"),), fileresult(fpath))
+        if fpath.endswith(".js"):
+            return result(r, 200, (("Content-type", "application/x-javascript"),), fileresult(fpath))
+        if fpath.endswith(".png"):
+            return result(r, 200, (("Content-type", "image/png"),), fileresult(fpath))
 
     # Find the requested component
+    path = tokens(fpath)
     uc = uriToComponent(path, comps)
     uri = car(uc)
     if uri == None:
@@ -100,7 +111,7 @@ def application(e, r):
 
     # Call the requested component function
     id = path[len(uri):]
-    if (m == "GET"):
+    if m == "GET":
         v = comp("get", id)
         
         # Write returned content-type / content pair
@@ -148,21 +159,30 @@ def application(e, r):
             return result(r, 404)
         return result(r, 200)
     
-    # TODO implement POST and PUT methods
     return result(r, 500)
 
 # Return the WSGI server type
 def serverType(e):
     return e.get("SERVER_SOFTWARE", "")
 
-# Run the WSGI application
-if __name__ == "__main__":
+def main():
+    # Read the deployed composite and evaluate the configured components
+    global comps
+    if comps == None:
+        domain = "domain.composite" if os.path.exists("domain.composite") else "domain-test.composite"
+        comps = evalComponents(components(parse(domain)))
+
+    # Handle the WSGI request with the WSGI runtime
     st = serverType(environ)
-    if st == "":
-        make_server("", int(argv[1]), application).serve_forever()
-    elif st == "Development/1.0":
+    if st.find("App Engine") != -1 or st.find("Development") != -1:
         from google.appengine.ext.webapp.util import run_wsgi_app
         run_wsgi_app(application)
-    else:
+    elif st != "":
         CGIHandler().run(application)
+    else:
+        make_server("", int(argv[1]), application).serve_forever()
+
+# Run the WSGI application
+if __name__ == "__main__":
+    main()
 
diff --git a/sca-cpp/trunk/modules/wsgi/scdl.py b/sca-cpp/trunk/modules/wsgi/scdl.py
index 056523fb23..2e57c77377 100644
--- a/sca-cpp/trunk/modules/wsgi/scdl.py
+++ b/sca-cpp/trunk/modules/wsgi/scdl.py
@@ -33,27 +33,31 @@ def elt(e):
 def att(e):
     return elt(e).attrib
 
+def text(e):
+    return elt(e).text
+
 def match(e, ev, tag):
     return evt(e) == ev and elt(e).tag.find("}" + tag) != -1
 
 # Make a callable component
 class component:
-    def __init__(self, name, impl, svcs, refs):
+    def __init__(self, name, impl, svcs, refs, props):
         self.name = name
         self.impl = impl
         self.mod = None
         self.svcs = svcs
         self.refs = refs
+        self.props = props
         self.proxies = ()
 
     def __call__(self, func, *args):
         return self.mod.__getattribute__(func)(*(args + self.proxies))
 
     def __repr__(self):
-        return repr((self.name, self.impl, self.mod, self.svcs, self.refs, self.proxies))
+        return repr((self.name, self.impl, self.mod, self.svcs, self.refs, self.props, self.proxies))
 
-def mkcomponent(name, impl, svcs, refs):
-    return component(name, impl, svcs, refs)
+def mkcomponent(name, impl, svcs, refs, props):
+    return component(name, impl, svcs, refs, props)
 
 # Return the Python module name of a component implementation
 def implementation(e):
@@ -81,9 +85,17 @@ def references(e):
     if match(car(e), "start", "reference") == False:
         return references(cdr(e))
     if "target" in att(car(e)):
-        return (att(car(e))["target"],) + references(cdr(e))
+        return cons(att(car(e))["target"], references(cdr(e)))
     return cons(binding(e), references(cdr(e)))
 
+# Return the list of properties under a SCDL component element
+def properties(e):
+    if len(e) == 0 or match(car(e), "end", "component") == True:
+        return ()
+    if match(car(e), "start", "property") == False:
+        return properties(cdr(e))
+    return cons(text(car(e)), properties(cdr(e)))
+
 # Return the list of services under a SCDL component element
 def services(e):
     if len(e) == 0 or match(car(e), "end", "component") == True:
@@ -103,7 +115,7 @@ def components(e):
     if match(car(e), "start", "component") == False:
         return components(cdr(e))
     n = name(e)
-    return cons(mkcomponent(n, implementation(e), cons(("components", n), services(e)), references(e)), components(cdr(e)))
+    return cons(mkcomponent(n, implementation(e), cons(("components", n), services(e)), references(e), properties(e)), components(cdr(e)))
 
 # Find a component with a given name
 def nameToComponent(name, comps):
@@ -133,7 +145,12 @@ def uriToComponent(u, comps):
 # Evaluate a component, resolve its implementation and references
 def evalComponent(comp, comps):
     comp.mod = __import__(comp.impl)
-    comp.proxies = tuple(map(lambda r: nameToComponent(r, comps), comp.refs))
+
+    # Make a list of proxy lambda functions for the component references and properties
+    # A reference proxy is the callable lambda function of the component wired to the reference
+    # A property proxy is a lambda function that returns the value of the property
+    comp.proxies = tuple(map(lambda r: nameToComponent(r, comps), comp.refs)) + tuple(map(lambda v: lambda: v, comp.props))
+
     return comp
 
 # Evaluate a list of components
diff --git a/sca-cpp/trunk/modules/wsgi/wsgi-package b/sca-cpp/trunk/modules/wsgi/wsgi-package
new file mode 100755
index 0000000000..28756f9494
--- /dev/null
+++ b/sca-cpp/trunk/modules/wsgi/wsgi-package
@@ -0,0 +1,30 @@
+#!/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
+#  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.
+
+# Package a WSGI app for upload
+here=`readlink -f $0`; here=`dirname $here`
+pwd=`pwd`
+root=`readlink -f $pwd`
+
+rm -rf target
+mkdir -p target
+cd target
+ls $here/*.py | grep -v "\-test.py" | xargs -i -t ln -s -f {}
+ls $root | grep -v "target" | xargs -i -t ln -s -f $root/{}
+
diff --git a/sca-cpp/trunk/test/store-wsgi/Makefile.am b/sca-cpp/trunk/test/store-wsgi/Makefile.am
new file mode 100644
index 0000000000..132dee78f4
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/Makefile.am
@@ -0,0 +1,22 @@
+#  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.
+
+if WANT_PYTHON
+
+#TESTS = server-test
+
+endif
diff --git a/sca-cpp/trunk/test/store-wsgi/app.yaml b/sca-cpp/trunk/test/store-wsgi/app.yaml
new file mode 100644
index 0000000000..1e2dc05547
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/app.yaml
@@ -0,0 +1,50 @@
+#  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.

+

+application: sca-store

+version: 1

+runtime: python

+api_version: 1

+skip_files:

+- ^(.*/)?app\.yaml

+- ^(.*/)?app\.yml

+- ^(.*/)?index\.yaml

+- ^(.*/)?index\.yml

+- ^(.*/)?#.*#

+- ^(.*/)?.*~

+- ^(.*/)?.*\.py[co]

+- ^(.*/)?.*/RCS/.*

+- ^(.*/)?\..*

+- ^(.*/)?.*-test$

+- ^(.*/)?.*\.cpp$

+- ^(.*/)?.*\.o$

+- ^(.*/)?core$

+- ^(.*/)?.*\.out$

+- ^(.*/)?.*\.log$

+- ^(.*/)?Makefile.*

+- ^(.*/)?tmp/.*

+- ^(.*/)?wsgi-start

+- ^(.*/)?wsgi-stop

+

+handlers:

+- url: /(.*\.(html|png))

+  static_files: htdocs/\1

+  upload: htdocs/(.*\.(html|png))

+

+- url: /.*

+  script: composite.py

+

diff --git a/sca-cpp/trunk/test/store-wsgi/currency-converter.py b/sca-cpp/trunk/test/store-wsgi/currency-converter.py
new file mode 100644
index 0000000000..2fded8f616
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/currency-converter.py
@@ -0,0 +1,29 @@
+#  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.
+
+# Currency converter implementation
+
+def convert(fr, to, amount):
+    if to == "EUR":
+        return amount * 0.70
+    return amount
+
+def symbol(currency):
+    if currency == "EUR":
+        return "E"
+    return "$"
+
diff --git a/sca-cpp/trunk/test/store-wsgi/domain.composite b/sca-cpp/trunk/test/store-wsgi/domain.composite
new file mode 100644
index 0000000000..41ce77bedd
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/domain.composite
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
+  targetNamespace="http://store"
+  name="store">
+        
+    <component name="Store">
+        <t:implementation.python script="store.py"/>
+        <service name="Widget">
+            <t:binding.http uri="store"/>
+        </service>
+        <reference name="catalog" target="Catalog"/>
+        <reference name="shoppingCart" target="ShoppingCart/Cart"/>
+        <reference name="shoppingTotal" target="ShoppingCart/Total"/>
+    </component>
+    
+    <component name="Catalog">
+        <t:implementation.python script="fruits-catalog.py"/> 
+        <property name="currencyCode">USD</property>
+        <service name="Catalog">
+            <t:binding.jsonrpc uri="catalog"/>
+        </service>
+        <reference name="currencyConverter" target="CurrencyConverter"/>
+    </component> 
+     
+    <component name="ShoppingCart">
+        <t:implementation.python script="shopping-cart.py"/>
+        <service name="ShoppingCart">
+            <t:binding.atom uri="shoppingCart"/>
+        </service>        
+        <service name="Total">
+            <t:binding.jsonrpc uri="total"/>
+        </service>        
+        <reference name="cache" target="Cache"/>
+    </component>
+    
+    <component name="CurrencyConverter">
+        <t:implementation.python script="currency-converter.py"/>
+        <service name="CurrencyConverter">
+            <t:binding.jsonrpc uri="currencyConverter"/>
+        </service>        
+    </component>     
+
+    <component name="Cache">
+        <implementation.python script="gmemcache.py"/>
+        <service name="Cache">
+            <t:binding.atom uri="cache"/>
+        </service>
+    </component>     
+
+</composite>
diff --git a/sca-cpp/trunk/test/store-wsgi/fruits-catalog.py b/sca-cpp/trunk/test/store-wsgi/fruits-catalog.py
new file mode 100644
index 0000000000..75c18f5f99
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/fruits-catalog.py
@@ -0,0 +1,34 @@
+#  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.
+
+# Catalog implementation
+
+def get(converter, currencyCode):
+  code = currencyCode()
+  def convert(price):
+      return converter("convert", "USD", code, price)
+  symbol = converter("symbol", code)
+  return (
+    (("'javaClass", "services.Item"), ("'name", "Apple"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(2.99))),
+    (("'javaClass", "services.Item"), ("'name", "Orange"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(3.55))),
+    (("'javaClass", "services.Item"), ("'name", "Pear"), ("'currencyCode", code), ("'currencySymbol", symbol), ("'price", convert(1.55)))
+  )
+
+# TODO remove these JSON-RPC specific functions
+def listMethods(converter, currencyCode):
+    return ("Service.get",)
+
diff --git a/sca-cpp/trunk/test/store-wsgi/gmemcache.py b/sca-cpp/trunk/test/store-wsgi/gmemcache.py
new file mode 100644
index 0000000000..83dffa9339
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/gmemcache.py
@@ -0,0 +1,45 @@
+#  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.
+
+# Memcached based cache implementation
+import uuid
+from google.appengine.api import memcache
+
+# Post a new item to the cache
+def post(collection, item):
+    id = collection + (str(uuid.uuid1()),)
+    r = memcache.add(repr(id), item, 600)
+    if r == False:
+        return None
+    return id
+
+# Get items from the cache
+def get(id):
+    item = memcache.get(repr(id))
+    return item
+
+# Update an item in the cache
+def put(id, item):
+    return memcache.set(repr(id), item, 600)
+
+# Delete items from the cache
+def delete(id):
+    r = memcache.delete(repr(id))
+    if r != 2:
+        return False
+    return True
+
diff --git a/sca-cpp/trunk/test/store-wsgi/htdocs/store.html b/sca-cpp/trunk/test/store-wsgi/htdocs/store.html
new file mode 100644
index 0000000000..21eabca7a7
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/htdocs/store.html
@@ -0,0 +1,169 @@
+<!--

+    * 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>

+<head>

+<title>Store</title>

+

+<script type="text/javascript" src="store.js"></script>

+

+<script language="JavaScript">

+

+	//@Reference

+	var catalog = new tuscany.sca.Reference("catalog");

+	

+	//@Reference

+	var shoppingCart = new tuscany.sca.Reference("shoppingCart");

+

+	//@Reference

+	var shoppingTotal = new tuscany.sca.Reference("shoppingTotal");

+	

+	var catalogItems;

+

+	function catalog_getResponse(items,exception) {

+		if(exception){

+			alert(exception.message);

+			return;

+		}

+		var catalog = "";

+		

+		for (var i=0; i<items.length; i++) {

+			var item = items[i].name + ' - ' + items[i].price;

+			catalog += '<input name="items" type="checkbox" value="' + 

+						item + '">' + item + ' <br>';

+		}

+		document.getElementById('catalog').innerHTML=catalog;

+		catalogItems = items;

+

+		// TEMP		

+		shoppingTotal.gettotal(shoppingTotal_getTotalResponse);

+	}

+	

+	function shoppingCart_getResponse(feed) {

+		if (feed != null) {

+			var entries = feed.getElementsByTagName("entry"); 

+			var list = "";

+			for (var i=0; i<entries.length; i++) {

+				var content = entries[i].getElementsByTagName("content")[0];

+				var name = content.getElementsByTagName("name")[0].firstChild.nodeValue;

+				var price = content.getElementsByTagName("price")[0].firstChild.nodeValue;

+				list += name + ' - ' + price + ' <br>';

+			}

+			document.getElementById("shoppingCart").innerHTML = list;

+

+			if (entries.length != 0) {			

+					try	{

+						shoppingTotal.gettotal(shoppingTotal_getTotalResponse);

+					}

+					catch(e){

+						alert(e);

+					}

+			}

+		}

+	}

+	

+	function shoppingTotal_getTotalResponse(total,exception) {

+		if(exception) { 

+			alert(exception.message); 

+			return;

+		}

+		document.getElementById('total').innerHTML = total;

+	}

+	

+	function shoppingCart_postResponse(entry) {

+		shoppingCart.get("", shoppingCart_getResponse);

+	}				

+

+	function addToCart() {

+		var items  = document.catalogForm.items;

+		var j = 0;

+		for (var i=0; i<items.length; i++)

+			if (items[i].checked) {

+				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title type="text">Item</title><content type="application/xml">' +

+                '<item>' +

+                '<javaClass>' + catalogItems[i].javaClass + '</javaClass>' +

+                '<name>' + catalogItems[i].name + '</name>' +

+                '<currencyCode>' + catalogItems[i].currencyCode + '</currencyCode>' +

+                '<currencySymbol>' + catalogItems[i].currencySymbol + '</currencySymbol>' +

+                '<price>' + catalogItems[i].price + '</price>' +

+                '</item>' +

+                '</content></entry>';

+				shoppingCart.post(entry, shoppingCart_postResponse);

+				items[i].checked = false;

+			}

+	}

+	function checkoutCart() {

+		document.getElementById('store').innerHTML='<h2>' +

+				'Thanks for Shopping With Us!</h2>'+

+				'<h2>Your Order</h2>'+

+				'<form name="orderForm">'+

+					document.getElementById('shoppingCart').innerHTML+

+					'<br>'+

+					document.getElementById('total').innerHTML+

+					'<br>'+

+					'<br>'+

+					'<input type="submit" value="Continue Shopping">'+ 

+				'</form>';

+		shoppingCart.del("", null);

+	}

+	function deleteCart() {

+		shoppingCart.del("", null);

+		document.getElementById('shoppingCart').innerHTML = "";

+		document.getElementById('total').innerHTML = "";	

+	}	

+

+	function init() {

+			

+			try	{

+				catalog.get(catalog_getResponse);

+				shoppingCart.get("", shoppingCart_getResponse);

+			}

+			catch(e){

+				alert(e);

+			}

+		}

+	

+</script>

+

+</head>

+

+<body onload="init()">

+<h1>Store</h1>

+  <div id="store">

+   	<h2>Catalog</h2>

+   	<form name="catalogForm">

+		<div id="catalog" ></div>

+		<br>

+		<input type="button" onClick="addToCart()"  value="Add to Cart">

+   	</form>

+ 

+ 	<br>

+  

+   	<h2>Your Shopping Cart</h2>

+   	<form name="shoppingCartForm">

+		<div id="shoppingCart"></div>

+		<br>

+		<div id="total"></div>

+		<br>		

+		<input type="button" onClick="checkoutCart()" value="Checkout"> 

+		<input type="button" onClick="deleteCart()" value="Empty">     

+	   	<a href="../shoppingCart/">(feed)</a>

+	</form>    

+  </div>

+</body>

+</html>

diff --git a/sca-cpp/trunk/test/store-wsgi/htdocs/store.js b/sca-cpp/trunk/test/store-wsgi/htdocs/store.js
new file mode 100644
index 0000000000..9cd8eb526d
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/htdocs/store.js
@@ -0,0 +1,661 @@
+
+/* Apache Tuscany SCA Widget header */
+
+/*
+ * JSON-RPC JavaScript client
+ *
+ * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
+ *
+ * Copyright (c) 2003-2004 Jan-Klaas Kollhof
+ * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+ *
+ * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
+ *
+ * Licensed 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.
+ *
+ */
+
+/*
+ * Modifications for Apache Tuscany:
+ * - JSONRpcClient_createMethod changed so callback is last arg
+ */
+
+/* escape a character */
+
+escapeJSONChar =
+function escapeJSONChar(c)
+{
+    if(c == "\"" || c == "\\") return "\\" + c;
+    else if (c == "\b") return "\\b";
+    else if (c == "\f") return "\\f";
+    else if (c == "\n") return "\\n";
+    else if (c == "\r") return "\\r";
+    else if (c == "\t") return "\\t";
+    var hex = c.charCodeAt(0).toString(16);
+    if(hex.length == 1) return "\\u000" + hex;
+    else if(hex.length == 2) return "\\u00" + hex;
+    else if(hex.length == 3) return "\\u0" + hex;
+    else return "\\u" + hex;
+};
+
+
+/* encode a string into JSON format */
+
+escapeJSONString =
+function escapeJSONString(s)
+{
+    /* The following should suffice but Safari's regex is b0rken
+       (doesn't support callback substitutions)
+       return "\"" + s.replace(/([^\u0020-\u007f]|[\\\"])/g,
+       escapeJSONChar) + "\"";
+    */
+
+    /* Rather inefficient way to do it */
+    var parts = s.split("");
+    for(var i=0; i < parts.length; i++) {
+	var c =parts[i];
+	if(c == '"' ||
+	   c == '\\' ||
+	   c.charCodeAt(0) < 32 ||
+	   c.charCodeAt(0) >= 128)
+	    parts[i] = escapeJSONChar(parts[i]);
+    }
+    return "\"" + parts.join("") + "\"";
+};
+
+
+/* Marshall objects to JSON format */
+
+toJSON = function toJSON(o)
+{
+    if(o == null) {
+	return "null";
+    } else if(o.constructor == String) {
+	return escapeJSONString(o);
+    } else if(o.constructor == Number) {
+	return o.toString();
+    } else if(o.constructor == Boolean) {
+	return o.toString();
+    } else if(o.constructor == Date) {
+	return '{javaClass: "java.util.Date", time: ' + o.valueOf() +'}';
+    } else if(o.constructor == Array) {
+	var v = [];
+	for(var i = 0; i < o.length; i++) v.push(toJSON(o[i]));
+	return "[" + v.join(", ") + "]";
+    } else {
+	var v = [];
+	for(attr in o) {
+	    if(o[attr] == null) v.push("\"" + attr + "\": null");
+	    else if(typeof o[attr] == "function"); /* skip */
+	    else v.push(escapeJSONString(attr) + ": " + toJSON(o[attr]));
+	}
+	return "{" + v.join(", ") + "}";
+    }
+};
+
+
+/* JSONRpcClient constructor */
+
+JSONRpcClient =
+function JSONRpcClient_ctor(serverURL, user, pass, objectID)
+{
+    this.serverURL = serverURL;
+    this.user = user;
+    this.pass = pass;
+    this.objectID = objectID;
+
+    /* Add standard methods */
+    if(this.objectID) {
+	this._addMethods(["listMethods"]);
+	var req = this._makeRequest("listMethods", []);
+    } else {
+	this._addMethods(["system.listMethods"]);
+	var req = this._makeRequest("system.listMethods", []);
+    }
+    var m = this._sendRequest(req);
+    this._addMethods(m);
+};
+
+
+/* JSONRpcCLient.Exception */
+
+JSONRpcClient.Exception =
+function JSONRpcClient_Exception_ctor(code, message, javaStack)
+{
+    this.code = code;
+    var name;
+    if(javaStack) {
+	this.javaStack = javaStack;
+	var m = javaStack.match(/^([^:]*)/);
+	if(m) name = m[0];
+    }
+    if(name) this.name = name;
+    else this.name = "JSONRpcClientException";
+    this.message = message;
+};
+
+JSONRpcClient.Exception.CODE_REMOTE_EXCEPTION = 490;
+JSONRpcClient.Exception.CODE_ERR_CLIENT = 550;
+JSONRpcClient.Exception.CODE_ERR_PARSE = 590;
+JSONRpcClient.Exception.CODE_ERR_NOMETHOD = 591;
+JSONRpcClient.Exception.CODE_ERR_UNMARSHALL = 592;
+JSONRpcClient.Exception.CODE_ERR_MARSHALL = 593;
+
+JSONRpcClient.Exception.prototype = new Error();
+
+JSONRpcClient.Exception.prototype.toString =
+function JSONRpcClient_Exception_toString(code, msg)
+{
+    return this.name + ": " + this.message;
+};
+
+
+/* Default top level exception handler */
+
+JSONRpcClient.default_ex_handler =
+function JSONRpcClient_default_ex_handler(e) { alert(e); };
+
+
+/* Client settable variables */
+
+JSONRpcClient.toplevel_ex_handler = JSONRpcClient.default_ex_handler;
+JSONRpcClient.profile_async = false;
+JSONRpcClient.max_req_active = 1;
+JSONRpcClient.requestId = 1;
+
+
+/* JSONRpcClient implementation */
+
+JSONRpcClient.prototype._createMethod =
+function JSONRpcClient_createMethod(methodName)
+{
+    var fn=function()
+    {
+	var args = [];
+	var callback = null;
+	for(var i=0;i<arguments.length;i++) args.push(arguments[i]);
+
+/*	TUSCANY change callback to be last arg instead of first to match binding.ajax
+	if(typeof args[0] == "function") callback = args.shift();
+*/
+	if(typeof args[arguments.length-1] == "function") callback = args.pop();
+
+	var req = fn.client._makeRequest.call(fn.client, fn.methodName,
+					      args, callback);
+	if(callback == null) {
+	    return fn.client._sendRequest.call(fn.client, req);
+	} else {
+	    JSONRpcClient.async_requests.push(req);
+	    JSONRpcClient.kick_async();
+	    return req.requestId;
+	}
+    };
+    fn.client = this;
+    fn.methodName = methodName;
+    return fn;
+};
+
+JSONRpcClient.prototype._addMethods =
+function JSONRpcClient_addMethods(methodNames)
+{
+    for(var i=0; i<methodNames.length; i++) {
+	var obj = this;
+	var names = methodNames[i].split(".");
+	for(var n=0; n<names.length-1; n++) {
+	    var name = names[n];
+	    if(obj[name]) {
+		obj = obj[name];
+	    } else {
+		obj[name]  = new Object();
+		obj = obj[name];
+	    }
+	}
+	var name = names[names.length-1];
+	if(!obj[name]) {
+	    var method = this._createMethod(methodNames[i]);
+	    obj[name] = method;
+	}
+    }
+};
+
+JSONRpcClient._getCharsetFromHeaders =
+function JSONRpcClient_getCharsetFromHeaders(http)
+{
+    try {
+	var contentType = http.getResponseHeader("Content-type");
+	var parts = contentType.split(/\s*;\s*/);
+	for(var i =0; i < parts.length; i++) {
+	    if(parts[i].substring(0, 8) == "charset=")
+		return parts[i].substring(8, parts[i].length);
+	}
+    } catch (e) {}
+    return "UTF-8"; /* default */
+};
+
+/* Async queue globals */
+JSONRpcClient.async_requests = [];
+JSONRpcClient.async_inflight = {};
+JSONRpcClient.async_responses = [];
+JSONRpcClient.async_timeout = null;
+JSONRpcClient.num_req_active = 0;
+
+JSONRpcClient._async_handler =
+function JSONRpcClient_async_handler()
+{
+    JSONRpcClient.async_timeout = null;
+
+    while(JSONRpcClient.async_responses.length > 0) {
+	var res = JSONRpcClient.async_responses.shift();
+	if(res.canceled) continue;
+	if(res.profile) res.profile.dispatch = new Date();
+	try {
+	    res.cb(res.result, res.ex, res.profile);
+	} catch(e) {
+	    JSONRpcClient.toplevel_ex_handler(e);
+	}
+    }
+
+    while(JSONRpcClient.async_requests.length > 0 &&
+	  JSONRpcClient.num_req_active < JSONRpcClient.max_req_active) {
+	var req = JSONRpcClient.async_requests.shift();
+	if(req.canceled) continue;
+	req.client._sendRequest.call(req.client, req);
+    }
+};
+
+JSONRpcClient.kick_async =
+function JSONRpcClient_kick_async()
+{
+    if(JSONRpcClient.async_timeout == null)
+	JSONRpcClient.async_timeout =
+	    setTimeout(JSONRpcClient._async_handler, 0);
+};
+
+JSONRpcClient.cancelRequest =
+function JSONRpcClient_cancelRequest(requestId)
+{
+    /* If it is in flight then mark it as canceled in the inflight map
+       and the XMLHttpRequest callback will discard the reply. */
+    if(JSONRpcClient.async_inflight[requestId]) {
+	JSONRpcClient.async_inflight[requestId].canceled = true;
+	return true;
+    }
+
+    /* If its not in flight yet then we can just mark it as canceled in
+       the the request queue and it will get discarded before being sent. */
+    for(var i in JSONRpcClient.async_requests) {
+	if(JSONRpcClient.async_requests[i].requestId == requestId) {
+	    JSONRpcClient.async_requests[i].canceled = true;
+	    return true;
+	}
+    }
+
+    /* It may have returned from the network and be waiting for its callback
+       to be dispatched, so mark it as canceled in the response queue
+       and the response will get discarded before calling the callback. */
+    for(var i in JSONRpcClient.async_responses) {
+	if(JSONRpcClient.async_responses[i].requestId == requestId) {
+	    JSONRpcClient.async_responses[i].canceled = true;
+	    return true;
+	}
+    }
+
+    return false;
+};
+
+JSONRpcClient.prototype._makeRequest =
+function JSONRpcClient_makeRequest(methodName, args, cb)
+{
+    var req = {};
+    req.client = this;
+    req.requestId = JSONRpcClient.requestId++;
+
+    var obj = {};
+    obj.id = req.requestId;
+    if (this.objectID)
+	obj.method = ".obj#" + this.objectID + "." + methodName;
+    else
+	obj.method = methodName;
+    obj.params = args;
+
+    if (cb) req.cb = cb;
+    if (JSONRpcClient.profile_async)
+	req.profile = { "submit": new Date() };
+    req.data = toJSON(obj);
+
+    return req;
+};
+
+JSONRpcClient.prototype._sendRequest =
+function JSONRpcClient_sendRequest(req)
+{
+    if(req.profile) req.profile.start = new Date();
+
+    /* Get free http object from the pool */
+    var http = JSONRpcClient.poolGetHTTPRequest();
+    JSONRpcClient.num_req_active++;
+
+    /* Send the request */
+    if (typeof(this.user) == "undefined") {
+	http.open("POST", this.serverURL, (req.cb != null));
+    } else {
+	http.open("POST", this.serverURL, (req.cb != null), this.user, this.pass);
+    }
+
+    /* setRequestHeader is missing in Opera 8 Beta */
+    try { http.setRequestHeader("Content-type", "text/plain"); } catch(e) {}
+
+    /* Construct call back if we have one */
+    if(req.cb) {
+	var self = this;
+	http.onreadystatechange = function() {
+	    if(http.readyState == 4) {
+		http.onreadystatechange = function () {};
+		var res = { "cb": req.cb, "result": null, "ex": null};
+		if (req.profile) {
+		    res.profile = req.profile;
+		    res.profile.end = new Date();
+		}
+		try { res.result = self._handleResponse(http); }
+		catch(e) { res.ex = e; }
+		if(!JSONRpcClient.async_inflight[req.requestId].canceled)
+		    JSONRpcClient.async_responses.push(res);
+		delete JSONRpcClient.async_inflight[req.requestId];
+		JSONRpcClient.kick_async();
+	    }
+	};
+    } else {
+	http.onreadystatechange = function() {};
+    }
+
+    JSONRpcClient.async_inflight[req.requestId] = req;
+	
+    try {
+	http.send(req.data);
+    } catch(e) {
+	JSONRpcClient.poolReturnHTTPRequest(http);
+	JSONRpcClient.num_req_active--;
+	throw new JSONRpcClient.Exception
+	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
+    }
+
+    if(!req.cb) return this._handleResponse(http);
+};
+
+JSONRpcClient.prototype._handleResponse =
+function JSONRpcClient_handleResponse(http)
+{
+    /* Get the charset */
+    if(!this.charset) {
+	this.charset = JSONRpcClient._getCharsetFromHeaders(http);
+    }
+
+    /* Get request results */
+    var status, statusText, data;
+    try {
+	status = http.status;
+	statusText = http.statusText;
+	data = http.responseText;
+    } catch(e) {
+	JSONRpcClient.poolReturnHTTPRequest(http);
+	JSONRpcClient.num_req_active--;
+	JSONRpcClient.kick_async();
+	throw new JSONRpcClient.Exception
+	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
+    }
+
+    /* Return http object to the pool; */
+    JSONRpcClient.poolReturnHTTPRequest(http);
+    JSONRpcClient.num_req_active--;
+
+    /* Unmarshall the response */
+    if(status != 200) {
+	throw new JSONRpcClient.Exception(status, statusText);
+    }
+    var obj;
+    try {
+	eval("obj = " + data);
+    } catch(e) {
+	throw new JSONRpcClient.Exception(550, "error parsing result");
+    }
+    if(obj.error)
+	throw new JSONRpcClient.Exception(obj.error.code, obj.error.msg,
+					  obj.error.trace);
+    var res = obj.result;
+
+    /* Handle CallableProxy */
+    if(res && res.objectID && res.JSONRPCType == "CallableReference")
+	return new JSONRpcClient(this.serverURL, this.user,
+				 this.pass, res.objectID);
+
+    return res;
+};
+
+
+/* XMLHttpRequest wrapper code */
+
+/* XMLHttpRequest pool globals */
+JSONRpcClient.http_spare = [];
+JSONRpcClient.http_max_spare = 8;
+
+JSONRpcClient.poolGetHTTPRequest =
+function JSONRpcClient_pool_getHTTPRequest()
+{
+    if(JSONRpcClient.http_spare.length > 0) {
+	return JSONRpcClient.http_spare.pop();
+    }
+    return JSONRpcClient.getHTTPRequest();
+};
+
+JSONRpcClient.poolReturnHTTPRequest =
+function JSONRpcClient_poolReturnHTTPRequest(http)
+{
+    if(JSONRpcClient.http_spare.length >= JSONRpcClient.http_max_spare)
+	delete http;
+    else
+	JSONRpcClient.http_spare.push(http);
+};
+
+JSONRpcClient.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
+			     "MSXML2.XMLHTTP.4.0",
+			     "MSXML2.XMLHTTP.3.0",
+			     "MSXML2.XMLHTTP",
+			     "Microsoft.XMLHTTP" ];
+
+JSONRpcClient.getHTTPRequest =
+function JSONRpcClient_getHTTPRequest()
+{
+    /* Mozilla XMLHttpRequest */
+    try {
+	JSONRpcClient.httpObjectName = "XMLHttpRequest";
+	return new XMLHttpRequest();
+    } catch(e) {}
+
+    /* Microsoft MSXML ActiveX */
+    for (var i=0;i < JSONRpcClient.msxmlNames.length; i++) {
+	try {
+	    JSONRpcClient.httpObjectName = JSONRpcClient.msxmlNames[i];
+	    return new ActiveXObject(JSONRpcClient.msxmlNames[i]);
+	} catch (e) {}
+    }
+
+    /* None found */
+    JSONRpcClient.httpObjectName = null;
+    throw new JSONRpcClient.Exception(0, "Can't create XMLHttpRequest object");
+};
+
+
+/*
+ * 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.    
+ */
+	
+function AtomClient(uri) {
+
+	this.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
+                        "MSXML2.XMLHTTP.4.0",
+                        "MSXML2.XMLHTTP.3.0",
+                        "MSXML2.XMLHTTP",
+                        "Microsoft.XMLHTTP" ];
+			            
+	this.uri=uri;
+	
+	this.get = function(id, responseFunction) {
+		var xhr = this.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4) {
+				if (xhr.status == 200) {
+				    var strDocument = xhr.responseText;
+				    var xmlDocument = xhr.responseXML;
+				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
+                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
+                    } 
+                    if (responseFunction != null) responseFunction(xmlDocument);
+				} else {
+                    alert("get - Error getting data from the server");
+				}
+			}
+		}
+		xhr.open("GET", uri + '/' + id, true);
+		xhr.send(null);
+	}	
+
+	this.post = function (entry, responseFunction) {
+		var xhr = this.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4) {
+				if (xhr.status == 201) {
+				    var strDocument = xhr.responseText;
+				    var xmlDocument = xhr.responseXML;
+				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
+                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
+                    } 
+					if (responseFunction != null) responseFunction(xmlDocument);
+				} else {
+					alert("post - Error getting data from the server");
+				}
+			}
+		}
+		xhr.open("POST", uri, true);
+		xhr.setRequestHeader("Content-Type", "application/atom+xml");
+		xhr.send(entry);
+	}	
+
+	this.put = function (id, entry, responseFunction) {
+		var xhr = this.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4) {
+				if (xhr.status == 200) {
+				    var strDocument = xhr.responseText;
+				    var xmlDocument = xhr.responseXML;
+				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
+                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
+                    } 
+					if (responseFunction != null) responseFunction(xmlDocument);
+				} else {
+					alert("put - Error getting data from the server");
+				}
+			}
+		}
+		xhr.open("PUT", uri + '/' + id, true);
+		xhr.setRequestHeader("Content-Type", "application/atom+xml");
+		xhr.send(entry);
+	}	
+
+	this.del = function (id, responseFunction) {       
+		var xhr = this.createXMLHttpRequest();
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState == 4) {
+				if (xhr.status == 200) {
+					if (responseFunction != null) responseFunction();
+				} else {
+					alert("delete - Error getting data from the server");
+				}
+			}
+		}
+		xhr.open("DELETE", uri + '/' + id, true);		
+		xhr.send(null);
+	}
+	this.createXMLHttpRequest = function () {
+        /* Mozilla XMLHttpRequest */
+        try {return new XMLHttpRequest();} catch(e) {}      
+		
+        /* Microsoft MSXML ActiveX */
+        for (var i=0;i < this.msxmlNames.length; i++) {
+            try {return new ActiveXObject(this.msxmlNames[i]);} catch (e) {}
+        }
+        alert("XML http request not supported");
+        return null;
+	}
+	if (typeof DOMParser == "undefined") {
+	   DOMParser = function () {}
+	
+	   DOMParser.prototype.parseFromString = function (str, contentType) {
+	      if (typeof ActiveXObject != "undefined") {
+	         var d = new ActiveXObject("MSXML.DomDocument");
+	         d.loadXML(str);
+	         return d;
+	      } else if (typeof XMLHttpRequest != "undefined") {
+	         var req = new XMLHttpRequest;
+	         req.open("GET", "data:" + (contentType || "application/xml") +
+	                         ";charset=utf-8," + encodeURIComponent(str), false);
+	         if (req.overrideMimeType) {
+	            req.overrideMimeType(contentType);
+	         }
+	         req.send(null);
+	         return req.responseXML;
+	      }
+      }
+   }
+}
+
+
+
+/* Tuscany Reference/Property injection code */
+
+if (!tuscany) { 
+var tuscany = {}; 
+}
+if (!tuscany.sca) { 
+tuscany.sca = {}; 
+}
+
+tuscany.sca.propertyMap = new String();
+tuscany.sca.Property = function (name) {
+    return tuscany.sca.propertyMap[name];
+}
+
+tuscany.sca.referenceMap = new Object();
+tuscany.sca.referenceMap.catalog = new JSONRpcClient("/catalog").Service;
+tuscany.sca.referenceMap.shoppingCart = new AtomClient("/shoppingCart");
+tuscany.sca.referenceMap.shoppingTotal = new JSONRpcClient("/total").Service;
+tuscany.sca.Reference = function (name) {
+    return tuscany.sca.referenceMap[name];
+}
+
+/** End of Apache Tuscany SCA Widget */
+
diff --git a/sca-cpp/trunk/test/store-wsgi/shopping-cart.py b/sca-cpp/trunk/test/store-wsgi/shopping-cart.py
new file mode 100644
index 0000000000..c520da4303
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/shopping-cart.py
@@ -0,0 +1,77 @@
+#  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.
+
+# Shopping cart implementation
+import uuid
+import sys
+
+cartId = "1234"
+
+# Get the shopping cart from the cache
+# Return an empty cart if not found
+def getcart(id, cache):
+    cart = cache("get", (id,))
+    if cart is None:
+        return ()
+    return cart
+
+# Post a new item to the cart, create a new cart if necessary
+def post(collection, item, cache):
+    id = str(uuid.uuid1())
+    cart = ((item[0], id, item[2]),) + getcart(cartId, cache)
+    cache("put", (cartId,), cart)
+    return (id,)
+
+# Find an item in the cart
+def find(id, cart):
+    if cart == ():
+        return ("Item", "0", ())
+    elif id == cart[0][1]:
+        return cart[0]
+    else:
+        return find(id, cart[1:])
+
+# Get items from the cart
+def get(id, cache):
+    if id == ():
+        return ("Your Cart", cartId) + getcart(cartId, cache)
+    return find(id[0], getcart(cartId, cache))
+
+# Delete items from the  cart
+def delete(id, cache):
+    if id == ():
+        return cache("delete", (cartId,))
+    return True
+
+# Return the price of an item
+def price(item):
+    return float(filter(lambda x: x[0] == "'price", item[2])[0][1])
+
+# Sum the prices of a list of items
+def sum(items):
+    if items == ():
+        return 0
+    return price(items[0]) + sum(items[1:])
+
+# Return the total price of the items in the cart
+def gettotal(cache):
+    cart = getcart(cartId, cache)
+    return sum(cart)
+
+# TODO remove these JSON-RPC specific functions
+def listMethods(cache):
+    return ("Service.gettotal",)
diff --git a/sca-cpp/trunk/test/store-wsgi/store.py b/sca-cpp/trunk/test/store-wsgi/store.py
new file mode 100644
index 0000000000..35c0f5b2aa
--- /dev/null
+++ b/sca-cpp/trunk/test/store-wsgi/store.py
@@ -0,0 +1,44 @@
+#  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.
+
+# Store implementation
+
+def post(item, catalog, shoppingCart, shoppingTotal):
+    return shoppingCart("post", item)
+
+def getall(catalog, shoppingCart, shoppingTotal):
+    return shoppingCart("getall")
+
+def get(id, catalog, shoppingCart, shoppingTotal):
+    return shoppingCart("get", id)
+
+def getcatalog(catalog, shoppingCart, shoppingTotal):
+    return catalog("get")
+
+def gettotal(catalog, shoppingCart, shoppingTotal):
+    return shoppingCart("gettotal")
+
+def deleteall(catalog, shoppingCart, shoppingTotal):
+    return shoppingCart("deleteall")
+
+def delete(id, catalog, shoppingCart, shoppingTotal):
+    return shoppingCart("delete", id)
+
+# TODO remove these JSON-RPC specific functions
+def listMethods(catalog, shoppingCart, shoppingTotal):
+    return ("Service.get", "Service.gettotal")
+