Cleanup and organize sample components, apps and html pages.

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

1 files changed, 303 insertions, 270 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
index 919a79f0f0..565bffa371 100644
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
@@ -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 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 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="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"/>
- </component>
- <component name="list5" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+  <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" 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>