tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1154446 [1/4] - in /tuscany/sca-cpp/trunk/modules/edit: apps/me360/ apps/nearme/ apps/nearme2/ apps/nearme2/htdocs/ apps/new/ apps/ourphotos/ apps/shoppingcart/ apps/slice/ apps/slice/htdocs/ apps/test/ apps/test/htdocs/ apps/testanimation...
Date Sat, 06 Aug 2011 05:59:24 GMT
Author: jsdelfino
Date: Sat Aug  6 05:59:22 2011
New Revision: 1154446

URL: http://svn.apache.org/viewvc?rev=1154446&view=rev
Log:
Refactor the sample composites and components and cleanup the component names a bit.

Added:
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html
      - copied, changed from r1154445, tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
Modified:
    tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.stats
    tuscany/sca-cpp/trunk/modules/edit/apps/new/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/slice/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/slice/app.stats
    tuscany/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testsms/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/twsms/app.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/store/all/store.apps
    tuscany/sca-cpp/trunk/modules/edit/store/featured/store.apps
    tuscany/sca-cpp/trunk/modules/edit/store/new/store.apps
    tuscany/sca-cpp/trunk/modules/edit/store/top/store.apps

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite?rev=1154446&r1=1154445&r2=1154446&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite Sat Aug  6 05:59:22 2011
@@ -27,7 +27,7 @@
    <binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
   </reference>
  </component>
- <component name="fbprofile" title="facebook profile" color="blue1">
+ <component x="130" y="30" name="fbprofile" title="facebook profile" color="blue1">
   <implementation.python script="nuvem/fbprofile.py"/>
   <service name="fbprofile"/>
   <reference target="text" name="id"/>
@@ -35,55 +35,49 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component name="item" title="{propval} :" color="orange1">
+ <component x="90" y="170" name="item" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="fbprofile" name="value"/>
   <property>fbprofile</property>
  </component>
- <component name="item2" title="{propval} :" color="orange1">
+ <component x="90" y="190" name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="twprofile" name="value"/>
   <property>twitprofile</property>
  </component>
- <component name="item3" title="{propval} :" color="orange1">
+ <component x="90" y="210" name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="bzprofile" name="value"/>
   <property>buzzprofile</property>
  </component>
- <component name="list2" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item" name="item" clonable="true"/>
-  <reference target="item2" name="item" clonable="true"/>
-  <reference target="item3" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
+ <component x="60" y="30" name="list31" title="list" color="yellow1">
+  <implementation.python script="nuvem/triple.py"/>
+  <service name="list3"/>
+  <reference target="item" name="first"/>
+  <reference target="item2" name="second"/>
+  <reference target="item3" name="third"/>
  </component>
- <component x="15" y="32" name="start" title="start" color="green1">
+ <component x="10" y="10" name="start" title="start" color="green1">
   <implementation.python script="nuvem/start.py"/>
   <service name="start" visible="false">
    <binding.http uri="start"/>
   </service>
-  <reference target="list2" name="content"/>
+  <reference target="list31" name="content"/>
  </component>
- <component name="text" title=" '{propval}'" color="orange1">
+ <component x="220" y="170" name="text" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text2" title=" '{propval}'" color="orange1">
+ <component x="220" y="200" name="text2" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text4" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component name="text5" title=" '{propval}'" color="orange1">
+ <component x="220" y="230" name="text4" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite?rev=1154446&r1=1154445&r2=1154446&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite Sat Aug  6 05:59:22 2011
@@ -30,7 +30,7 @@
   <reference target="params" name="first"/>
   <reference target="call2" name="second"/>
  </component>
- <component name="call" title="call" color="green1">
+ <component x="130" y="530" name="call" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name" name="name"/>
@@ -54,176 +54,176 @@
   <reference target="name3" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="filedb" title="file" color="red1">
+ <component name="filedb" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component name="filedb10" title="file" color="red1">
+ <component x="210" y="120" name="filedb1" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component name="filedb11" title="file" color="red1">
+ <component name="filedb10" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb4" title="file" color="red1">
+ <component name="filedb11" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb5" title="file" color="red1">
+ <component xmlns="" name="filedb4" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb6" title="file" color="red1">
+ <component xmlns="" name="filedb5" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb7" title="file" color="red1">
+ <component xmlns="" name="filedb6" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb8" title="file" color="red1">
+ <component xmlns="" name="filedb8" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb9" title="file" color="red1">
+ <component xmlns="" name="filedb9" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component name="get10" title="get" color="red1">
+ <component x="190" y="120" name="get1" title="get" color="pink1">
+  <implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb1" name="collection"/>
+  <reference target="user4" name="id"/>
+ </component>
+ <component name="get10" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb11" name="collection"/>
   <reference target="param5" name="id"/>
  </component>
- <component xmlns="" name="get3" title="get" color="red1">
+ <component xmlns="" name="get3" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb4" name="collection"/>
   <reference target="param3" name="id"/>
  </component>
- <component xmlns="" name="get4" title="get" color="red1">
+ <component xmlns="" name="get4" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb5" name="collection"/>
   <reference target="param4" name="id"/>
  </component>
- <component xmlns="" name="get5" title="get" color="red1">
+ <component xmlns="" name="get5" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb6" name="collection"/>
   <reference target="param2" name="id"/>
  </component>
- <component xmlns="" name="get6" title="get" color="red1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb7" name="collection"/>
-  <reference target="user4" name="id"/>
- </component>
- <component xmlns="" name="get7" title="get" color="red1">
+ <component xmlns="" name="get7" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb8" name="collection"/>
   <reference target="param7" name="id"/>
  </component>
- <component xmlns="" name="get8" title="get" color="red1">
+ <component xmlns="" name="get8" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb9" name="collection"/>
   <reference target="param6" name="id"/>
  </component>
- <component name="get9" title="get" color="red1">
+ <component name="get9" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb10" name="collection"/>
   <reference target="user5" name="id"/>
  </component>
- <component x="394" y="352" name="getlocs" title="{compname}" color="green1">
+ <component x="310" y="270" name="getlocs" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
-  <reference target="list3" name="content"/>
+  <reference target="list4" name="content"/>
  </component>
- <component xmlns="" name="googlemap" title="google map" color="red1">
+ <component x="80" y="610" name="gmap1" title="map" color="blue1">
   <implementation.python script="nuvem/gmap.py"/>
-  <service name="googlemap"/>
+  <service name="gmap"/>
   <reference target="call" name="locations"/>
   <reference name="s" visible="false">
    <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component name="item" title="{propval} :" color="orange1">
+ <component x="110" y="90" name="item" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="user3" name="value"/>
   <property>me</property>
  </component>
- <component name="item10" title="{propval} :" color="orange1">
+ <component x="110" y="390" name="item10" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="url" name="value"/>
   <property>mapimg</property>
  </component>
- <component name="item11" title="{propval} :" color="orange1">
+ <component x="660" y="350" name="item11" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="get9" name="value"/>
   <property>x</property>
  </component>
- <component name="item12" title="{propval} :" color="orange1">
+ <component x="660" y="400" name="item12" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="get10" name="value"/>
   <property>1</property>
  </component>
- <component name="item4" title="{propval} :" color="orange1">
+ <component x="660" y="460" name="item4" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="get3" name="value"/>
   <property>2</property>
  </component>
- <component name="item5" title="{propval} :" color="orange1">
+ <component x="660" y="530" name="item5" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="get4" name="value"/>
   <property>3</property>
  </component>
- <component name="item6" title="{propval} :" color="orange1">
+ <component x="110" y="330" name="item6" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="last4" name="value"/>
   <property>time3</property>
  </component>
- <component name="item7" title="{propval} :" color="orange1">
+ <component x="110" y="260" name="item7" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="last3" name="value"/>
   <property>time2</property>
  </component>
- <component name="item8" title="{propval} :" color="orange1">
+ <component x="100" y="200" name="item8" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="last2" name="value"/>
   <property>time1</property>
  </component>
- <component name="item9" title="{propval} :" color="orange1">
+ <component x="100" y="120" name="item9" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="last" name="value"/>
@@ -232,14 +232,14 @@
  <component name="last" title="last" color="yellow1">
   <implementation.python script="nuvem/last.py"/>
   <service name="last"/>
-  <reference target="get6" name="list"/>
+  <reference target="get1" name="list"/>
  </component>
  <component name="last2" title="last" color="yellow1">
   <implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get5" name="list"/>
  </component>
- <component name="last3" title="last" color="yellow1">
+ <component x="160" y="220" name="last3" title="last" color="yellow1">
   <implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get8" name="list"/>
@@ -249,16 +249,7 @@
   <service name="last"/>
   <reference target="get7" name="list"/>
  </component>
- <component xmlns="" name="list" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text7" name="item" clonable="true"/>
-  <reference target="param10" name="item" clonable="true"/>
-  <reference target="param" name="item" clonable="true"/>
-  <reference target="now" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component xmlns="" name="list2" title="list" color="yellow1">
+ <component name="list1" title="list.." color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="item" name="item" clonable="true"/>
@@ -269,7 +260,16 @@
   <reference target="item10" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component name="list3" title="list" color="yellow1">
+ <component name="list2" title="list.." color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text7" name="item" clonable="true"/>
+  <reference target="param10" name="item" clonable="true"/>
+  <reference target="param" name="item" clonable="true"/>
+  <reference target="now" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="list4" title="list.." color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="item11" name="item" clonable="true"/>
@@ -278,17 +278,17 @@
   <reference target="item5" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component x="389" y="111" name="location" title="location" color="green1">
+ <component x="310" y="80" name="location" title="location" color="green1">
   <implementation.python script="nuvem/location.py"/>
   <service name="location" visible="false">
    <binding.http uri="location"/>
   </service>
   <reference target="put" name="content"/>
  </component>
- <component x="42" y="616" name="map" title="{compname}" color="green1">
+ <component x="10" y="460" name="map" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
-  <reference target="googlemap" name="content"/>
+  <reference target="gmap1" name="content"/>
  </component>
  <component name="name" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
@@ -310,12 +310,12 @@
   <service name="name"/>
   <property>nearme</property>
  </component>
- <component x="39" y="80" name="nearme" title="{compname}" color="green1">
+ <component x="10" y="60" name="nearme" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
-  <reference target="list2" name="content"/>
+  <reference target="list1" name="content"/>
  </component>
- <component name="now" title="now" color="orange1">
+ <component x="500" y="250" name="now" title="now" color="orange1">
   <implementation.python script="nuvem/now.py"/>
   <service name="now"/>
   <reference target="text" name="format"/>
@@ -325,13 +325,13 @@
   <service name="number"/>
   <property>5000</property>
  </component>
- <component name="param" title="?param" color="green1">
+ <component x="500" y="220" name="param" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>longitude</property>
   <property name="query" visible="false"/>
  </component>
- <component name="param10" title="?param" color="green1">
+ <component x="500" y="200" name="param10" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>latitude</property>
@@ -378,14 +378,14 @@
   <service name="params"/>
   <property name="query" visible="false"/>
  </component>
- <component xmlns="" name="put" title="put" color="red1">
+ <component xmlns="" name="put" title="put" color="pink1">
   <implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb" name="collection"/>
   <reference target="user" name="id"/>
-  <reference target="list" name="value"/>
+  <reference target="list2" name="value"/>
  </component>
- <component x="40" y="21" name="start2" title="start" color="green1">
+ <component x="10" y="10" name="start2" title="start" color="green1">
   <implementation.python script="nuvem/start.py"/>
   <service name="start" visible="false">
    <binding.http uri="start"/>
@@ -402,12 +402,12 @@
   <service name="text"/>
   <property>/components/map</property>
  </component>
- <component xmlns="" name="text7" title=" '{propval}'" color="orange1">
+ <component xmlns="" x="500" y="170" name="text7" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>green</property>
  </component>
- <component x="389" y="13" name="timer" title="timer" color="green1">
+ <component x="310" y="10" name="timer" title="timer" color="green1">
   <implementation.python script="nuvem/timer.py"/>
   <service name="timer" visible="false">
    <binding.http uri="timer"/>
@@ -431,7 +431,7 @@
   <service name="user"/>
   <property name="user" visible="false"/>
  </component>
- <component xmlns="" name="user4" title="user" color="green1">
+ <component xmlns="" x="210" y="150" name="user4" title="user" color="green1">
   <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user" visible="false"/>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.stats
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.stats?rev=1154446&r1=1154445&r2=1154446&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.stats (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.stats Sat Aug  6 05:59:22 2011
@@ -1 +1 @@
-((entry (title "Where are my friends") (id "nearme")))
\ No newline at end of file
+((entry (title "nearme") (id "nearme")))
\ No newline at end of file

Added: tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite?rev=1154446&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite Sat Aug  6 05:59:22 2011
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="location" promote="location"/>
+ <service name="start1" promote="start1"/>
+ <service name="timer" promote="timer"/>
+ <component x="250" y="230" name="append1" title="+" color="yellow1">
+  <implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference target="text5" name="first"/>
+  <reference target="get3" name="second"/>
+ </component>
+ <component x="250" y="330" name="append2" title="+" color="yellow1">
+  <implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference target="text6" name="first"/>
+  <reference target="get4" name="second"/>
+ </component>
+ <component x="120" y="10" name="filedb2" title="file" color="pink1">
+  <implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
+ </component>
+ <component x="410" y="260" name="filedb4" title="file" color="pink1">
+  <implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
+ </component>
+ <component x="400" y="370" name="filedb5" title="file" color="pink1">
+  <implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
+ </component>
+ <component x="270" y="260" name="get3" title="get" color="pink1">
+  <implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb4" name="collection"/>
+  <reference target="text2" name="id"/>
+ </component>
+ <component x="270" y="350" name="get4" title="get" color="pink1">
+  <implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb5" name="collection"/>
+  <reference target="text8" name="id"/>
+ </component>
+ <component x="200" y="230" name="gmap1" title="map" color="blue1">
+  <implementation.python script="nuvem/gmap.py"/>
+  <service name="gmap"/>
+  <reference target="list21" name="locations"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  </reference>
+ </component>
+ <component x="150" y="230" name="htinline2" title="inline" color="white1">
+  <implementation.python script="nuvem/htinline.py"/>
+  <service name="htinline"/>
+  <reference target="gmap1" name="value"/>
+ </component>
+ <component x="40" y="150" name="item1" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="user1" name="value"/>
+  <property>me</property>
+ </component>
+ <component x="50" y="210" name="item10" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="htinline2" name="value"/>
+  <property>img</property>
+ </component>
+ <component x="290" y="90" name="item2" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="append1" name="value"/>
+  <property>S</property>
+ </component>
+ <component x="290" y="190" name="item3" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="append2" name="value"/>
+  <property>C</property>
+ </component>
+ <component x="190" y="240" name="list21" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="item2" name="first"/>
+  <reference target="item3" name="second"/>
+ </component>
+ <component x="100" y="110" name="list24" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="param10" name="first"/>
+  <reference target="param" name="second"/>
+ </component>
+ <component x="10" y="50" name="location" title="location" color="green1">
+  <implementation.python script="nuvem/location.py"/>
+  <service name="location" visible="false">
+   <binding.http uri="location"/>
+  </service>
+  <reference target="put1" name="content"/>
+ </component>
+ <component xmlns="" name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>10000</property>
+ </component>
+ <component x="280" y="90" name="param" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>longitude</property>
+  <property name="query" visible="false"/>
+ </component>
+ <component x="280" y="70" name="param10" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>latitude</property>
+  <property name="query" visible="false"/>
+ </component>
+ <component x="70" y="60" name="put1" title="put" color="pink1">
+  <implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference target="filedb2" name="collection"/>
+  <reference target="user" name="id"/>
+  <reference target="list24" name="value"/>
+ </component>
+ <component x="10" y="10" name="start1" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
+  </service>
+  <reference target="item1" name="content"/>
+ </component>
+ <component x="410" y="290" name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>john</property>
+ </component>
+ <component x="270" y="230" name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>blue</property>
+ </component>
+ <component x="270" y="320" name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>pink</property>
+ </component>
+ <component x="410" y="400" name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jane</property>
+ </component>
+ <component x="10" y="170" name="timer" title="timer" color="green1">
+  <implementation.python script="nuvem/timer.py"/>
+  <service name="timer" visible="false">
+   <binding.http uri="timer"/>
+  </service>
+  <reference target="number" name="n"/>
+  <reference target="item10" name="content"/>
+ </component>
+ <component xmlns="" x="120" y="30" name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
+ <component x="80" y="20" name="user1" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
+</composite>

Added: tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats?rev=1154446&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats Sat Aug  6 05:59:22 2011
@@ -0,0 +1 @@
+((entry (title "nearme2") (id "nearme2")))

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html (from r1154445, tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html&r1=1154445&r2=1154446&rev=1154446&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html Sat Aug  6 05:59:22 2011
@@ -18,16 +18,13 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
   <H1>Hello</H1>
  </SPAN>
  <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 56px; ">
   <H1>=me</H1>
  </SPAN>
- <SPAN id="page:text" class="text" style="position: absolute; top: 36px; left: 2px; ">
-  <SPAN>The time is:</SPAN>
- </SPAN>
- <SPAN id="time" class="text" style="position: absolute; top: 36px; left: 74px; ">
-  <SPAN>=time</SPAN>
+ <SPAN id="img" class="img" style="position: absolute; top: 36px; left: 2px; ">
+  <IMG src="/public/img.png"/>
  </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/new/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/new/app.composite?rev=1154446&r1=1154445&r2=1154446&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/new/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/new/app.composite Sat Aug  6 05:59:22 2011
@@ -25,13 +25,13 @@
   <service name="comment" visible="false"/>
   <property>Change this example to do what you want</property>
  </component>
- <component name="item1" title="{propval} :" color="orange1">
+ <component x="80" y="40" name="item1" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="user1" name="value"/>
   <property>me</property>
  </component>
- <component name="list2" title="list" color="yellow1">
+ <component name="list1" title="list.." color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="item1" name="item" clonable="true"/>
@@ -42,7 +42,7 @@
   <service name="start" visible="false">
    <binding.http uri="start"/>
   </service>
-  <reference target="list2" name="content"/>
+  <reference target="list1" name="content"/>
  </component>
  <component name="user1" title="user" color="green1">
   <implementation.python script="nuvem/user.py"/>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite?rev=1154446&r1=1154445&r2=1154446&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite Sat Aug  6 05:59:22 2011
@@ -33,47 +33,50 @@
    <binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
   </reference>
  </component>
- <component name="foreach2" title="foreach" color="yellow1">
-  <implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name5" name="item"/>
-  <reference target="htimg1" name="transform"/>
-  <reference target="shuffle" name="list"/>
+ <component x="200" y="70" name="htattrs1" title="attrs:" color="white1">
+  <implementation.python script="nuvem/htattrs.py"/>
+  <service name="htattrs"/>
+  <reference target="list12" name="value"/>
  </component>
- <component x="180" y="50" name="htimg1" title="html img" color="magenta1">
+ <component x="140" y="40" name="htimg2" title="img" color="white1">
   <implementation.python script="nuvem/htimg.py"/>
   <service name="htimg"/>
-  <reference target="list" name="value"/>
+  <reference target="list21" name="value"/>
  </component>
- <component x="280" y="80" name="htstyle1" title="html style" color="magenta1">
+ <component x="260" y="70" name="htstyle2" title="style" color="white1">
   <implementation.python script="nuvem/htstyle.py"/>
   <service name="htstyle"/>
-  <reference target="list1" name="value"/>
+  <reference target="item1" name="value"/>
  </component>
- <component name="item" title="{propval} :" color="orange1">
+ <component name="item" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="foreach2" name="value"/>
+  <reference target="map2" name="value"/>
   <property>images</property>
  </component>
- <component x="390" y="80" name="item1" title="{propval} :" color="orange1">
+ <component x="310" y="70" name="item1" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="text1" name="value"/>
+  <reference target="pixels1" name="value"/>
   <property>width</property>
  </component>
- <component name="list" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="valueof2" name="item" clonable="true"/>
-  <reference target="htstyle1" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="list1" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item1" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
+ <component x="240" y="70" name="list12" title="list" color="yellow1">
+  <implementation.python script="nuvem/single.py"/>
+  <service name="list1"/>
+  <reference target="htstyle2" name="value"/>
+ </component>
+ <component x="170" y="40" name="list21" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="valueof2" name="first"/>
+  <reference target="htattrs1" name="second"/>
+ </component>
+ <component name="map2" title="map" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
+  <service name="map"/>
+  <reference target="name5" name="item"/>
+  <reference target="htimg2" name="transform"/>
+  <reference target="shuffle" name="list"/>
  </component>
  <component name="name3" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
@@ -90,6 +93,11 @@
   <service name="name"/>
   <property>image</property>
  </component>
+ <component x="420" y="70" name="number1" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>320</property>
+ </component>
  <component name="picalbum" title="picasa album" color="blue1">
   <implementation.python script="nuvem/picalbum.py"/>
   <service name="picalbum"/>
@@ -98,6 +106,11 @@
    <binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
   </reference>
  </component>
+ <component x="280" y="70" name="pixels1" title="pixels" color="white1">
+  <implementation.python script="nuvem/pixels.py"/>
+  <service name="pixels"/>
+  <reference target="number1" name="value"/>
+ </component>
  <component name="select" title="select" color="yellow1">
   <implementation.python script="nuvem/select.py"/>
   <service name="select"/>
@@ -115,18 +128,13 @@
   <service name="shuffle"/>
   <reference target="append" name="list"/>
  </component>
- <component x="20" y="10" name="start" title="start" color="green1">
+ <component x="10" y="10" name="start" title="start" color="green1">
   <implementation.python script="nuvem/start.py"/>
   <service name="start" visible="false">
    <binding.http uri="start"/>
   </service>
   <reference target="item" name="content"/>
  </component>
- <component x="440" y="80" name="text1" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>320px</property>
- </component>
  <component name="text5" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
@@ -137,7 +145,7 @@
   <service name="text"/>
   <property>61049883@N06</property>
  </component>
- <component name="valueof2" title="valueof" color="orange1">
+ <component x="470" y="30" name="valueof2" title="valueof" color="orange1">
   <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>image</property>

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=1154446&r1=1154445&r2=1154446&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite Sat Aug  6 05:59:22 2011
@@ -28,20 +28,20 @@
  <service name="order" promote="order"/>
  <service name="start" promote="start"/>
  <service name="total" promote="total"/>
- <component x="330" y="410" name="Add to cart" title="{compname}" color="green1">
+ <component x="290" y="290" name="Add to cart" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
-  <reference target="list6" name="content"/>
+  <reference target="list33" name="content"/>
  </component>
- <component x="10" y="850" name="Check out" title="{compname}" color="green1">
+ <component x="10" y="590" 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 x="10" y="640" name="Empty" title="{compname}" color="green1">
+ <component x="10" y="450" name="Empty" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
-  <reference target="list5" name="content"/>
+  <reference target="list32" name="content"/>
  </component>
  <component name="append" title="+" color="yellow1">
   <implementation.python script="nuvem/append.py"/>
@@ -49,12 +49,6 @@
   <reference target="call2" name="first"/>
   <reference target="lookup" name="second"/>
  </component>
- <component name="call" title="call" color="green1">
-  <implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name14" name="name"/>
-  <reference name="proxy" wiredByImpl="true" visible="false"/>
- </component>
  <component name="call10" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
@@ -91,7 +85,7 @@
   <reference target="name20" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call16" title="call" color="green1">
+ <component x="250" y="630" name="call16" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name21" name="name"/>
@@ -115,7 +109,7 @@
   <reference target="name6" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call4" title="call" color="green1">
+ <component x="370" y="590" name="call4" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name15" name="name"/>
@@ -127,19 +121,19 @@
   <reference target="name8" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call6" title="call" color="green1">
+ <component x="370" y="620" name="call6" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name10" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call7" title="call" color="green1">
+ <component x="250" y="590" name="call7" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name9" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call8" title="call" color="green1">
+ <component x="500" y="690" name="call8" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name11" name="name"/>
@@ -151,179 +145,150 @@
   <reference target="name2" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component x="10" y="460" name="carthtml" title="{compname}" color="green1">
+ <component x="10" y="320" name="carthtml" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="item6" name="content"/>
  </component>
- <component x="354" y="28" name="catalog" title="{compname}" color="green1">
+ <component x="290" y="10" name="catalog" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
-  <reference target="list" name="content"/>
+  <reference target="list31" name="content"/>
  </component>
- <component x="10" y="220" name="cataloghtml" title="{compname}" color="green1">
+ <component x="10" y="160" name="cataloghtml" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="item" name="content"/>
  </component>
- <component name="delete2" title="delete" color="red1">
+ <component name="delete2" title="delete" color="pink1">
   <implementation.python script="nuvem/delete.py"/>
   <service name="delete"/>
   <reference target="filedb2" name="collection"/>
   <reference target="user2" name="id"/>
  </component>
- <component name="equals" title="=" color="magenta1">
-  <implementation.python script="nuvem/equals.py"/>
-  <service name="equals"/>
-  <reference target="call" name="value1"/>
-  <reference target="nothing" name="value2"/>
- </component>
- <component name="filedb" title="file" color="red1">
+ <component name="filedb" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component name="filedb2" title="file" color="red1">
+ <component name="filedb2" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component name="filedb3" title="file" color="red1">
+ <component name="filedb3" title="file" color="pink1">
   <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component name="foreach" title="foreach" color="yellow1">
-  <implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name" name="item"/>
-  <reference target="htcheck1" name="transform"/>
-  <reference target="call9" name="list"/>
- </component>
- <component name="foreach2" title="foreach" color="yellow1">
-  <implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name3" name="item"/>
-  <reference target="format3" name="transform"/>
-  <reference target="call10" name="list"/>
- </component>
- <component name="format" title="format" color="magenta1">
+ <component x="130" y="420" name="format1" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
-  <reference target="text4" name="pattern"/>
-  <reference target="call8" name="values"/>
+  <reference target="text6" name="pattern"/>
+  <reference target="valueof2" name="values"/>
  </component>
- <component x="350" y="270" name="format1" title="format" color="magenta1">
+ <component x="280" y="350" name="format2" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text5" name="pattern"/>
   <reference target="valueof" name="values"/>
  </component>
- <component name="format3" title="format" color="magenta1">
+ <component x="300" y="610" name="format3" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
-  <reference target="text6" name="pattern"/>
-  <reference target="valueof2" name="values"/>
+  <reference target="text4" name="pattern"/>
+  <reference target="call8" name="values"/>
  </component>
- <component name="get" title="get" color="red1">
+ <component name="get" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb" name="collection"/>
   <reference target="user" name="id"/>
  </component>
- <component x="477" y="153" name="getcart" title="{compname}" color="green1">
+ <component x="470" y="10" name="getcart" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="get" name="content"/>
  </component>
- <component x="210" y="240" name="htcheck1" title="html checkbox" color="magenta1">
+ <component x="160" y="250" name="htcheck2" title="checkbox" color="white1">
   <implementation.python script="nuvem/htcheck.py"/>
   <service name="htcheck"/>
-  <reference target="pair1" name="value"/>
+  <reference target="list22" name="value"/>
  </component>
- <component name="if" title="if" color="magenta1">
-  <implementation.python script="nuvem/if_.py"/>
-  <service name="if"/>
-  <reference target="equals" name="condition"/>
-  <reference target="number5" name="then"/>
-  <reference target="round" name="else"/>
- </component>
- <component name="item" title="{propval} :" color="orange1">
+ <component name="item" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="foreach" name="value"/>
+  <reference target="map" name="value"/>
   <property>catalog</property>
  </component>
- <component name="item10" title="{propval} :" color="orange1">
+ <component x="410" y="170" name="item1" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference name="value" target="total1"/>
+  <property>total</property>
+ </component>
+ <component x="530" y="80" 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">
+ <component x="250" y="530" 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">
+ <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">
+ <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">
+ <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">
+ <component name="item6" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="foreach2" name="value"/>
+  <reference target="map2" name="value"/>
   <property>cart</property>
  </component>
- <component name="item7" title="{propval} :" color="orange1">
+ <component x="380" y="390" 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">
+ <component x="530" y="20" 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">
+ <component x="540" y="50" 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"/>
-  <reference target="item8" name="item" clonable="true"/>
-  <reference target="item9" name="item" clonable="true"/>
-  <reference target="item10" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
+ <component x="220" y="250" name="list22" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="text8" name="first"/>
+  <reference target="format2" name="second"/>
  </component>
  <component name="list3" title="list" color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
@@ -333,6 +298,27 @@
   <reference target="call3" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
+ <component x="360" y="20" name="list31" title="list" color="yellow1">
+  <implementation.python script="nuvem/triple.py"/>
+  <service name="list3"/>
+  <reference target="item8" name="first"/>
+  <reference target="item9" name="second"/>
+  <reference target="item10" name="third"/>
+ </component>
+ <component x="50" y="540" name="list32" title="list" color="yellow1">
+  <implementation.python script="nuvem/triple.py"/>
+  <service name="list3"/>
+  <reference target="item11" name="first"/>
+  <reference target="call7" name="second"/>
+  <reference target="call16" name="third"/>
+ </component>
+ <component x="350" y="390" name="list33" title="list" color="yellow1">
+  <implementation.python script="nuvem/triple.py"/>
+  <service name="list3"/>
+  <reference target="item7" name="first"/>
+  <reference target="call4" name="second"/>
+  <reference target="call6" name="third"/>
+ </component>
  <component name="list4" title="list" color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
@@ -342,28 +328,26 @@
   <reference target="call14" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component name="list5" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item11" name="item" clonable="true"/>
-  <reference target="call7" name="item" clonable="true"/>
-  <reference target="call16" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="list6" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item7" name="item" clonable="true"/>
-  <reference target="call4" name="item" clonable="true"/>
-  <reference target="call6" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
  <component name="lookup" title="lookup" color="yellow1">
   <implementation.python script="nuvem/lookup.py"/>
   <service name="lookup"/>
   <reference target="second1" name="name"/>
   <reference target="call15" name="list"/>
  </component>
+ <component name="map" title="map" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
+  <service name="map"/>
+  <reference target="name" name="item"/>
+  <reference target="htcheck2" name="transform"/>
+  <reference target="call9" name="list"/>
+ </component>
+ <component name="map2" title="map" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
+  <service name="map"/>
+  <reference target="name3" name="item"/>
+  <reference target="format1" name="transform"/>
+  <reference target="call10" name="list"/>
+ </component>
  <component name="name" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
@@ -389,11 +373,6 @@
   <service name="name"/>
   <property>order</property>
  </component>
- <component name="name14" title="" color="orange1">
-  <implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>getcart</property>
- </component>
  <component name="name15" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
@@ -459,10 +438,6 @@
   <service name="name"/>
   <property>carthtml</property>
  </component>
- <component name="nothing" title="nothing" color="orange1">
-  <implementation.python script="nuvem/nothing.py"/>
-  <service name="nothing"/>
- </component>
  <component name="number" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
@@ -473,7 +448,7 @@
   <service name="number"/>
   <property>3.55</property>
  </component>
- <component name="number3" title="#" color="orange1">
+ <component x="650" y="340" name="number3" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>2</property>
@@ -483,45 +458,28 @@
   <service name="number"/>
   <property>1.55</property>
  </component>
- <component name="number5" title="#" color="orange1">
-  <implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>0</property>
- </component>
- <component x="430" y="760" name="order" title="{compname}" color="green1">
+ <component x="300" y="550" name="order" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
-  <reference target="format" name="content"/>
- </component>
- <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"/>
+  <reference target="format3" name="content"/>
  </component>
- <component x="840" y="100" name="param" title="?param" color="green1">
+ <component x="580" y="370" 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="put" title="put" color="red1">
+ <component name="put" title="put" color="pink1">
   <implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb3" name="collection"/>
   <reference target="user3" name="id"/>
   <reference target="append" name="value"/>
  </component>
- <component name="round" title="round" color="magenta1">
-  <implementation.python script="nuvem/round_.py"/>
-  <service name="round"/>
-  <reference target="number3" name="n"/>
-  <reference target="sum" name="x"/>
- </component>
  <component x="650" y="450" name="second1" title="second" color="yellow1">
   <implementation.python script="nuvem/second.py"/>
   <service name="second"/>
-  <reference target="split1" name="list"/>
+  <reference target="split2" name="list"/>
  </component>
  <component name="sendgtalk" title="gtalk" color="blue1">
   <implementation.cpp path="lib/chat" library="libchat-sender2"/>
@@ -531,20 +489,20 @@
   <reference target="text3" name="to"/>
   <reference target="call12" name="msg"/>
  </component>
- <component x="720" y="70" name="split1" title="split" color="magenta1">
+ <component x="580" y="480" name="split2" title="split" color="cyan1">
   <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">
+ <component x="10" y="10" name="start" title="start" color="green1">
   <implementation.python script="nuvem/start.py"/>
   <service name="start" visible="false">
    <binding.http uri="start"/>
   </service>
   <reference target="list4" name="content"/>
  </component>
- <component name="sum" title="sum" color="magenta1">
+ <component x="650" y="360" name="sum1" title="sum" color="cyan1">
   <implementation.python script="nuvem/sum_.py"/>
   <service name="sum"/>
   <reference target="values" name="l"/>
@@ -554,7 +512,7 @@
   <service name="text"/>
   <property>xmppsca.1@gmail.com</property>
  </component>
- <component x="790" y="70" name="text1" title=" '{propval}'" color="orange1">
+ <component x="580" y="330" name="text1" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property> - </property>
@@ -569,17 +527,17 @@
   <service name="text"/>
   <property>jsdelfino@gmail.com</property>
  </component>
- <component name="text4" title=" '{propval}'" color="orange1">
+ <component x="500" y="660" name="text4" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>Your order has been processed. Your total: ${1}</property>
  </component>
- <component x="1220" y="310" name="text5" title=" '{propval}'" color="orange1">
+ <component x="450" y="280" name="text5" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>${1} - {0}</property>
  </component>
- <component name="text6" title=" '{propval}'" color="orange1">
+ <component x="220" y="550" name="text6" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>${1} - {0}</property>
@@ -589,15 +547,21 @@
   <service name="text"/>
   <property>xmpp4sca</property>
  </component>
- <component x="350" y="250" name="text8" title=" '{propval}'" color="orange1">
+ <component x="280" y="320" 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">
+ <component x="330" y="120" name="total" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
-  <reference target="item2" name="content"/>
+  <reference target="item1" name="content"/>
+ </component>
+ <component name="total1" x="600" y="130" title="round" color="cyan1">
+  <implementation.python script="nuvem/round_.py"/>
+  <service name="round"/>
+  <reference target="number3" name="n"/>
+  <reference target="sum1" name="x"/>
  </component>
  <component name="user" title="user" color="green1">
   <implementation.python script="nuvem/user.py"/>
@@ -614,17 +578,17 @@
   <service name="user"/>
   <property name="user" visible="false"/>
  </component>
- <component x="1220" y="340" name="valueof" title="valueof" color="orange1">
+ <component x="440" y="310" name="valueof" title="valueof" color="orange1">
   <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>fruit</property>
  </component>
- <component name="valueof2" title="valueof" color="orange1">
+ <component x="210" y="580" name="valueof2" title="valueof" color="orange1">
   <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>fruit</property>
  </component>
- <component name="values" title="values" color="yellow1">
+ <component x="790" y="320" name="values" title="values" color="yellow1">
   <implementation.python script="nuvem/values.py"/>
   <service name="values"/>
   <reference target="call17" name="list"/>



Mime
View raw message