tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1126306 [2/5] - in /tuscany/sca-cpp/trunk/modules/edit: apps/me360/ apps/me360/htdocs/ apps/nearme/ apps/nearme/htdocs/ apps/new/ apps/new/htdocs/ apps/ourphotos/ apps/ourphotos/htdocs/ apps/shoppingcart/ apps/shoppingcart/htdocs/ apps/sli...
Date Mon, 23 May 2011 04:25:29 GMT
Modified: tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite Mon May 23 04:25:27 2011
@@ -17,464 +17,497 @@
  * 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" name="app" targetNamespace="http://app">
- <service name="addToCart" promote="addToCart"/>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="Add to cart" promote="Add to cart"/>
+ <service name="Check out" promote="Check out"/>
+ <service name="Empty" promote="Empty"/>
  <service name="carthtml" promote="carthtml"/>
  <service name="catalog" promote="catalog"/>
  <service name="cataloghtml" promote="cataloghtml"/>
- <service name="checkout" promote="checkout"/>
- <service name="emptyCart" promote="emptyCart"/>
  <service name="getcart" promote="getcart"/>
  <service name="order" promote="order"/>
  <service name="start" promote="start"/>
  <service name="total" promote="total"/>
- <component t:x="367" t:y="421" name="addToCart" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="342" y="359" name="Add to cart" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="list6" name="content"/>
  </component>
- <component name="append" t:title="+" t:color="yellow1">
-  <t:implementation.python script="nuvem/append.py"/>
+ <component name="Check out" x="12" y="758" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="list3" name="content"/>
+ </component>
+ <component name="Empty" x="10" y="560" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="list5" name="content"/>
+ </component>
+ <component name="append" title="+" color="yellow1">
+  <implementation.python script="nuvem/append.py"/>
   <service name="append"/>
   <reference target="call2" name="first"/>
   <reference target="lookup" name="second"/>
  </component>
- <component name="call" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name14" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call10" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call10" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name12" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call11" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call11" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name16" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call12" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call12" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name13" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call13" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call13" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name17" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call14" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call14" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name19" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call15" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call15" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name20" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call16" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call16" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name21" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call17" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name4" name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component name="call2" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name5" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call3" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call3" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name6" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call4" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call4" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name15" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call5" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call5" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name8" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call6" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call6" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name10" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call7" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call7" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name9" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call8" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call8" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name11" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call9" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call9" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name2" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component t:x="12" t:y="388" name="carthtml" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="property6" name="content"/>
- </component>
- <component t:x="354" t:y="28" name="catalog" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="12" y="388" name="carthtml" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="item6" name="content"/>
+ </component>
+ <component x="354" y="28" name="catalog" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="list" name="content"/>
  </component>
- <component t:x="12" t:y="221" name="cataloghtml" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="property" name="content"/>
- </component>
- <component t:x="12" t:y="758" name="checkout" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="list3" name="content"/>
+ <component x="12" y="221" name="cataloghtml" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="item" name="content"/>
  </component>
- <component name="delete2" t:title="delete" t:color="red1">
-  <t:implementation.python script="nuvem/delete.py"/>
+ <component name="delete2" title="delete" color="red1">
+  <implementation.python script="nuvem/delete.py"/>
   <service name="delete"/>
   <reference target="filedb2" name="collection"/>
   <reference target="user2" name="id"/>
  </component>
- <component t:x="10" t:y="560" name="emptyCart" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="list5" name="content"/>
+ <component name="equals" title="=" color="magenta1">
+  <implementation.python script="nuvem/equals.py"/>
+  <service name="equals"/>
+  <reference target="call" name="value1"/>
+  <reference target="nothing" name="value2"/>
  </component>
- <component name="filedb" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb2" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb2" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb3" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb3" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="foreach" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
+ <component name="foreach" title="foreach" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
   <service name="foreach"/>
   <reference target="name" name="item"/>
   <reference target="format2" name="transform"/>
   <reference target="call9" name="list"/>
  </component>
- <component name="foreach2" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
+ <component name="foreach2" title="foreach" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
   <service name="foreach"/>
   <reference target="name3" name="item"/>
   <reference target="format3" name="transform"/>
   <reference target="call10" name="list"/>
  </component>
- <component name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component name="format" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text4" name="pattern"/>
   <reference target="call8" name="values"/>
  </component>
- <component name="format2" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component name="format2" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text5" name="pattern"/>
   <reference target="valueof" name="values"/>
  </component>
- <component name="format3" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component name="format3" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text6" name="pattern"/>
   <reference target="valueof2" name="values"/>
  </component>
- <component name="get" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component name="get" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb" name="collection"/>
   <reference target="user" name="id"/>
  </component>
- <component t:x="477" t:y="153" name="getcart" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="477" y="153" name="getcart" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="get" name="content"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="if" title="if" color="magenta1">
+  <implementation.python script="nuvem/if_.py"/>
+  <service name="if"/>
+  <reference target="equals" name="condition"/>
+  <reference target="number5" name="then"/>
+  <reference target="round" name="else"/>
+ </component>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property8" name="item" t:clonable="true"/>
-  <reference target="property9" name="item" t:clonable="true"/>
-  <reference target="property10" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item8" name="item" clonable="true"/>
+  <reference target="item9" name="item" clonable="true"/>
+  <reference target="item10" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference target="property12" name="item" t:clonable="true"/>
-  <reference target="call3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item12" name="item" clonable="true"/>
+  <reference target="call3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list4" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference target="call5" name="item" t:clonable="true"/>
-  <reference target="call13" name="item" t:clonable="true"/>
-  <reference target="call14" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference target="call5" name="item" clonable="true"/>
+  <reference target="call13" name="item" clonable="true"/>
+  <reference target="call14" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list5" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list5" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property11" name="item" t:clonable="true"/>
-  <reference target="call7" name="item" t:clonable="true"/>
-  <reference target="call16" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item11" name="item" clonable="true"/>
+  <reference target="call7" name="item" clonable="true"/>
+  <reference target="call16" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list6" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list6" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference target="call4" name="item" t:clonable="true"/>
-  <reference target="call6" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference target="call4" name="item" clonable="true"/>
+  <reference target="call6" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="lookup" t:title="lookup" t:color="yellow1">
-  <t:implementation.python script="nuvem/lookup.py"/>
+ <component name="lookup" title="lookup" color="yellow1">
+  <implementation.python script="nuvem/lookup.py"/>
   <service name="lookup"/>
   <reference target="param" name="name"/>
   <reference target="call15" name="list"/>
  </component>
- <component name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>fruit</property>
  </component>
- <component name="name10" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name10" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component name="name11" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name11" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component name="name12" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name12" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component name="name13" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name13" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>order</property>
  </component>
- <component name="name14" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name14" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component name="name15" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name15" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>carthtml</property>
  </component>
- <component name="name16" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name16" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>order</property>
  </component>
- <component name="name17" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name17" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>carthtml</property>
  </component>
- <component name="name19" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name19" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name2" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>catalog</property>
  </component>
- <component name="name20" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name20" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>catalog</property>
  </component>
- <component name="name21" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name21" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component name="name3" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name3" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>fruit</property>
  </component>
- <component name="name5" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name4" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>getcart</property>
+ </component>
+ <component name="name5" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component name="name6" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name6" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>emptyCart</property>
  </component>
- <component name="name8" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name8" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>cataloghtml</property>
  </component>
- <component name="name9" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name9" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>carthtml</property>
  </component>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="nothing" title="nothing" color="orange1">
+  <implementation.python script="nuvem/nothing.py"/>
+  <service name="nothing"/>
+ </component>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>2.99</property>
  </component>
- <component name="number2" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number2" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3.55</property>
  </component>
- <component name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number3" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>2</property>
  </component>
- <component name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>1.55</property>
  </component>
- <component t:x="418" t:y="750" name="order" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component name="number5" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
+ </component>
+ <component x="425" y="832" name="order" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="format" name="content"/>
  </component>
- <component name="param" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>fruit</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="foreach" name="value"/>
   <property>catalog</property>
  </component>
- <component name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item10" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number4" name="value"/>
   <property>Kiwi</property>
  </component>
- <component name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item11" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="delete2" name="value"/>
   <property>delresult</property>
  </component>
- <component name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item12" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="sendgtalk" name="value"/>
   <property>sendresult</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="round" name="value"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="if" name="value"/>
   <property>total</property>
  </component>
- <component name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="call11" name="value"/>
   <property>message</property>
  </component>
- <component name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text2" name="value"/>
   <property>message</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="foreach2" name="value"/>
   <property>cart</property>
  </component>
- <component name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item7" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="put" name="value"/>
   <property>putresult</property>
  </component>
- <component name="property8" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item8" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number" name="value"/>
   <property>Mango</property>
  </component>
- <component name="property9" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item9" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number2" name="value"/>
   <property>Passion</property>
  </component>
- <component name="put" t:title="put" t:color="red1">
-  <t:implementation.python script="nuvem/put.py"/>
+ <component name="put" title="put" color="red1">
+  <implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb3" name="collection"/>
   <reference target="user3" name="id"/>
   <reference target="append" name="value"/>
  </component>
- <component name="round" t:title="round" t:color="magenta1">
-  <t:implementation.python script="nuvem/round_.py"/>
+ <component name="round" title="round" color="magenta1">
+  <implementation.python script="nuvem/round_.py"/>
   <service name="round"/>
   <reference target="number3" name="n"/>
   <reference target="sum" name="x"/>
  </component>
- <component name="sendgtalk" t:title="gtalk" t:color="blue1">
+ <component name="sendgtalk" title="gtalk" color="blue1">
   <implementation.cpp path="lib/chat" library="libchat-sender2"/>
   <service name="sendgtalk"/>
   <reference target="text" name="jid"/>
@@ -482,86 +515,86 @@
   <reference target="text3" name="to"/>
   <reference target="call12" name="msg"/>
  </component>
- <component t:x="13" t:y="15" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="13" y="15" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="list4" name="content"/>
  </component>
- <component name="sum" t:title="sum" t:color="magenta1">
-  <t:implementation.python script="nuvem/sum_.py"/>
+ <component name="sum" title="sum" color="magenta1">
+  <implementation.python script="nuvem/sum_.py"/>
   <service name="sum"/>
   <reference target="values" name="l"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmppsca.1@gmail.com</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>Welcome to my online store</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>xmppsca.2@gmail.com</property>
+  <property>jsdelfino@gmail.com</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>Your order has been processed. Your total: ${1}</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>&lt;span id=&quot;fruit&quot; class=&quot;checkbox&quot;&gt;&lt;input type=&quot;checkbox&quot; value=&quot;{0}&quot;/&gt;${1} - {0}&lt;/span&gt;</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>${1} - {0}</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmpp4sca</property>
  </component>
- <component t:x="387" t:y="296" name="total" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="property2" name="content"/>
+ <component x="760" y="300" name="total" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="item2" name="content"/>
  </component>
- <component name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
- <component name="user2" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component name="user2" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
- <component name="user3" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component name="user3" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
- <component name="valueof" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>fruit</property>
  </component>
- <component name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof2" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>fruit</property>
  </component>
- <component name="values" t:title="values" t:color="yellow1">
-  <t:implementation.python script="nuvem/values.py"/>
+ <component name="values" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
   <service name="values"/>
-  <reference target="call" name="list"/>
+  <reference target="call17" name="list"/>
  </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,20 +18,23 @@
  * under the License.    
 -->
 <DIV id="page">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Shopping Cart</H2>
+ </SPAN>
  <SPAN id="message" class="text" style="position: absolute; top: 36px; left: 2px; ">
   <SPAN>Welcome</SPAN>
  </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 189px; width: 100%; left: 2px; ">
-  <SPAN>Your Cart:</SPAN>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 72px; width: 100%; left: 2px; ">
+ <SPAN id="page:section" class="section" style="position: absolute; top: 63px; width: 100%; left: 2px; ">
   <SPAN>Catalog</SPAN>
  </SPAN>
- <SPAN id="catalog" class="list" style="position: absolute; top: 99px; left: 2px; ">
+ <SPAN id="page:button" class="button" style="position: absolute; top: 63px; left: 146px; ">
+  <INPUT type="button" value="Add to cart" class="graybutton"/>
+ </SPAN>
+ <SPAN id="catalog" class="list" style="position: absolute; top: 99px; width: 100%; left: 2px; ">
   <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>list</TD>
+     <TD>=catalog</TD>
     </TR>
     <TR>
      <TD>...</TD>
@@ -39,11 +42,26 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="cart" class="list" style="position: absolute; top: 216px; left: 2px; ">
+ <SPAN id="page:section" class="section" style="position: absolute; top: 180px; width: 100%; left: 2px; ">
+  <SPAN>Your cart:</SPAN>
+ </SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 180px; left: 83px; ">
+  <SPAN>$</SPAN>
+ </SPAN>
+ <SPAN id="total" class="text" style="position: absolute; top: 180px; left: 92px; ">
+  <SPAN>=total</SPAN>
+ </SPAN>
+ <SPAN id="page:button" class="button" style="position: absolute; top: 180px; left: 146px; ">
+  <INPUT type="button" value="Check out" class="graybutton"/>
+ </SPAN>
+ <SPAN id="page:button" class="button" style="position: absolute; top: 180px; left: 245px; ">
+  <INPUT type="button" value="Empty" class="graybutton"/>
+ </SPAN>
+ <SPAN id="cart" class="list" style="position: absolute; top: 216px; width: 100%; left: 2px; ">
   <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>list</TD>
+     <TD>=cart</TD>
     </TR>
     <TR>
      <TD>...</TD>
@@ -51,22 +69,4 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Shopping Cart</H2>
- </SPAN>
- <SPAN id="addToCart" class="button" style="position: absolute; top: 72px; left: 146px; ">
-  <INPUT type="button" value="Add to cart" class="graybutton"/>
- </SPAN>
- <SPAN id="checkout" class="button" style="position: absolute; top: 189px; left: 146px; ">
-  <INPUT type="button" value="Check out" class="graybutton"/>
- </SPAN>
- <SPAN id="emptyCart" class="button" style="position: absolute; top: 189px; left: 245px; ">
-  <INPUT type="button" value="Empty" class="graybutton"/>
- </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 189px; left: 74px; ">
-  <SPAN>$</SPAN>
- </SPAN>
- <SPAN id="total" class="text" style="position: absolute; top: 189px; left: 83px; ">
-  <SPAN>0</SPAN>
- </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/slice/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/slice/app.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/slice/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/slice/app.composite Mon May 23 04:25:27 2011
@@ -17,24 +17,24 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number" name="value"/>
   <property>slice</property>
  </component>
- <component t:x="17" t:y="9" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="17" y="9" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
-  <reference target="property" name="content"/>
+  <reference target="item" name="content"/>
  </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite Mon May 23 04:25:27 2011
@@ -17,11 +17,48 @@
  * 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" name="app" targetNamespace="http://app">
- <service name="text3" promote="text3"/>
- <component t:x="27" t:y="12" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Hello World</property>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="comment1" promote="comment1"/>
+ <service name="start1" promote="start1"/>
+ <component x="10" y="0" name="comment1" title="{propval}" color="white">
+  <implementation.python script="nuvem/comment.py"/>
+  <service name="comment" visible="false"/>
+  <property>Change this example to do what you want</property>
+ </component>
+ <component name="item1" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="user1" name="value"/>
+  <property>me</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="now1" name="value"/>
+  <property>time</property>
+ </component>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="item1" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="now1" title="now" color="orange1">
+  <implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+  <reference name="format"/>
+ </component>
+ <component x="10" y="40" name="start1" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
+  </service>
+  <reference target="list2" name="content"/>
+ </component>
+ <component name="user1" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
  </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html Mon May 23 04:25:27 2011
@@ -17,4 +17,17 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+  <H1>Hello</H1>
+ </SPAN>
+ <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 56px; ">
+  <H1>=me</H1>
+ </SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 36px; left: 2px; ">
+  <SPAN>The time is:</SPAN>
+ </SPAN>
+ <SPAN id="time" class="text" style="position: absolute; top: 36px; left: 74px; ">
+  <SPAN>=time</SPAN>
+ </SPAN>
+</DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.composite Mon May 23 04:25:27 2011
@@ -17,82 +17,82 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="delete" promote="delete"/>
  <service name="get" promote="get"/>
  <service name="put" promote="put"/>
- <component t:x="176" t:y="11" name="delete" t:title="delete" t:color="red1">
-  <t:implementation.python script="nuvem/delete.py"/>
+ <component x="176" y="11" name="delete" title="delete" color="red1">
+  <implementation.python script="nuvem/delete.py"/>
   <service name="delete"/>
   <reference target="filedb2" name="collection"/>
   <reference target="list3" name="id"/>
  </component>
- <component name="filedb" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb2" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb2" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb3" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb3" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component t:x="18" t:y="137" name="get" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component x="18" y="137" name="get" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb3" name="collection"/>
   <reference target="list2" name="id"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text4" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component t:x="13" t:y="1" name="put" t:title="put" t:color="red1">
-  <t:implementation.python script="nuvem/put.py"/>
+ <component x="13" y="1" name="put" title="put" color="red1">
+  <implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb" name="collection"/>
   <reference target="list" name="id"/>
   <reference target="text2" name="value"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testvalue</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
  </component>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
   <H1>Test db components</H1>
  </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.composite Mon May 23 04:25:27 2011
@@ -17,155 +17,179 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="Cancel" promote="Cancel"/>
+ <service name="OK" promote="OK"/>
+ <service name="call" promote="call"/>
  <service name="call2" promote="call2"/>
+ <service name="call3" promote="call3"/>
  <service name="compabc" promote="compabc"/>
  <service name="compxyz" promote="compxyz"/>
- <service name="geolocation" promote="geolocation"/>
+ <service name="location" promote="location"/>
  <service name="start" promote="start"/>
- <service name="testbutton1" promote="testbutton1"/>
- <service name="testbutton2" promote="testbutton2"/>
  <service name="timer3" promote="timer3"/>
- <component name="abc" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="Cancel" x="223" y="16" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="prop2" name="content"/>
+ </component>
+ <component name="OK" x="228" y="78" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="list" name="content"/>
+ </component>
+ <component name="abc" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component t:x="16" t:y="208" name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component x="223" y="216" name="call" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name2" name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component x="16" y="208" name="call2" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component x="222" y="273" name="call3" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="text5" name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component t:x="14" t:y="265" name="compabc" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="14" y="265" name="compabc" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="abc" name="content"/>
  </component>
- <component t:x="15" t:y="316" name="compxyz" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="15" y="316" name="compxyz" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="text12" name="content"/>
  </component>
- <component t:x="12" t:y="146" name="geolocation" t:title="location" t:color="green1">
-  <t:implementation.python script="nuvem/geolocation.py"/>
-  <service name="geolocation" t:visible="false">
-   <t:binding.http uri="geolocation"/>
+ <component x="12" y="146" name="location" title="location" color="green1">
+  <implementation.python script="nuvem/location.py"/>
+  <service name="location" visible="false">
+   <binding.http uri="location"/>
   </service>
-  <reference target="property6" name="content"/>
+  <reference target="item6" name="content"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>compxyz</property>
  </component>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="name2" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>https://testhttp.sca-store.com:8453/components/property</property>
+ </component>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3000</property>
  </component>
- <component name="param" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>testfield</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="params2" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
+ <component name="params2" title="?params" color="green1">
+  <implementation.python script="nuvem/params.py"/>
   <service name="params"/>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="prop2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="prop2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text3" name="value"/>
   <property>status</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text4" name="value"/>
   <property>status</property>
  </component>
- <component name="property3" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text" name="value"/>
   <property>status</property>
  </component>
- <component name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text2" name="value"/>
   <property>status</property>
  </component>
- <component name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="param" name="value"/>
   <property>testtext</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="params2" name="value"/>
   <property>location</property>
  </component>
- <component t:x="15" t:y="3" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="15" y="3" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
-  <reference target="property3" name="content"/>
- </component>
- <component t:x="228" t:y="78" name="testbutton1" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="list" name="content"/>
+  <reference target="item3" name="content"/>
  </component>
- <component t:x="223" t:y="16" name="testbutton2" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="prop2" name="content"/>
- </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>page opens</property>
  </component>
- <component name="text12" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text12" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xyz</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>ok button clicked</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cancel button clicked</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>timer fired</property>
  </component>
- <component t:x="13" t:y="58" name="timer3" t:title="timer" t:color="green1">
-  <t:implementation.python script="nuvem/timer.py"/>
-  <service name="timer" t:visible="false">
-   <t:binding.http uri="timer"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>https://testhttp.sca-store.com:8453/components/property</property>
+ </component>
+ <component x="13" y="58" name="timer3" title="timer" color="green1">
+  <implementation.python script="nuvem/timer.py"/>
+  <service name="timer" visible="false">
+   <binding.http uri="timer"/>
   </service>
   <reference target="number" name="n"/>
-  <reference target="property2" name="content"/>
+  <reference target="item2" name="content"/>
  </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,40 +18,40 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="testbutton1" class="button" style="position: absolute; top: 207px; left: 2px; ">
-  <INPUT type="button" value="OK" class="graybutton"/>
- </SPAN>
- <SPAN id="testbutton2" class="button" style="position: absolute; top: 207px; left: 47px; ">
-  <INPUT type="button" value="Cancel" class="graybutton"/>
- </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 171px; left: 11px; ">
-  <SPAN>Latitude:</SPAN>
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test events</H1>
  </SPAN>
- <SPAN id="latitude" class="text" style="position: absolute; top: 171px; left: 92px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="testfield" class="entry" style="position: absolute; top: 54px; left: 11px; ">
+  <INPUT type="text" value="=testfield" size="10" autocapitalize="off"/>
  </SPAN>
- <SPAN id="longitude" class="text" style="position: absolute; top: 144px; left: 92px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 90px; left: 11px; ">
+  <SPAN>Status:</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 144px; left: 11px; ">
-  <SPAN>Longitude:</SPAN>
+ <SPAN id="status" class="text" style="position: absolute; top: 90px; left: 92px; ">
+  <SPAN>=status</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 117px; left: 11px; ">
+ <SPAN id="page:text" class="text" style="position: absolute; top: 117px; left: 11px; ">
   <SPAN>Field value:</SPAN>
  </SPAN>
  <SPAN id="testtext" class="text" style="position: absolute; top: 117px; left: 92px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=testtext</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 90px; left: 11px; ">
-  <SPAN>Status:</SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 144px; left: 11px; ">
+  <SPAN>Longitude:</SPAN>
  </SPAN>
- <SPAN id="status" class="text" style="position: absolute; top: 90px; left: 92px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="longitude" class="text" style="position: absolute; top: 144px; left: 92px; ">
+  <SPAN>=longitude</SPAN>
  </SPAN>
- <SPAN id="testfield" class="entry" style="position: absolute; top: 54px; left: 11px; ">
-  <INPUT type="text" value="enter a val" size="10" autocapitalize="off"/>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 171px; left: 11px; ">
+  <SPAN>Latitude:</SPAN>
  </SPAN>
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
-  <H1>Test events</H1>
+ <SPAN id="latitude" class="text" style="position: absolute; top: 171px; left: 92px; ">
+  <SPAN>=latitude</SPAN>
+ </SPAN>
+ <SPAN id="page:button" class="button" style="position: absolute; top: 207px; left: 2px; ">
+  <INPUT type="button" value="OK" class="graybutton"/>
+ </SPAN>
+ <SPAN id="page:button" class="button" style="position: absolute; top: 207px; left: 47px; ">
+  <INPUT type="button" value="Cancel" class="graybutton"/>
  </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite Mon May 23 04:25:27 2011
@@ -17,7 +17,8 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="call" promote="call"/>
  <service name="get" promote="get"/>
  <service name="get2" promote="get2"/>
  <service name="get3" promote="get3"/>
@@ -25,106 +26,153 @@
  <service name="get5" promote="get5"/>
  <service name="get6" promote="get6"/>
  <service name="parse" promote="parse"/>
- <component name="first" t:title="first" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
+ <service name="item" promote="property"/>
+ <component x="36" y="287" name="call" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component name="first" title="first" color="yellow1">
+  <implementation.python script="nuvem/first.py"/>
   <service name="first"/>
   <reference target="rest" name="list"/>
  </component>
- <component t:x="20" t:y="8" name="get" t:title="get" t:color="green1">
+ <component x="20" y="8" name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text" name="url"/>
  </component>
- <component t:x="18" t:y="61" name="get2" t:title="get" t:color="green1">
+ <component x="18" y="61" name="get2" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text2" name="url"/>
  </component>
- <component t:x="14" t:y="112" name="get3" t:title="get" t:color="green1">
+ <component x="14" y="112" name="get3" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="17" t:y="166" name="get4" t:title="get" t:color="green1">
+ <component x="19" y="170" name="get4" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text4" name="url"/>
  </component>
- <component t:x="19" t:y="218" name="get5" t:title="get" t:color="green1">
+ <component x="241" y="6" name="get5" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
- <component t:x="19" t:y="271" name="get6" t:title="get" t:color="green1">
+ <component x="16" y="227" name="get6" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text6" name="url"/>
  </component>
- <component name="get7" t:title="get" t:color="green1">
+ <component name="get7" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text7" name="url"/>
  </component>
- <component name="join" t:title="join" t:color="magenta1">
-  <t:implementation.python script="nuvem/join.py"/>
+ <component name="join" title="join" color="magenta1">
+  <implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text9" name="separator"/>
   <reference target="first" name="list"/>
  </component>
- <component t:x="19" t:y="329" name="parse" t:title="parse" t:color="magenta1">
-  <t:implementation.python script="nuvem/parse.py"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="name" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>https://testhttp.sca-store.com:8453/components/property</property>
+ </component>
+ <component name="params" title="?params" color="green1">
+  <implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="query" visible="false"/>
+ </component>
+ <component x="597" y="167" name="parse" title="parse" color="magenta1">
+  <implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference target="text8" name="regexp"/>
   <reference target="join" name="string"/>
  </component>
- <component name="rest" t:title="rest" t:color="yellow1">
-  <t:implementation.python script="nuvem/rest.py"/>
+ <component x="74" y="343" name="property" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="list" name="value"/>
+  <property>test</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="user" name="value"/>
+  <property>user</property>
+ </component>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="params" name="value"/>
+  <property>name</property>
+ </component>
+ <component name="rest" title="rest" color="yellow1">
+  <implementation.python script="nuvem/rest.py"/>
   <service name="rest"/>
   <reference target="get7" name="list"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://www.google.com</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&amp;destination=Concord,MA&amp;waypoints=Charlestown,MA|Lexington,MA&amp;sensor=false</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdXMLclient.php?whichClient=NDFDgen&amp;lat=38.99&amp;lon=-77.01&amp;listLatLon=&amp;lat1=&amp;lon1=&amp;lat2=&amp;lon2=&amp;resolutionSub=&amp;listLat1=&amp;listLon1=&amp;listLat2=&amp;listLon2=&amp;resolutionList=&amp;endPoint1Lat=&amp;endPoint1Lon=&amp;endPoint2Lat=&amp;endPoint2Lon=&amp;listEndPoint1Lat=&amp;listEndPoint1Lon=&amp;listEndPoint2Lat=&amp;listEndPoint2Lon=&amp;zipCodeList=&amp;listZipCodeList=&amp;centerPointLat=&amp;centerPointLon=&amp;distanceLat=&amp;distanceLon=&amp;resolutionSquare=&amp;listCenterPointLat=&amp;listCenterPointLon=&amp;listDistanceLat=&amp;listDistanceLon=&amp;listResolutionSquare=&amp;citiesLevel=&amp;listCitiesLevel=&amp;sector=&amp;gmlListLatLon=&amp;featureType=&amp;requestedTime=&amp;startTime=&amp;endTime=&amp;compType=&amp;propertyName=&amp;product=time-series&amp;begin=2004-01-01T00%3A00%3A00&amp;end=2015-03-10T00%3A00%3A00&amp;maxt=maxt&amp;Submi
 t=Submit</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://feedproxy.google.com/TechCrunch</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cnn.com</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>https://chart.googleapis.com/chart?cht=p3&amp;chs=250x100&amp;chd=t:60,40&amp;chl=Hello|World</property>
+  <property>https://chart.googleapis.com/chart?cht=p3&amp;chs=250x100&amp;chd=60,40&amp;chl=Hello|World</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cnn.com</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>(CNN)</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property name="property"/>
  </component>
+ <component name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,11 +18,11 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
   <H1>Test HTTP components</H1>
  </SPAN>
  <SPAN id="iframe" class="iframe" style="position: absolute; top: 234px; left: 11px; ">
-  <A href="https://testhttp.sca-store.com:8453/components/get5">
+  <A href="/public/iframe.html">
    <SPAN class="fakeframe">
     <SPAN>frame ...</SPAN>
    </SPAN>



Mime
View raw message