Author: jsdelfino
Date: Sun Mar 21 22:00:35 2010
New Revision: 925910
URL: http://svn.apache.org/viewvc?rev=925910&view=rev
Log:
Correctly support binding URI on references.
Modified:
tuscany/sca-cpp/trunk/modules/wsgi/scdl.py
tuscany/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite
Modified: tuscany/sca-cpp/trunk/modules/wsgi/scdl.py
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/scdl.py?rev=925910&r1=925909&r2=925910&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/scdl.py (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/scdl.py Sun Mar 21 22:00:35 2010
@@ -77,7 +77,7 @@ def binding(e):
return ()
if match(car(e), "start", "binding.") == False:
return binding(cdr(e))
- return tokens(att(car(e))["uri"])
+ return att(car(e))["uri"]
# Return the list of references under a SCDL component element
def references(e):
@@ -86,7 +86,7 @@ def references(e):
if match(car(e), "start", "reference") == False:
return references(cdr(e))
if "target" in att(car(e)):
- return cons(att(car(e))["target"], references(cdr(e)))
+ return cons(car(tokens(att(car(e))["target"])), references(cdr(e)))
return cons(binding(e), references(cdr(e)))
# Return the list of properties under a SCDL component element
@@ -103,7 +103,7 @@ def services(e):
return ()
if match(car(e), "start", "service") == False:
return services(cdr(e))
- return cons(binding(e), services(cdr(e)))
+ return cons(tokens(binding(e)), services(cdr(e)))
# Return the name attribute of a SCDL element
def name(e):
Modified: tuscany/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite?rev=925910&r1=925909&r2=925910&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite (original)
+++ tuscany/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite Sun Mar 21
22:00:35 2010
@@ -27,9 +27,15 @@
<service name="Widget">
<t:binding.http uri="store"/>
</service>
- <reference name="catalog" target="http://sca-store-backend/catalog"/>
- <reference name="shoppingCart"
target="http://sca-store-backend/shoppingCart"/>
- <reference name="shoppingTotal"
target="http://sca-store-backend/shoppingCart"/>
+ <reference name="catalog">
+ <t:binding.http uri="http://sca-store-backend/catalog"/>
+ </reference>
+ <reference name="shoppingCart">
+ <t:binding.http uri="http://sca-store-backend/shoppingCart"/>
+ </reference>
+ <reference name="shoppingTotal">
+ <t:binding.http uri="http://sca-store-backend/shoppingCart"/>
+ </reference>
</component>
<component name="Catalog">
@@ -49,7 +55,9 @@
<service name="Total">
<t:binding.jsonrpc uri="total"/>
</service>
- <reference name="cache"
target="http://sca-store-backend.appspot.com/cache"/>
+ <reference name="cache">
+ <t:binding.http uri="http://sca-store-backend.appspot.com/cache"/>
+ </reference>
</component>
<component name="CurrencyConverter">
