svn commit: r1098490 [2/4] - in /tuscany/sca-cpp/trunk/modules/edit: apps/buzzprofile/ apps/me360/ apps/me360/htdocs/ apps/nearme/ apps/nearme/htdocs/ apps/ourphotos/ apps/ourphotos/htdocs/ apps/shoppingcart/ apps/shoppingcart/htdocs/ apps/slice/ apps/...

[js...@apache.org]

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=1098490&r1=1098489&r2=1098490&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  2 05:58:47 2011
@@ -17,94 +17,225 @@
  * 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" targetNamespace="http://shoppingcart" name="shoppingcart">
- <service name="appstart" promote="appstart"/>
- <component t:x="14" t:y="26" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="list4" name="content"/>
- </component>
+<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"/>
- <component t:x="427" t:y="412" name="addToCart" t:title="{compname}" t:color="green1">
+ <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"/>
   <reference target="list6" name="content"/>
  </component>
- <service name="emptyCart" promote="emptyCart"/>
- <component t:x="10" t:y="560" name="emptyCart" t:title="{compname}" t:color="green1">
+ <component name="append" t:title="+" t:color="yellow1">
+  <t: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"/>
+  <service name="call"/>
+  <reference target="name14" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call10" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name12" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call11" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name16" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call12" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name13" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call13" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name17" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call14" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name19" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call15" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name20" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call16" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name21" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name5" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call3" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name6" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call4" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name15" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call5" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name8" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call6" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name10" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call7" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name9" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call8" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name11" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call9" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name2" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t: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="list5" name="content"/>
+  <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"/>
+  <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>
- <service name="checkout" promote="checkout"/>
  <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>
- <component t:x="372" t:y="285" name="filedb" t:title="file" t:color="red1">
+ <component name="delete2" t:title="delete" t:color="red1">
+  <t: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>
+ <component name="filedb" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="374" t:y="311" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component name="filedb2" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="861" t:y="26" name="get" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb" name="collection"/>
-  <reference target="user" name="id"/>
+ <component name="filedb3" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <service name="getcart" promote="getcart"/>
- <component t:x="558" t:y="148" name="getcart" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="get" name="content"/>
+ <component name="foreach" t:title="foreach" t:color="yellow1">
+  <t: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 t:x="827" t:y="16" name="name5" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>getcart</property>
+ <component name="foreach2" t:title="foreach" t:color="yellow1">
+  <t: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>
- <service name="total" promote="total"/>
- <component t:x="427" t:y="294" 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 name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text4" name="pattern"/>
+  <reference target="call8" name="values"/>
  </component>
- <component t:x="748" t:y="243" name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="call11" name="value"/>
-  <property>message</property>
+ <component name="format2" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text5" name="pattern"/>
+  <reference target="valueof" name="values"/>
  </component>
- <component t:x="229" t:y="11" name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text2" name="value"/>
-  <property>message</property>
+ <component name="format3" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text6" name="pattern"/>
+  <reference target="valueof2" name="values"/>
  </component>
- <service name="catalog" promote="catalog"/>
- <component t:x="405" t:y="22" name="catalog" t:title="{compname}" t:color="green1">
+ <component name="get" t:title="get" t:color="red1">
+  <t: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"/>
-  <reference target="list" name="content"/>
+  <reference target="get" name="content"/>
  </component>
- <component t:x="672" t:y="8" name="list5" t:title="list" t:color="yellow1">
+ <component name="list" t:title="list" t:color="yellow1">
   <t: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 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"/>
  </component>
- <component t:x="689" t:y="166" name="list3" t:title="list" t:color="yellow1">
+ <component name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="property4" name="item" t:clonable="true"/>
@@ -112,15 +243,7 @@
   <reference target="call3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="144" t:y="179" name="list" t:title="list" t:color="yellow1">
-  <t: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"/>
- </component>
- <component t:x="147" t:y="7" name="list4" t:title="list" t:color="yellow1">
+ <component name="list4" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="property5" name="item" t:clonable="true"/>
@@ -129,449 +252,316 @@
   <reference target="call14" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="543" t:y="250" name="name11" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>total</property>
- </component>
- <component t:x="297" t:y="183" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>2.99</property>
- </component>
- <component t:x="219" t:y="179" name="property8" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="number" name="value"/>
-  <property>Mango</property>
- </component>
- <component t:x="224" t:y="218" name="property9" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="number2" name="value"/>
-  <property>Passion</property>
- </component>
- <component t:x="336" t:y="215" name="number2" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>3.55</property>
- </component>
- <component t:x="314" t:y="250" name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>1.55</property>
- </component>
- <service name="cataloghtml" promote="cataloghtml"/>
- <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="219" t:y="207" name="format2" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text5" name="pattern"/>
-  <reference target="valueof" name="values"/>
+ <component name="list5" t:title="list" t:color="yellow1">
+  <t: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"/>
  </component>
- <component t:x="310" t:y="275" name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>catalog</property>
+ <component name="list6" t:title="list" t:color="yellow1">
+  <t: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"/>
  </component>
- <component t:x="218" t:y="272" name="call9" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name2" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="lookup" t:title="lookup" t:color="yellow1">
+  <t:implementation.python script="nuvem/lookup.py"/>
+  <service name="lookup"/>
+  <reference target="param" name="name"/>
+  <reference target="call15" name="list"/>
  </component>
- <component t:x="222" t:y="180" name="name" t:title="" t:color="orange1">
+ <component name="name" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>fruit</property>
  </component>
- <service name="carthtml" promote="carthtml"/>
- <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="421" t:y="43" name="name8" t:title="" t:color="orange1">
+ <component name="name10" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>cataloghtml</property>
+  <property>total</property>
  </component>
- <component t:x="215" t:y="425" name="name3" t:title="" t:color="orange1">
+ <component name="name11" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>fruit</property>
- </component>
- <component t:x="216" t:y="457" name="format3" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text6" name="pattern"/>
-  <reference target="valueof2" name="values"/>
- </component>
- <component t:x="294" t:y="246" name="valueof" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>fruit</property>
- </component>
- <component t:x="272" t:y="478" name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>fruit</property>
+  <property>total</property>
  </component>
- <component t:x="307" t:y="518" name="name12" t:title="" t:color="orange1">
+ <component name="name12" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component t:x="256" t:y="161" name="foreach" t:title="foreach" t:color="yellow1">
-  <t: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 t:x="200" t:y="56" name="call5" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name8" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="297" t:y="590" name="name9" t:title="" t:color="orange1">
+ <component name="name13" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>carthtml</property>
- </component>
- <component t:x="313" t:y="794" name="name6" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>emptyCart</property>
- </component>
- <component t:x="567" t:y="822" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Your order has been processed. Your total: ${1}</property>
- </component>
- <component t:x="296" t:y="588" name="valueof3" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>sum</property>
+  <property>order</property>
  </component>
- <component t:x="528" t:y="96" name="name14" t:title="" t:color="orange1">
+ <component name="name14" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component t:x="336" t:y="386" name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>${1} - {0}</property>
- </component>
- <component t:x="556" t:y="340" name="filedb3" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="555" t:y="366" name="user3" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
- </component>
- <component t:x="859" t:y="410" name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name5" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="859" t:y="499" name="name10" t:title="" t:color="orange1">
+ <component name="name15" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>total</property>
+  <property>carthtml</property>
  </component>
- <component t:x="857" t:y="464" name="name15" t:title="" t:color="orange1">
+ <component name="name16" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>carthtml</property>
- </component>
- <component t:x="121" t:y="358" name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="foreach2" name="value"/>
-  <property>cart</property>
- </component>
- <component t:x="773" t:y="510" name="call6" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name10" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="848" t:y="289" name="put" t:title="put" t:color="red1">
-  <t: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 t:x="769" t:y="291" name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="put" name="value"/>
-  <property>putresult</property>
- </component>
- <component t:x="749" t:y="105" name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="number4" name="value"/>
-  <property>Kiwi</property>
- </component>
- <component t:x="814" t:y="592" name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="delete2" name="value"/>
-  <property>delresult</property>
- </component>
- <component t:x="299" t:y="617" name="valueof4" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>price</property>
- </component>
- <component t:x="98" t:y="526" name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="round" name="value"/>
-  <property>total</property>
- </component>
- <component t:x="570" t:y="917" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text4" name="pattern"/>
-  <reference target="call8" name="values"/>
- </component>
- <service name="order" promote="order"/>
- <component t:x="426" t:y="727" name="order" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="format" name="content"/>
- </component>
- <component t:x="328" t:y="797" name="call11" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name16" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <property>order</property>
  </component>
- <component t:x="1016" t:y="150" name="name16" t:title="" t:color="orange1">
+ <component name="name17" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>order</property>
+  <property>carthtml</property>
  </component>
- <component t:x="201" t:y="114" name="call13" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name17" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="name19" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>total</property>
  </component>
- <component t:x="283" t:y="114" name="name17" t:title="" t:color="orange1">
+ <component name="name2" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>carthtml</property>
+  <property>catalog</property>
  </component>
- <component t:x="197" t:y="153" name="call14" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name19" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="name20" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>catalog</property>
  </component>
- <component t:x="289" t:y="151" name="name19" t:title="" t:color="orange1">
+ <component name="name21" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component t:x="742" t:y="944" name="name13" t:title="" t:color="orange1">
+ <component name="name3" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>order</property>
+  <property>fruit</property>
  </component>
- <component t:x="680" t:y="1038" name="call8" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name11" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="name5" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>getcart</property>
  </component>
- <component t:x="378" t:y="263" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t: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 name="name6" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>emptyCart</property>
  </component>
- <component t:x="467" t:y="374" name="name20" t:title="" t:color="orange1">
+ <component name="name8" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>catalog</property>
+  <property>cataloghtml</property>
  </component>
- <component t:x="143" t:y="235" name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="foreach" name="value"/>
-  <property>catalog</property>
+ <component name="name9" t:title="" t:color="orange1">
+  <t: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"/>
+  <service name="number"/>
+  <property>2.99</property>
+ </component>
+ <component name="number2" t:title="#" t:color="orange1">
+  <t: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"/>
+  <service name="number"/>
+  <property>2</property>
+ </component>
+ <component name="number4" t:title="#" t:color="orange1">
+  <t: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"/>
+  <reference target="format" name="content"/>
  </component>
- <component t:x="258" t:y="734" name="param" t:title="?param" t:color="green1">
+ <component name="param" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>fruit</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="257" t:y="757" name="call15" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name20" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="foreach" name="value"/>
+  <property>catalog</property>
  </component>
- <component t:x="391" t:y="635" name="append" t:title="+" t:color="yellow1">
-  <t:implementation.python script="nuvem/append.py"/>
-  <service name="append"/>
-  <reference target="call2" name="first"/>
-  <reference target="lookup" name="second"/>
+ <component name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number4" name="value"/>
+  <property>Kiwi</property>
  </component>
- <component t:x="455" t:y="671" name="lookup" t:title="lookup" t:color="yellow1">
-  <t:implementation.python script="nuvem/lookup.py"/>
-  <service name="lookup"/>
-  <reference target="param" name="name"/>
-  <reference target="call15" name="list"/>
+ <component name="property11" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="delete2" name="value"/>
+  <property>delresult</property>
  </component>
- <component t:x="281" t:y="497" name="call10" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name12" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property12" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="sendgtalk" name="value"/>
+  <property>sendresult</property>
  </component>
- <component t:x="216" t:y="405" name="foreach2" t:title="foreach" t:color="yellow1">
-  <t: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 name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="round" name="value"/>
+  <property>total</property>
  </component>
- <component t:x="854" t:y="834" name="call7" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name9" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="call11" name="value"/>
+  <property>message</property>
  </component>
- <component t:x="853" t:y="866" name="call16" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name21" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text2" name="value"/>
+  <property>message</property>
  </component>
- <component t:x="464" t:y="189" name="name21" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>total</property>
+ <component name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="foreach2" name="value"/>
+  <property>cart</property>
  </component>
- <component t:x="214" t:y="767" name="call4" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name15" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property7" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="put" name="value"/>
+  <property>putresult</property>
  </component>
- <component t:x="139" t:y="579" name="list6" t:title="list" t:color="yellow1">
-  <t: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"/>
+ <component name="property8" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number" name="value"/>
+  <property>Mango</property>
  </component>
- <component t:x="320" t:y="42" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Welcome to my online store</property>
+ <component name="property9" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <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"/>
+  <service name="put"/>
+  <reference target="filedb3" name="collection"/>
+  <reference target="user3" name="id"/>
+  <reference target="append" name="value"/>
  </component>
- <component t:x="667" t:y="375" name="round" t:title="round" t:color="magenta1">
+ <component name="round" t:title="round" t:color="magenta1">
   <t:implementation.python script="nuvem/round_.py"/>
   <service name="round"/>
   <reference target="number3" name="n"/>
   <reference target="sum" name="x"/>
  </component>
- <component t:x="722" t:y="375" name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>2</property>
+ <component name="sendgtalk" t:title="gtalk" t:color="blue1">
+  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+  <service name="sendgtalk"/>
+  <reference target="text" name="jid"/>
+  <reference target="text7" name="pass"/>
+  <reference target="text3" name="to"/>
+  <reference target="call12" name="msg"/>
  </component>
- <component t:x="866" t:y="771" name="filedb2" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+ <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"/>
+  </service>
+  <reference target="list4" name="content"/>
  </component>
- <component t:x="816" t:y="767" name="delete2" t:title="delete" t:color="red1">
-  <t:implementation.python script="nuvem/delete.py"/>
-  <service name="delete"/>
-  <reference target="filedb2" name="collection"/>
-  <reference target="user2" name="id"/>
+ <component name="sum" t:title="sum" t:color="magenta1">
+  <t:implementation.python script="nuvem/sum_.py"/>
+  <service name="sum"/>
+  <reference target="values" name="l"/>
  </component>
- <component t:x="865" t:y="798" name="user2" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.1@gmail.com</property>
  </component>
- <component t:x="714" t:y="492" name="call" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name14" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Welcome to my online store</property>
  </component>
- <component t:x="263" t:y="879" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmppsca.2@gmail.com</property>
  </component>
- <component t:x="269" t:y="908" name="call12" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name13" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="635" t:y="345" name="values" t:title="values" t:color="yellow1">
-  <t:implementation.python script="nuvem/values.py"/>
-  <service name="values"/>
-  <reference target="call" name="list"/>
- </component>
- <component t:x="590" t:y="348" name="sum" t:title="sum" t:color="magenta1">
-  <t:implementation.python script="nuvem/sum_.py"/>
-  <service name="sum"/>
-  <reference target="values" name="l"/>
- </component>
- <component t:x="131" t:y="839" name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="sendgtalk" name="value"/>
-  <property>sendresult</property>
- </component>
- <component t:x="131" t:y="958" name="call3" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name6" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Your order has been processed. Your total: ${1}</property>
  </component>
- <component t:x="217" t:y="841" name="sendgtalk" t:title="gtalk" t:color="blue1">
-  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
-  <service name="sendgtalk"/>
-  <reference target="text" name="jid"/>
-  <reference target="text7" name="pass"/>
-  <reference target="text3" name="to"/>
-  <reference target="call12" name="msg"/>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t: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 t:x="266" t:y="802" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>xmppsca.1@gmail.com</property>
+  <property>${1} - {0}</property>
  </component>
- <component t:x="266" t:y="830" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
   <t: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>
+ <component name="user" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
+ </component>
+ <component name="user2" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
+ </component>
+ <component name="user3" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
+ </component>
+ <component name="valueof" t:title="valueof" t:color="orange1">
+  <t: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"/>
+  <service name="valueof"/>
+  <property>fruit</property>
+ </component>
+ <component name="values" t:title="values" t:color="yellow1">
+  <t:implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference target="call" name="list"/>
+ </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html Mon May  2 05:58:47 2011
@@ -55,13 +55,13 @@
   <H2>Shopping Cart</H2>
  </SPAN>
  <SPAN id="addToCart" class="button" style="position: absolute; top: 72px; left: 146px; ">
-  <INPUT type="button" value="Add to cart"/>
+  <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"/>
+  <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"/>
+  <INPUT type="button" value="Empty" class="graybutton"/>
  </SPAN>
  <SPAN id="text" class="text" style="position: absolute; top: 189px; left: 74px; ">
   <SPAN>$</SPAN>

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=1098490&r1=1098489&r2=1098490&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  2 05:58:47 2011
@@ -17,23 +17,23 @@
  * 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" targetNamespace="http://slice" name="slice">
- <component t:x="271" t:y="21" name="number" t:title="#" t:color="orange1">
+<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="start" promote="start"/>
+ <component name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component t:x="246" t:y="25" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number" name="value"/>
   <property>slice</property>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="129" t:y="23" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
+ <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"/>
   </service>
   <reference target="property" name="content"/>
  </component>

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=1098490&r1=1098489&r2=1098490&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  2 05:58:47 2011
@@ -17,29 +17,11 @@
  * 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" targetNamespace="http://test" name="test">
+<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="48" t:y="35" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <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>
  </component>
- <service name="fbprofile" promote="fbprofile"/>
- <component t:x="404" t:y="163" name="fbprofile" t:title="facebook profile" t:color="blue1">
-  <t:implementation.python script="nuvem/fbprofile.py"/>
-  <service name="fbprofile"/>
-  <reference name="id"/>
-  <reference name="fb" t:visible="false">
-   <t:binding.http uri="https://graph.facebook.com"/>
-  </reference>
- </component>
- <service name="twprofile" promote="twprofile"/>
- <component t:x="402" t:y="216" name="twprofile" t:title="twitter profile" t:color="blue1">
-  <t:implementation.python script="nuvem/twprofile.py"/>
-  <service name="twprofile"/>
-  <reference name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
-  </reference>
- </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/test/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/test/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
    (empty)

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=1098490&r1=1098489&r2=1098490&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  2 05:58:47 2011
@@ -17,81 +17,81 @@
  * 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" targetNamespace="http://testdb" name="testdb">
- <component t:x="177" t:y="36" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>testkey</property>
- </component>
- <component t:x="102" t:y="35" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="103" t:y="91" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>testvalue</property>
+<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="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"/>
+  <service name="delete"/>
+  <reference target="filedb2" name="collection"/>
+  <reference target="list3" name="id"/>
  </component>
- <component t:x="105" t:y="8" name="filedb" t:title="file" t:color="red1">
+ <component name="filedb" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <service name="put" promote="put"/>
- <component t:x="72" t:y="38" name="put" t:title="put" t:color="red1">
-  <t: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 t:x="311" t:y="186" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="get" promote="get"/>
- <component t:x="263" t:y="42" name="get" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb3" name="collection"/>
-  <reference target="list2" name="id"/>
- </component>
- <component t:x="311" t:y="155" name="filedb3" t:title="file" t:color="red1">
+ <component name="filedb2" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <service name="delete" promote="delete"/>
- <component t:x="457" t:y="44" name="delete" t:title="delete" t:color="red1">
-  <t:implementation.python script="nuvem/delete.py"/>
-  <service name="delete"/>
-  <reference target="filedb2" name="collection"/>
-  <reference target="list3" name="id"/>
- </component>
- <component t:x="113" t:y="223" name="filedb2" t:title="file" t:color="red1">
+ <component name="filedb3" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="111" t:y="243" name="list3" t:title="list" t:color="yellow1">
+ <component t:x="18" t:y="137" name="get" t:title="get" t:color="red1">
+  <t: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"/>
+  <service name="list"/>
+  <reference target="text" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text3" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="text4" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="187" t:y="249" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component t:x="13" t:y="1" name="put" t:title="put" t:color="red1">
+  <t: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"/>
+  <service name="text"/>
+  <property>testkey</property>
+ </component>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t: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"/>
   <service name="text"/>
   <property>testkey</property>
  </component>
- <component t:x="342" t:y="70" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
    (empty)

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=1098490&r1=1098489&r2=1098490&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  2 05:58:47 2011
@@ -17,155 +17,155 @@
  * 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" targetNamespace="http://testevents" name="testevents">
- <component t:x="888" t:y="14" name="text3" t:title=" '{propval}'" t:color="orange1">
+<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="call2" promote="call2"/>
+ <service name="compabc" promote="compabc"/>
+ <service name="compxyz" promote="compxyz"/>
+ <service name="geolocation" promote="geolocation"/>
+ <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"/>
   <service name="text"/>
-  <property>cancel button clicked</property>
+  <property>abc</property>
  </component>
- <component t:x="844" t:y="132" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>timer fired</property>
+ <component t:x="16" t:y="208" name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="359" t:y="75" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>page opens</property>
+ <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"/>
+  <reference target="abc" name="content"/>
  </component>
- <component t:x="228" t:y="197" name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text2" name="value"/>
-  <property>status</property>
+ <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"/>
+  <reference target="text12" name="content"/>
  </component>
- <component t:x="371" t:y="408" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>ok button clicked</property>
+ <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"/>
+  </service>
+  <reference target="property6" name="content"/>
  </component>
- <component t:x="229" t:y="156" name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="param" name="value"/>
-  <property>testtext</property>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t: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"/>
  </component>
- <component t:x="619" t:y="371" name="params2" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
-  <service name="params"/>
-  <property name="query" t:visible="false"/>
+ <component name="name" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>compxyz</property>
  </component>
- <component t:x="307" t:y="147" name="param" t:title="?param" t:color="green1">
+ <component name="number" t:title="#" t:color="orange1">
+  <t: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"/>
   <service name="param"/>
   <property>testfield</property>
   <property name="query" t:visible="false"/>
  </component>
- <service name="every3" promote="every3"/>
- <component t:x="62" t:y="91" name="every3" t:title="every" t:color="green1">
-  <t:implementation.python script="nuvem/every.py"/>
-  <service name="every" t:visible="false">
-   <t:binding.http uri="every"/>
-  </service>
-  <reference target="number" name="n"/>
-  <reference target="property2" name="content"/>
+ <component name="params2" t:title="?params" t:color="green1">
+  <t:implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="601" t:y="122" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>3000</property>
+ <component name="prop2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text3" name="value"/>
+  <property>status</property>
  </component>
- <component t:x="602" t:y="148" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text4" name="value"/>
   <property>status</property>
  </component>
- <component t:x="598" t:y="227" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="params2" name="value"/>
-  <property>location</property>
- </component>
- <service name="geolocation" promote="geolocation"/>
- <component t:x="61" t:y="178" 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"/>
-  </service>
-  <reference target="property6" name="content"/>
+  <reference target="text" name="value"/>
+  <property>status</property>
  </component>
- <component t:x="159" t:y="42" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property4" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="text" name="value"/>
+  <reference target="text2" name="value"/>
   <property>status</property>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="63" t:y="31" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
+ <component name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <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"/>
+  <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"/>
   </service>
   <reference target="property3" name="content"/>
  </component>
- <component t:x="172" t:y="141" name="list" t:title="list" t:color="yellow1">
-  <t: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"/>
- </component>
- <service name="testbutton1" promote="testbutton1"/>
- <component t:x="364" t:y="102" name="testbutton1" t:title="{compname}" t:color="green1">
+ <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"/>
  </component>
- <service name="testbutton2" promote="testbutton2"/>
- <component t:x="362" t:y="35" name="testbutton2" t:title="{compname}" t:color="green1">
+ <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 t:x="602" t:y="52" name="prop2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text3" name="value"/>
-  <property>status</property>
- </component>
- <component t:x="455" t:y="315" name="abc" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abc</property>
+  <property>page opens</property>
  </component>
- <service name="compabc" promote="compabc"/>
- <component t:x="236" t:y="248" name="compabc" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="abc" name="content"/>
+ <component name="text12" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xyz</property>
  </component>
- <service name="compxyz" promote="compxyz"/>
- <component t:x="236" t:y="299" name="compxyz" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference name="content" target="text12"/>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>ok button clicked</property>
  </component>
- <component name="text12" t:x="428" t:y="366" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>xyz</property>
+  <property>cancel button clicked</property>
  </component>
- <service name="call2" promote="call2"/>
- <component t:x="69" t:y="248" name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>timer fired</property>
  </component>
- <component t:x="184" t:y="316" name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>compxyz</property>
+ <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"/>
+  </service>
+  <reference target="number" name="n"/>
+  <reference target="property2" name="content"/>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html Mon May  2 05:58:47 2011
@@ -19,10 +19,10 @@
 -->
 <DIV id="page">
  <SPAN id="testbutton1" class="button" style="position: absolute; top: 207px; left: 2px; ">
-  <INPUT type="button" value="OK"/>
+  <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"/>
+  <INPUT type="button" value="Cancel" class="graybutton"/>
  </SPAN>
  <SPAN id="text" class="text" style="position: absolute; top: 171px; left: 11px; ">
   <SPAN>Latitude:</SPAN>

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=1098490&r1=1098489&r2=1098490&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  2 05:58:47 2011
@@ -17,114 +17,114 @@
  * 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" targetNamespace="http://testhttp" name="testhttp">
+<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="get" promote="get"/>
- <component t:x="25" t:y="25" name="get" t:title="get" t:color="green1">
+ <service name="get2" promote="get2"/>
+ <service name="get3" promote="get3"/>
+ <service name="get4" promote="get4"/>
+ <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="first"/>
+  <reference target="rest" name="list"/>
+ </component>
+ <component t:x="20" t:y="8" name="get" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text" name="url"/>
  </component>
- <service name="get2" promote="get2"/>
- <component t:x="24" t:y="83" name="get2" t:title="get" t:color="green1">
+ <component t:x="18" t:y="61" name="get2" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text2" name="url"/>
  </component>
- <service name="get3" promote="get3"/>
- <component t:x="23" t:y="146" name="get3" t:title="get" t:color="green1">
+ <component t:x="14" t:y="112" name="get3" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="87" t:y="175" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t: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 t:x="88" t:y="91" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t: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>
- <service name="get4" promote="get4"/>
- <component t:x="25" t:y="210" name="get4" t:title="get" t:color="green1">
+ <component t:x="17" t:y="166" name="get4" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text4" name="url"/>
  </component>
- <component t:x="90" t:y="267" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://feedproxy.google.com/TechCrunch</property>
- </component>
- <component t:x="93" t:y="25" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.google.com</property>
- </component>
- <service name="get5" promote="get5"/>
- <component t:x="26" t:y="274" name="get5" t:title="get" t:color="green1">
+ <component t:x="19" t:y="218" name="get5" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
- <component t:x="95" t:y="331" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>cnn.com</property>
- </component>
- <service name="get6" promote="get6"/>
- <component t:x="26" t:y="335" name="get6" t:title="get" t:color="green1">
+ <component t:x="19" t:y="271" name="get6" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text6" name="url"/>
  </component>
- <component t:x="95" t:y="395" name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t: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>
+ <component name="get7" t:title="get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="text7" name="url"/>
  </component>
- <service name="parse" promote="parse"/>
- <component t:x="529" t:y="192" name="parse" t:title="parse" t:color="magenta1">
+ <component name="join" t:title="join" t:color="magenta1">
+  <t: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"/>
   <service name="parse"/>
   <reference target="text8" name="regexp"/>
   <reference target="join" name="string"/>
  </component>
- <component t:x="832" t:y="249" name="rest" t:title="rest" t:color="yellow1">
+ <component name="rest" t:title="rest" t:color="yellow1">
   <t:implementation.python script="nuvem/rest.py"/>
   <service name="rest"/>
   <reference target="get7" name="list"/>
  </component>
- <component t:x="868" t:y="311" name="get7" t:title="get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="text7" name="url"/>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t: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"/>
+  <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"/>
+  <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"/>
+  <service name="text"/>
+  <property>http://feedproxy.google.com/TechCrunch</property>
  </component>
- <component t:x="795" t:y="269" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cnn.com</property>
  </component>
- <component t:x="553" t:y="292" name="first" t:title="first" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="rest" name="list"/>
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t: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>
  </component>
- <component t:x="812" t:y="334" name="text9" t:title=" '{propval}'" t:color="orange1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property name="property"/>
+  <property>cnn.com</property>
  </component>
- <component t:x="617" t:y="226" name="text8" t:title=" '{propval}'" t:color="orange1">
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>(CNN)</property>
  </component>
- <component t:x="617" t:y="254" name="join" t:title="join" t:color="magenta1">
-  <t:implementation.python script="nuvem/join.py"/>
-  <service name="join"/>
-  <reference target="text9" name="separator"/>
-  <reference target="first" name="list"/>
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property name="property"/>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html Mon May  2 05:58:47 2011
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+ <SPAN id="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; ">