From d3bdc051ec4a6499c73d00e80f744aa375a01687 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 13 Jun 2011 07:57:30 +0000
Subject: Minor refactoring and cleanup of edit module and its test composites.
 Add HTML generation and messaging components and a few more tests.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1135048 13f79535-47bb-0310-9956-ffa450edef68
---
 .../modules/edit/apps/shoppingcart/app.composite   | 194 ++++++++++++---------
 1 file changed, 113 insertions(+), 81 deletions(-)

(limited to 'sca-cpp/trunk/modules/edit/apps/shoppingcart')

diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
index 565bffa371..0d626d09a6 100644
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
@@ -28,17 +28,17 @@
  <service name="order" promote="order"/>
  <service name="start" promote="start"/>
  <service name="total" promote="total"/>
- <component x="342" y="359" name="Add to cart" title="{compname}" color="green1">
+ <component x="330" y="410" 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="Check out" x="12" y="758" title="{compname}" color="green1">
+ <component x="10" y="850" name="Check out" 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">
+ <component x="10" y="640" name="Empty" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="list5" name="content"/>
@@ -145,13 +145,13 @@
   <reference target="name11" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call9" title="call" color="green1">
+ <component x="210" y="280" 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" visible="false"/>
  </component>
- <component x="12" y="388" name="carthtml" title="{compname}" color="green1">
+ <component x="10" y="460" name="carthtml" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="item6" name="content"/>
@@ -161,7 +161,7 @@
   <service name="service" visible="false"/>
   <reference target="list" name="content"/>
  </component>
- <component x="12" y="221" name="cataloghtml" title="{compname}" color="green1">
+ <component x="10" y="220" name="cataloghtml" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="item" name="content"/>
@@ -200,7 +200,7 @@
   <implementation.python script="nuvem/map_.py"/>
   <service name="foreach"/>
   <reference target="name" name="item"/>
-  <reference target="format2" name="transform"/>
+  <reference target="htcheck1" name="transform"/>
   <reference target="call9" name="list"/>
  </component>
  <component name="foreach2" title="foreach" color="yellow1">
@@ -216,7 +216,7 @@
   <reference target="text4" name="pattern"/>
   <reference target="call8" name="values"/>
  </component>
- <component name="format2" title="format" color="magenta1">
+ <component x="350" y="270" name="format1" title="format" color="magenta1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text5" name="pattern"/>
@@ -239,6 +239,11 @@
   <service name="service" visible="false"/>
   <reference target="get" name="content"/>
  </component>
+ <component x="210" y="240" name="htcheck1" title="html checkbox" color="magenta1">
+  <implementation.python script="nuvem/htcheck.py"/>
+  <service name="htcheck"/>
+  <reference target="pair1" name="value"/>
+ </component>
  <component name="if" title="if" color="magenta1">
   <implementation.python script="nuvem/if_.py"/>
   <service name="if"/>
@@ -246,6 +251,72 @@
   <reference target="number5" name="then"/>
   <reference target="round" name="else"/>
  </component>
+ <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="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="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="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="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="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="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="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="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="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="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="list" title="list" color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
@@ -290,7 +361,7 @@
  <component name="lookup" title="lookup" color="yellow1">
   <implementation.python script="nuvem/lookup.py"/>
   <service name="lookup"/>
-  <reference target="param" name="name"/>
+  <reference target="second1" name="name"/>
   <reference target="call15" name="list"/>
  </component>
  <component name="name" title="" color="orange1">
@@ -417,83 +488,23 @@
   <service name="number"/>
   <property>0</property>
  </component>
- <component x="425" y="832" name="order" title="{compname}" color="green1">
+ <component x="430" y="760" 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" title="?param" color="green1">
+ <component x="310" y="250" name="pair1" title="pair" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="pair"/>
+  <reference target="text8" name="name"/>
+  <reference target="format1" name="value"/>
+ </component>
+ <component x="840" y="100" name="param" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>fruit</property>
   <property name="query" visible="false"/>
  </component>
- <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="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="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="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="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="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="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="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="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="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="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" title="put" color="red1">
   <implementation.python script="nuvem/put.py"/>
   <service name="put"/>
@@ -507,6 +518,11 @@
   <reference target="number3" name="n"/>
   <reference target="sum" name="x"/>
  </component>
+ <component x="650" y="450" name="second1" title="second" color="yellow1">
+  <implementation.python script="nuvem/second.py"/>
+  <service name="second"/>
+  <reference target="split1" name="list"/>
+ </component>
  <component name="sendgtalk" title="gtalk" color="blue1">
   <implementation.cpp path="lib/chat" library="libchat-sender2"/>
   <service name="sendgtalk"/>
@@ -515,6 +531,12 @@
   <reference target="text3" name="to"/>
   <reference target="call12" name="msg"/>
  </component>
+ <component x="720" y="70" name="split1" title="split" color="magenta1">
+  <implementation.python script="nuvem/split.py"/>
+  <service name="split"/>
+  <reference target="text1" name="separator"/>
+  <reference target="param" name="string"/>
+ </component>
  <component x="13" y="15" name="start" title="start" color="green1">
   <implementation.python script="nuvem/start.py"/>
   <service name="start" visible="false">
@@ -532,6 +554,11 @@
   <service name="text"/>
   <property>xmppsca.1@gmail.com</property>
  </component>
+ <component x="790" y="70" name="text1" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property> - </property>
+ </component>
  <component name="text2" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
@@ -547,10 +574,10 @@
   <service name="text"/>
   <property>Your order has been processed. Your total: ${1}</property>
  </component>
- <component name="text5" title=" '{propval}'" color="orange1">
+ <component x="1220" y="310" 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>
+  <property>${1} - {0}</property>
  </component>
  <component name="text6" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
@@ -562,7 +589,12 @@
   <service name="text"/>
   <property>xmpp4sca</property>
  </component>
- <component x="760" y="300" name="total" title="{compname}" color="green1">
+ <component x="350" y="250" name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>fruit</property>
+ </component>
+ <component x="660" y="160" name="total" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="item2" name="content"/>
@@ -582,7 +614,7 @@
   <service name="user"/>
   <property name="user" visible="false"/>
  </component>
- <component name="valueof" title="valueof" color="orange1">
+ <component x="1220" y="340" name="valueof" title="valueof" color="orange1">
   <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>fruit</property>
-- 
cgit v1.2.3