diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-21 22:00:35 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-21 22:00:35 +0000 |
| commit | 64892de09e67d80f0b1506d22b3f06fd3a2cf7c8 (patch) | |
| tree | bf8822dc43fe3f3d2bb2a1d0f9c178484c70e646 | |
| parent | bc6e7c7b3b48a388f4291b8627ac5abb3069d8a7 (diff) | |
Correctly support binding URI on references.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@925910 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | sca-cpp/trunk/modules/wsgi/scdl.py | 6 | ||||
| -rw-r--r-- | sca-cpp/trunk/test/store-wsgi/domain-frontend.composite | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/sca-cpp/trunk/modules/wsgi/scdl.py b/sca-cpp/trunk/modules/wsgi/scdl.py index 9687860d6e..f6c162889e 100644 --- a/sca-cpp/trunk/modules/wsgi/scdl.py +++ b/sca-cpp/trunk/modules/wsgi/scdl.py @@ -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): diff --git a/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite b/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite index 152b40f0b1..ca2472d40a 100644 --- a/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite +++ b/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite @@ -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"> |