From 4b14cefc9e79850ebb18844752771c3f141c7385 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 6 Aug 2011 05:59:22 +0000
Subject: Refactor the sample composites and components and cleanup the
 component names a bit.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1154446 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/modules/edit/apps/me360/app.composite    |  36 +-
 .../trunk/modules/edit/apps/nearme/app.composite   | 128 ++---
 sca-cpp/trunk/modules/edit/apps/nearme/app.stats   |   2 +-
 .../trunk/modules/edit/apps/nearme2/app.composite  | 191 +++++++
 sca-cpp/trunk/modules/edit/apps/nearme2/app.stats  |   1 +
 .../modules/edit/apps/nearme2/htdocs/app.html      |  30 ++
 sca-cpp/trunk/modules/edit/apps/new/app.composite  |   6 +-
 .../modules/edit/apps/ourphotos/app.composite      |  72 +--
 .../modules/edit/apps/shoppingcart/app.composite   | 260 ++++-----
 .../trunk/modules/edit/apps/slice/app.composite    | 592 +++++++++++++--------
 sca-cpp/trunk/modules/edit/apps/slice/app.stats    |   2 +-
 .../trunk/modules/edit/apps/slice/htdocs/app.html  |  48 +-
 sca-cpp/trunk/modules/edit/apps/test/app.composite |  23 +-
 .../trunk/modules/edit/apps/test/htdocs/app.html   |   2 +-
 .../modules/edit/apps/testanimation/app.composite  |  96 ++--
 .../trunk/modules/edit/apps/testdb/app.composite   |  12 +-
 .../modules/edit/apps/testevents/app.composite     |  88 +--
 .../trunk/modules/edit/apps/testhttp/app.composite |  26 +-
 .../modules/edit/apps/testlogic/app.composite      |  73 ++-
 .../modules/edit/apps/testsearch/app.composite     |  54 +-
 .../trunk/modules/edit/apps/testsms/app.composite  |   2 +-
 .../modules/edit/apps/testsocial/app.composite     |  56 +-
 .../trunk/modules/edit/apps/testtext/app.composite |  42 +-
 .../trunk/modules/edit/apps/testurl/app.composite  |  14 +-
 .../modules/edit/apps/testvalues/app.composite     | 226 ++++----
 .../modules/edit/apps/testwidgets/app.composite    |  28 +-
 .../modules/edit/apps/testwidgets2/app.composite   |  16 +-
 .../modules/edit/apps/testwidgets3/app.composite   |  40 +-
 .../trunk/modules/edit/apps/twsms/app.composite    | 116 ++--
 .../edit/palettes/animation/palette.composite      |  72 ++-
 .../edit/palettes/control/palette.composite        |  34 +-
 .../edit/palettes/database/palette.composite       |  32 +-
 .../modules/edit/palettes/http/palette.composite   |  44 +-
 .../modules/edit/palettes/lists/palette.composite  |  74 ++-
 .../modules/edit/palettes/logic/palette.composite  |  32 +-
 .../modules/edit/palettes/math/palette.composite   |  71 ++-
 .../modules/edit/palettes/python/palette.composite |  22 +-
 .../modules/edit/palettes/search/palette.composite |  36 +-
 .../modules/edit/palettes/social/palette.composite |  40 +-
 .../modules/edit/palettes/talk/palette.composite   |  26 +-
 .../modules/edit/palettes/text/palette.composite   |  34 +-
 .../edit/palettes/transform/palette.composite      |  32 +-
 .../modules/edit/palettes/values/palette.composite |  38 +-
 sca-cpp/trunk/modules/edit/store/all/store.apps    |   2 +-
 .../trunk/modules/edit/store/featured/store.apps   |   2 +-
 sca-cpp/trunk/modules/edit/store/new/store.apps    |   2 +-
 sca-cpp/trunk/modules/edit/store/top/store.apps    |   2 +-
 47 files changed, 1787 insertions(+), 1090 deletions(-)
 create mode 100644 sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
 create mode 100644 sca-cpp/trunk/modules/edit/apps/nearme2/app.stats
 create mode 100644 sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html

diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.composite b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
index 8fe4825f8a..c0fb6a425c 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
@@ -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>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
index f3736451a0..51fc2791fb 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
@@ -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"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.stats b/sca-cpp/trunk/modules/edit/apps/nearme/app.stats
index b2f5c5ea79..a072636788 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.stats
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.stats
@@ -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
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
new file mode 100644
index 0000000000..d75af57321
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
@@ -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>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats b/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats
new file mode 100644
index 0000000000..9eb239d22c
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats
@@ -0,0 +1 @@
+((entry (title "nearme2") (id "nearme2")))
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html
new file mode 100644
index 0000000000..a4c407a7a4
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html
@@ -0,0 +1,30 @@
+<?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.    
+-->
+<DIV id="page">
+ <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="img" class="img" style="position: absolute; top: 36px; left: 2px; ">
+  <IMG src="/public/img.png"/>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/new/app.composite b/sca-cpp/trunk/modules/edit/apps/new/app.composite
index 7cfa7629ac..4beacfdf77 100644
--- a/sca-cpp/trunk/modules/edit/apps/new/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/new/app.composite
@@ -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"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
index e0c5e5ceca..2a7ce11f1f 100644
--- a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
@@ -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 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 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="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>
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
index 0d626d09a6..15da95cdcc 100644
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
@@ -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"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/slice/app.composite b/sca-cpp/trunk/modules/edit/apps/slice/app.composite
index af61c11d26..9680b52008 100644
--- a/sca-cpp/trunk/modules/edit/apps/slice/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/slice/app.composite
@@ -18,345 +18,487 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
- <service name="angle" promote="angle"/>
  <service name="animation1" promote="animation1"/>
+ <service name="bounce" promote="bounce"/>
+ <service name="feather" promote="feather"/>
+ <service name="gnu" promote="gnu"/>
+ <service name="score" promote="score"/>
+ <service name="sprite" promote="sprite"/>
  <service name="start" promote="start"/>
- <service name="xpos" promote="xpos"/>
- <service name="ypos" promote="ypos"/>
- <component x="670" y="370" name="angle" title="{compname}" color="green1">
-  <implementation.python script="nuvem/service.py"/>
-  <service name="service" visible="false"/>
-  <reference target="format1" name="content"/>
+ <component x="350" y="120" name="add1" title="+" color="cyan1">
+  <implementation.python script="nuvem/add.py"/>
+  <service name="add">
+   <documentation>+</documentation>
+  </service>
+  <reference target="number10" name="value1"/>
+  <reference target="get1" name="value2"/>
  </component>
- <component x="10" y="140" name="animation1" title="animation" color="green1">
+ <component x="10" y="90" name="animation1" title="animation" color="green1">
   <implementation.python script="nuvem/animation.py"/>
   <service name="animation" visible="false">
    <binding.http uri="animation"/>
   </service>
   <reference target="number6" name="n"/>
-  <reference target="true1" name="loop"/>
-  <reference target="foreach1" name="content"/>
+  <reference target="true2" name="loop"/>
+  <reference target="map1" name="content"/>
+ </component>
+ <component x="360" y="10" name="bounce" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="list1" name="content"/>
  </component>
- <component x="450" y="160" name="call1" title="call" color="green1">
+ <component x="170" y="150" name="call1" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
-  <reference target="name2" name="name"/>
+  <reference target="name5" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component x="440" y="200" name="call2" title="call" color="green1">
+ <component x="820" y="360" name="call2" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
-  <reference target="name3" name="name"/>
+  <reference target="name9" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component x="520" y="250" name="call3" title="call" color="green1">
+ <component x="750" y="210" name="call3" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name4" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component x="660" y="170" name="divide1" title="/" color="magenta1">
-  <implementation.python script="nuvem/divide.py"/>
-  <service name="divide">
-   <documentation>/</documentation>
-  </service>
-  <reference target="valueof3" name="value1"/>
-  <reference target="number3" name="value2"/>
- </component>
- <component x="80" y="130" name="foreach1" title="foreach" color="yellow1">
-  <implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name1" name="item"/>
-  <reference target="list1" name="transform"/>
-  <reference target="range1" name="list"/>
- </component>
- <component x="780" y="380" name="format1" title="format" color="magenta1">
-  <implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text1" name="pattern"/>
-  <reference target="list3" name="values"/>
+ <component x="750" y="330" name="call4" 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 x="390" y="90" name="htattrs1" title="html attrs:" color="magenta1">
-  <implementation.python script="nuvem/htattrs.py"/>
-  <service name="htattrs"/>
-  <reference target="htstyle1" name="value"/>
+ <component x="200" y="80" name="call5" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name11" name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component x="110" y="0" name="htattrs2" title="html attrs:" color="magenta1">
-  <implementation.python script="nuvem/htattrs.py"/>
-  <service name="htattrs"/>
-  <reference target="list5" name="value"/>
+ <component x="10" y="360" name="feather" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="list22" name="content"/>
+ </component>
+ <component x="240" y="100" 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 x="270" y="150" 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="890" y="350" 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 x="1100" y="190" 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="710" y="160" name="frames1" title="frames" color="white1">
+  <implementation.python script="nuvem/frames.py"/>
+  <service name="frames"/>
+  <reference target="number1" name="msec"/>
+  <reference target="number12" name="loop"/>
+  <reference target="call3" name="content"/>
+ </component>
+ <component x="380" y="140" name="get1" title="get" color="pink1">
+  <implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb2" name="collection"/>
+  <reference target="user2" name="id"/>
+ </component>
+ <component x="860" y="360" name="get2" title="get" color="pink1">
+  <implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb3" name="collection"/>
+  <reference target="user4" name="id"/>
+ </component>
+ <component x="10" y="550" name="gnu" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="list23" name="content"/>
  </component>
- <component x="300" y="150" name="htstyle1" title="html style" color="magenta1">
+ <component x="360" y="160" name="htstyle2" title="style" color="white1">
   <implementation.python script="nuvem/htstyle.py"/>
   <service name="htstyle"/>
-  <reference target="list2" name="value"/>
+  <reference target="frames1" name="value"/>
  </component>
- <component name="item" title="{propval} :" color="orange1">
+ <component x="950" y="180" name="item1" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="htattrs2" name="value"/>
-  <property>sprite</property>
+  <reference target="put1" name="value"/>
+  <property>r</property>
  </component>
- <component x="400" y="160" name="item1" title="{propval} :" color="orange1">
+ <component x="210" y="40" name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="call1" name="value"/>
-  <property>left</property>
+  <reference target="user3" name="value"/>
+  <property>me</property>
  </component>
- <component x="400" y="190" name="item2" title="{propval} :" color="orange1">
+ <component x="930" y="400" name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="call2" name="value"/>
-  <property>top</property>
- </component>
- <component x="220" y="0" name="item3" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text3" name="value"/>
-  <property>src</property>
- </component>
- <component x="180" y="160" name="item4" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="htattrs1" name="value"/>
-  <property>sprite</property>
+  <reference target="get2" name="value"/>
+  <property>score</property>
  </component>
- <component x="410" y="490" name="item5" title="{propval} :" color="orange1">
+ <component x="1050" y="210" name="item4" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="text4" name="value"/>
-  <property>position</property>
+  <reference target="put2" name="value"/>
+  <property>r</property>
  </component>
- <component x="400" y="250" name="item6" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="call3" name="value"/>
-  <property>-webkit-transform</property>
- </component>
- <component x="220" y="40" name="item7" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text2" name="value"/>
-  <property>onclick</property>
- </component>
- <component name="list1" title="list" color="yellow1">
+ <component name="list1" title="list.." color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="item4" name="item" clonable="true"/>
+  <reference target="list28" name="item" clonable="true"/>
+  <reference target="list21" name="item" clonable="true"/>
+  <reference target="list29" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component name="list2" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item5" name="item" clonable="true"/>
-  <reference target="item1" name="item" clonable="true"/>
-  <reference target="item2" name="item" clonable="true"/>
-  <reference target="item6" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
+ <component x="120" y="160" name="list11" title="list" color="yellow1">
+  <implementation.python script="nuvem/single.py"/>
+  <service name="list1"/>
+  <reference target="list27" name="value"/>
  </component>
- <component name="list3" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="multiply4" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
+ <component x="620" y="110" name="list14" title="list" color="yellow1">
+  <implementation.python script="nuvem/single.py"/>
+  <service name="list1"/>
+  <reference target="htstyle2" name="value"/>
  </component>
- <component name="list5" title="list" color="yellow1">
+ <component name="list2" title="list.." color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="item3" name="item" clonable="true"/>
-  <reference target="item7" name="item" clonable="true"/>
+  <reference target="name6" name="item" clonable="true"/>
+  <reference target="name7" name="item" clonable="true"/>
+  <reference target="name2" name="item" clonable="true"/>
+  <reference target="name8" name="item" clonable="true"/>
+  <reference target="name3" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component x="540" y="140" name="multiply1" title="*" color="magenta1">
-  <implementation.python script="nuvem/multiply.py"/>
-  <service name="multiply">
-   <documentation>*</documentation>
-  </service>
-  <reference target="number4" name="value1"/>
-  <reference target="sin1" name="value2"/>
+ <component x="670" y="130" name="list21" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="number5" name="first"/>
+  <reference target="transform1" name="second"/>
+ </component>
+ <component x="780" y="200" name="list22" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="item1" name="first"/>
+  <reference target="call2" name="second"/>
+ </component>
+ <component x="1030" y="210" name="list23" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="item4" name="first"/>
+  <reference target="call4" name="second"/>
+ </component>
+ <component x="60" y="10" name="list24" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="item2" name="first"/>
+  <reference target="call5" name="second"/>
+ </component>
+ <component x="140" y="210" name="list27" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="call1" name="first"/>
+  <reference target="list14" name="second"/>
+ </component>
+ <component x="110" y="270" name="list28" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="number20" name="first"/>
+  <reference target="transform2" name="second"/>
+ </component>
+ <component x="670" y="250" name="list29" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="number24" name="first"/>
+  <reference target="transform3" name="second"/>
+ </component>
+ <component x="80" y="140" name="map1" title="map" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
+  <service name="map"/>
+  <reference target="name1" name="item"/>
+  <reference target="list11" name="transform"/>
+  <reference target="range1" name="list"/>
  </component>
- <component x="550" y="150" name="multiply2" title="*" color="magenta1">
-  <implementation.python script="nuvem/multiply.py"/>
-  <service name="multiply">
-   <documentation>*</documentation>
-  </service>
-  <reference target="pi1" name="value1"/>
-  <reference target="divide1" name="value2"/>
+ <component x="110" y="140" name="name1" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>i</property>
  </component>
- <component x="500" y="130" name="multiply3" title="*" color="magenta1">
-  <implementation.python script="nuvem/multiply.py"/>
-  <service name="multiply">
-   <documentation>*</documentation>
-  </service>
-  <reference target="number8" name="value1"/>
-  <reference target="valueof2" name="value2"/>
+ <component x="780" y="330" name="name10" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>score</property>
  </component>
- <component x="870" y="410" name="multiply4" title="*" color="magenta1">
-  <implementation.python script="nuvem/multiply.py"/>
-  <service name="multiply">
-   <documentation>*</documentation>
-  </service>
-  <reference target="number9" name="value1"/>
-  <reference target="valueof1" name="value2"/>
+ <component x="230" y="80" name="name11" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>score</property>
+ </component>
+ <component x="840" y="70" name="name2" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>feather2</property>
+ </component>
+ <component x="850" y="120" name="name3" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>feather3</property>
+ </component>
+ <component x="780" y="220" name="name4" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>bounce</property>
  </component>
- <component x="270" y="120" name="name1" title="" color="orange1">
+ <component x="200" y="160" name="name5" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>t</property>
+  <property>sprite</property>
  </component>
- <component x="480" y="160" name="name2" title="" color="orange1">
+ <component x="400" y="90" name="name6" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>xpos</property>
+  <property>feather1</property>
  </component>
- <component x="490" y="200" name="name3" title="" color="orange1">
+ <component x="390" y="180" name="name7" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>ypos</property>
+  <property>gnu1</property>
  </component>
- <component x="560" y="250" name="name4" title="" color="orange1">
+ <component x="840" y="90" name="name8" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>angle</property>
+  <property>gnu2</property>
+ </component>
+ <component x="840" y="360" name="name9" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>score</property>
+ </component>
+ <component x="770" y="170" name="number1" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3000</property>
+ </component>
+ <component x="380" y="110" name="number10" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>1</property>
  </component>
- <component x="210" y="110" name="number1" title="#" color="orange1">
+ <component x="710" y="240" name="number11" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>200</property>
+ </component>
+ <component x="280" y="230" name="number12" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>10</property>
+ </component>
+ <component x="1120" y="250" name="number13" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component x="200" y="140" name="number2" title="#" color="orange1">
+ <component x="930" y="170" name="number2" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>101</property>
+  <property>100</property>
  </component>
- <component x="730" y="200" name="number3" title="#" color="orange1">
+ <component x="820" y="230" name="number20" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>25</property>
+  <property>0</property>
  </component>
- <component x="510" y="140" name="number4" title="#" color="orange1">
+ <component x="940" y="80" name="number22" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>200</property>
+  <property>0</property>
  </component>
- <component x="530" y="120" name="number5" title="#" color="orange1">
+ <component x="950" y="110" name="number23" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component x="80" y="70" name="number6" title="#" color="orange1">
+ <component x="890" y="220" name="number24" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>30</property>
+  <property>100</property>
  </component>
- <component x="760" y="230" name="number7" title="#" color="orange1">
+ <component x="940" y="250" name="number25" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>200</property>
+  <property>240</property>
  </component>
- <component x="730" y="130" name="number8" title="#" color="orange1">
+ <component x="940" y="280" name="number26" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>4</property>
+  <property>0</property>
  </component>
- <component x="890" y="410" name="number9" title="#" color="orange1">
+ <component x="940" y="310" name="number27" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>20</property>
+  <property>720</property>
  </component>
- <component x="580" y="150" name="pi1" title="pi" color="magenta1">
-  <implementation.python script="nuvem/pi_.py"/>
-  <service name="pi"/>
+ <component x="670" y="210" name="number3" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>-400</property>
  </component>
- <component x="640" y="40" name="pixels1" title="pixels" color="magenta1">
-  <implementation.python script="nuvem/pixels.py"/>
-  <service name="pixels"/>
-  <reference target="multiply3" name="value"/>
+ <component x="920" y="230" name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>360</property>
+ </component>
+ <component x="700" y="130" name="number5" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>50</property>
+ </component>
+ <component x="80" y="150" name="number6" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>4000</property>
  </component>
- <component x="650" y="110" name="pixels2" title="pixels" color="magenta1">
-  <implementation.python script="nuvem/pixels.py"/>
-  <service name="pixels"/>
-  <reference target="subtract1" name="value"/>
+ <component x="150" y="300" name="number7" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
+ </component>
+ <component x="150" y="330" name="number8" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>20</property>
  </component>
- <component x="270" y="160" name="range1" title="range" color="yellow1">
+ <component x="580" y="40" name="number9" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>-200</property>
+ </component>
+ <component x="880" y="260" name="put1" title="put" color="pink1">
+  <implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference target="filedb1" name="collection"/>
+  <reference target="user1" name="id"/>
+  <reference target="add1" name="value"/>
+ </component>
+ <component x="1080" y="210" name="put2" title="put" color="pink1">
+  <implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference target="filedb4" name="collection"/>
+  <reference target="user5" name="id"/>
+  <reference target="number13" name="value"/>
+ </component>
+ <component x="720" y="60" name="random1" title="rand" color="cyan1">
+  <implementation.python script="nuvem/random_.py"/>
+  <service name="random"/>
+  <reference target="list2" name="range"/>
+ </component>
+ <component x="540" y="40" name="random2" title="rand" color="cyan1">
+  <implementation.python script="nuvem/random_.py"/>
+  <service name="random"/>
+  <reference target="number9" name="range"/>
+ </component>
+ <component x="670" y="240" name="random3" title="rand" color="cyan1">
+  <implementation.python script="nuvem/random_.py"/>
+  <service name="random"/>
+  <reference target="number11" name="range"/>
+ </component>
+ <component x="120" y="300" name="range1" title="range" color="yellow1">
   <implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
-  <reference target="number1" name="first"/>
-  <reference target="number2" name="last"/>
+  <reference target="number7" name="first"/>
+  <reference target="number8" name="last"/>
  </component>
- <component x="760" y="260" name="round1" title="round" color="magenta1">
-  <implementation.python script="nuvem/round_.py"/>
-  <service name="round"/>
-  <reference target="number5" name="n"/>
-  <reference target="multiply1" name="x"/>
+ <component x="180" y="10" name="score" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="item3" name="content"/>
  </component>
- <component x="630" y="190" name="sin1" title="sin" color="magenta1">
-  <implementation.python script="nuvem/sin_.py"/>
-  <service name="sin"/>
-  <reference target="multiply2" name="x"/>
+ <component x="360" y="400" name="sprite" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="random1" name="content"/>
  </component>
- <component x="10" y="0" 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"/>
+  <reference target="list24" name="content"/>
  </component>
- <component x="510" y="210" name="subtract1" title="-" color="magenta1">
+ <component x="550" y="190" name="subtract1" title="-" color="cyan1">
   <implementation.python script="nuvem/subtract.py"/>
   <service name="subtract">
    <documentation>-</documentation>
   </service>
-  <reference target="number7" name="value1"/>
-  <reference target="round1" name="value2"/>
- </component>
- <component x="830" y="380" name="text1" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>rotate({0:g}deg)</property>
- </component>
- <component x="410" y="330" name="text2" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>alert('Got it!')</property>
- </component>
- <component x="260" y="0" name="text3" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.apache.org/images/feather-small.gif</property>
- </component>
- <component x="480" y="490" name="text4" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>absolute</property>
- </component>
- <component x="80" y="100" name="true1" title="true" color="orange1">
+  <reference target="number3" name="value1"/>
+  <reference target="random3" name="value2"/>
+ </component>
+ <component x="700" y="160" name="transform1" title="transform" color="white1">
+  <implementation.python script="nuvem/transform.py"/>
+  <service name="transform"/>
+  <reference target="number2" name="x"/>
+  <reference target="subtract1" name="y"/>
+  <reference target="number4" name="d"/>
+ </component>
+ <component x="820" y="250" name="transform2" title="transform" color="white1">
+  <implementation.python script="nuvem/transform.py"/>
+  <service name="transform"/>
+  <reference target="random2" name="x"/>
+  <reference target="number22" name="y"/>
+  <reference target="number23" name="d"/>
+ </component>
+ <component x="890" y="250" name="transform3" title="transform" color="white1">
+  <implementation.python script="nuvem/transform.py"/>
+  <service name="transform"/>
+  <reference target="number25" name="x"/>
+  <reference target="number26" name="y"/>
+  <reference target="number27" name="d"/>
+ </component>
+ <component x="80" y="110" name="true2" title="true" color="orange1">
   <implementation.python script="nuvem/true_.py"/>
   <service name="true"/>
  </component>
- <component x="900" y="440" name="valueof1" title="valueof" color="orange1">
-  <implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>t</property>
- </component>
- <component x="730" y="150" name="valueof2" title="valueof" color="orange1">
-  <implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>t</property>
- </component>
- <component x="730" y="170" name="valueof3" title="valueof" color="orange1">
-  <implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>t</property>
- </component>
- <component x="670" y="20" name="xpos" title="{compname}" color="green1">
-  <implementation.python script="nuvem/service.py"/>
-  <service name="service" visible="false"/>
-  <reference target="pixels1" name="content"/>
- </component>
- <component x="670" y="120" name="ypos" title="{compname}" color="green1">
-  <implementation.python script="nuvem/service.py"/>
-  <service name="service" visible="false"/>
-  <reference target="pixels2" name="content"/>
+ <component x="240" y="130" name="user1" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
+ <component x="390" y="140" name="user2" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
+ <component x="110" y="40" name="user3" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
+ <component x="890" y="390" name="user4" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
+ <component x="1110" y="210" name="user5" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/slice/app.stats b/sca-cpp/trunk/modules/edit/apps/slice/app.stats
index 96700a9085..c7d1996716 100644
--- a/sca-cpp/trunk/modules/edit/apps/slice/app.stats
+++ b/sca-cpp/trunk/modules/edit/apps/slice/app.stats
@@ -1 +1 @@
-((entry (title "Slice") (id "slice")))
\ No newline at end of file
+((entry (title "Slice") (id "slice")))
diff --git a/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html
index 5bd091cd20..b4bc5908f6 100644
--- a/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html
@@ -18,7 +18,51 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="sprite" class="img" style="position: absolute; top: 0px; left: 2px; ">
-  <IMG src="/public/img.png"/>
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Hello</H2>
+ </SPAN>
+ <SPAN id="me" class="h2" style="position: absolute; top: 0px; left: 47px; ">
+  <H2>=me</H2>
+ </SPAN>
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 227px; ">
+  <H2>Score:</H2>
+ </SPAN>
+ <SPAN id="score" class="h2" style="position: absolute; top: 0px; left: 281px; ">
+  <H2>0</H2>
+ </SPAN>
+ <SPAN id="feather2" class="link" style="position: absolute; top: 486px; left: 2px; ">
+  <A href="link:feather">
+   <SPAN>
+    <IMG src="http://www.apache.org/images/feather-small.gif"/>
+   </SPAN>
+  </A>
+ </SPAN>
+ <SPAN id="gnu1" class="link" style="position: absolute; top: 549px; left: 2px; ">
+  <A href="link:gnu">
+   <SPAN>
+    <IMG src="http://www.gnu.org/graphics/lgplv3-147x51.png"/>
+   </SPAN>
+  </A>
+ </SPAN>
+ <SPAN id="feather1" class="link" style="position: absolute; top: 612px; left: 2px; ">
+  <A href="link:feather">
+   <SPAN>
+    <IMG src="http://www.apache.org/images/feather-small.gif"/>
+   </SPAN>
+  </A>
+ </SPAN>
+ <SPAN id="gnu2" class="link" style="position: absolute; top: 666px; left: 2px; ">
+  <A href="link:gnu">
+   <SPAN>
+    <IMG src="http://www.gnu.org/graphics/lgplv3-147x51.png"/>
+   </SPAN>
+  </A>
+ </SPAN>
+ <SPAN id="feather3" class="link" style="position: absolute; top: 729px; left: 2px; ">
+  <A href="link:feather">
+   <SPAN>
+    <IMG src="http://www.apache.org/images/feather-small.gif"/>
+   </SPAN>
+  </A>
  </SPAN>
 </DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.composite b/sca-cpp/trunk/modules/edit/apps/test/app.composite
index 253168ff21..83a9c51e80 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite
@@ -20,41 +20,40 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="comment1" promote="comment1"/>
  <service name="start1" promote="start1"/>
- <component x="10" y="0" name="comment1" title="{propval}" color="white">
+ <component x="10" y="10" name="comment1" title="{propval}" color="white">
   <implementation.python script="nuvem/comment.py"/>
   <service name="comment" visible="false"/>
   <property>Change this example to do what you want</property>
  </component>
- <component name="item1" title="{propval} :" color="orange1">
+ <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="item2" title="{propval} :" color="orange1">
+ <component x="70" y="70" name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="now1" name="value"/>
   <property>time</property>
  </component>
- <component name="list2" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item1" name="item" clonable="true"/>
-  <reference target="item2" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
+ <component x="50" y="40" name="list21" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="item1" name="first"/>
+  <reference target="item2" name="second"/>
  </component>
- <component name="now1" title="now" color="orange1">
+ <component x="120" y="70" name="now1" title="now" color="orange1">
   <implementation.python script="nuvem/now.py"/>
   <service name="now"/>
   <reference name="format"/>
  </component>
- <component x="10" y="40" name="start1" title="start" color="green1">
+ <component x="10" y="50" name="start1" title="start" color="green1">
   <implementation.python script="nuvem/start.py"/>
   <service name="start" visible="false">
    <binding.http uri="start"/>
   </service>
-  <reference target="list2" name="content"/>
+  <reference target="list21" name="content"/>
  </component>
  <component name="user1" title="user" color="green1">
   <implementation.python script="nuvem/user.py"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
index de39e20956..d33d4d6da7 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
@@ -21,7 +21,7 @@
  <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
   <H1>Hello</H1>
  </SPAN>
- <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 56px; ">
+ <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 74px; ">
   <H1>=me</H1>
  </SPAN>
  <SPAN id="page:text" class="text" style="position: absolute; top: 36px; left: 2px; ">
diff --git a/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite b/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite
index 37ff200ff3..5c8ebd59f3 100644
--- a/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite
@@ -20,82 +20,62 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="animation1" promote="animation1"/>
  <service name="start1" promote="start1"/>
- <component x="30" y="90" name="animation1" title="animation" color="green1">
+ <component x="10" y="60" name="animation1" title="animation" color="green1">
   <implementation.python script="nuvem/animation.py"/>
   <service name="animation" visible="false">
    <binding.http uri="animation"/>
   </service>
   <reference target="number4" name="n"/>
   <reference target="number6" name="loop"/>
-  <reference target="foreach1" name="content"/>
+  <reference target="map1" name="content"/>
  </component>
- <component x="100" y="150" name="foreach1" title="foreach" color="yellow1">
-  <implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name1" name="item"/>
-  <reference target="list3" name="transform"/>
-  <reference target="range1" name="list"/>
- </component>
- <component name="format2" x="560" y="290" title="format" color="magenta1">
-  <implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text3" name="pattern"/>
-  <reference target="list1" name="values"/>
- </component>
- <component x="400" y="190" name="htattrs1" title="html attrs:" color="magenta1">
+ <component x="220" y="180" name="htattrs2" title="attrs:" color="white1">
   <implementation.python script="nuvem/htattrs.py"/>
   <service name="htattrs"/>
-  <reference target="htstyle1" name="value"/>
+  <reference target="htstyle2" name="value"/>
  </component>
- <component x="340" y="150" name="htstyle1" title="html style" color="magenta1">
+ <component x="240" y="120" name="htstyle2" title="style" color="white1">
   <implementation.python script="nuvem/htstyle.py"/>
   <service name="htstyle"/>
-  <reference target="list2" name="value"/>
+  <reference target="list21" name="value"/>
  </component>
- <component x="240" y="280" name="item1" title="{propval} :" color="orange1">
+ <component x="160" y="180" name="item1" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="htattrs1" name="value"/>
+  <reference target="htattrs2" name="value"/>
   <property>testdynimg</property>
  </component>
- <component x="80" y="10" name="item2" title="{propval} :" color="orange1">
+ <component x="80" y="10" name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text1" name="value"/>
   <property>testdynimg</property>
  </component>
- <component x="450" y="290" name="item3" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference name="value" target="format2"/>
-  <property>-webkit-transform</property>
- </component>
- <component x="510" y="290" name="item4" title="{propval} :" color="orange1">
+ <component x="320" y="170" name="item4" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="pixels1" name="value"/>
+  <reference target="pixels2" name="value"/>
   <property>width</property>
  </component>
- <component name="list1" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="multiply2" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="list2" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item4" name="item" clonable="true"/>
-  <reference target="item3" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="list3" 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>
- <component x="560" y="150" name="multiply1" title="*" color="magenta1">
+ <component x="120" y="180" name="list11" title="list" color="yellow1">
+  <implementation.python script="nuvem/single.py"/>
+  <service name="list1"/>
+  <reference target="item1" name="value"/>
+ </component>
+ <component x="290" y="180" name="list21" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="item4" name="first"/>
+  <reference target="transform1" name="second"/>
+ </component>
+ <component x="100" y="150" name="map1" title="map" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
+  <service name="map"/>
+  <reference target="name1" name="item"/>
+  <reference target="list11" name="transform"/>
+  <reference target="range1" name="list"/>
+ </component>
+ <component x="400" y="190" name="multiply1" title="*" color="cyan1">
   <implementation.python script="nuvem/multiply.py"/>
   <service name="multiply">
    <documentation>*</documentation>
@@ -103,7 +83,7 @@
   <reference target="valueof1" name="value1"/>
   <reference target="number3" name="value2"/>
  </component>
- <component x="660" y="320" name="multiply2" title="*" color="magenta1">
+ <component x="380" y="290" name="multiply2" title="*" color="cyan1">
   <implementation.python script="nuvem/multiply.py"/>
   <service name="multiply">
    <documentation>*</documentation>
@@ -146,7 +126,7 @@
   <service name="number"/>
   <property>5</property>
  </component>
- <component x="510" y="160" name="pixels1" title="pixels" color="magenta1">
+ <component x="370" y="180" name="pixels2" title="pixels" color="white1">
   <implementation.python script="nuvem/pixels.py"/>
   <service name="pixels"/>
   <reference target="multiply1" name="value"/>
@@ -157,7 +137,7 @@
   <reference target="number1" name="first"/>
   <reference target="number2" name="last"/>
  </component>
- <component x="30" y="20" name="start1" title="start" color="green1">
+ <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"/>
@@ -169,10 +149,12 @@
   <service name="text"/>
   <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property>
  </component>
- <component x="620" y="290" name="text3" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>rotate({0:g}deg)</property>
+ <component x="300" y="240" name="transform1" title="transform" color="white1">
+  <implementation.python script="nuvem/transform.py"/>
+  <service name="transform"/>
+  <reference name="x"/>
+  <reference name="y"/>
+  <reference target="multiply2" name="d"/>
  </component>
  <component x="680" y="260" name="valueof1" title="valueof" color="orange1">
   <implementation.python script="nuvem/valueof.py"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
index e635f964bb..51535b124c 100644
--- a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
@@ -21,31 +21,31 @@
  <service name="delete" promote="delete"/>
  <service name="get" promote="get"/>
  <service name="put" promote="put"/>
- <component x="176" y="11" name="delete" title="delete" color="red1">
+ <component x="150" y="10" name="delete" title="delete" color="pink1">
   <implementation.python script="nuvem/delete.py"/>
   <service name="delete"/>
   <reference target="filedb2" name="collection"/>
   <reference target="list3" name="id"/>
  </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 x="18" y="137" name="get" title="get" color="red1">
+ <component x="20" y="120" name="get" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb3" name="collection"/>
@@ -69,7 +69,7 @@
   <reference target="text4" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component x="13" y="1" name="put" title="put" color="red1">
+ <component x="13" y="1" name="put" title="put" color="pink1">
   <implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb" name="collection"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
index 6389622481..61cd17ec81 100644
--- a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
@@ -28,12 +28,12 @@
  <service name="location" promote="location"/>
  <service name="start" promote="start"/>
  <service name="timer3" promote="timer3"/>
- <component name="Cancel" x="223" y="16" title="{compname}" color="green1">
+ <component x="190" y="10" name="Cancel" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="prop2" name="content"/>
  </component>
- <component name="OK" x="228" y="78" title="{compname}" color="green1">
+ <component x="190" y="60" name="OK" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="list" name="content"/>
@@ -43,40 +43,63 @@
   <service name="text"/>
   <property>abc</property>
  </component>
- <component x="223" y="216" name="call" title="call" color="green1">
+ <component x="190" y="150" name="call" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name2" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component x="16" y="208" name="call2" title="call" color="green1">
+ <component x="20" y="180" name="call2" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component x="222" y="273" name="call3" title="call" color="green1">
+ <component x="190" y="190" name="call3" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="text5" name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component x="14" y="265" name="compabc" title="{compname}" color="green1">
+ <component x="10" y="230" name="compabc" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="abc" name="content"/>
  </component>
- <component x="15" y="316" name="compxyz" title="{compname}" color="green1">
+ <component x="20" y="270" name="compxyz" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="text12" name="content"/>
  </component>
- <component x="12" y="146" name="location" title="location" color="green1">
-  <implementation.python script="nuvem/location.py"/>
-  <service name="location" visible="false">
-   <binding.http uri="location"/>
-  </service>
-  <reference target="item6" name="content"/>
+ <component name="item2" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text4" name="value"/>
+  <property>status</property>
+ </component>
+ <component name="item3" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text" name="value"/>
+  <property>status</property>
+ </component>
+ <component name="item4" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text2" name="value"/>
+  <property>status</property>
+ </component>
+ <component name="item5" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="param" name="value"/>
+  <property>testtext</property>
+ </component>
+ <component name="item6" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="params2" name="value"/>
+  <property>location</property>
  </component>
  <component name="list" title="list" color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
@@ -85,6 +108,13 @@
   <reference target="item4" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
+ <component x="10" y="130" name="location" title="location" color="green1">
+  <implementation.python script="nuvem/location.py"/>
+  <service name="location" visible="false">
+   <binding.http uri="location"/>
+  </service>
+  <reference target="item6" name="content"/>
+ </component>
  <component name="name" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
@@ -111,42 +141,12 @@
   <service name="params"/>
   <property name="query" visible="false"/>
  </component>
- <component name="prop2" title="{propval} :" color="orange1">
+ <component name="prop2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text3" name="value"/>
   <property>status</property>
  </component>
- <component name="item2" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text4" name="value"/>
-  <property>status</property>
- </component>
- <component name="item3" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text" name="value"/>
-  <property>status</property>
- </component>
- <component name="item4" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text2" name="value"/>
-  <property>status</property>
- </component>
- <component name="item5" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="param" name="value"/>
-  <property>testtext</property>
- </component>
- <component name="item6" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="params2" name="value"/>
-  <property>location</property>
- </component>
  <component x="15" y="3" name="start" title="start" color="green1">
   <implementation.python script="nuvem/start.py"/>
   <service name="start" visible="false">
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
index 0e4a96466b..6aabf6d4bb 100644
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
@@ -27,7 +27,7 @@
  <service name="get6" promote="get6"/>
  <service name="item" promote="property"/>
  <service name="parse" promote="parse"/>
- <component x="20" y="300" name="call" title="call" color="green1">
+ <component x="20" y="180" name="call" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name" name="name"/>
@@ -38,38 +38,38 @@
   <service name="first"/>
   <reference target="rest" name="list"/>
  </component>
- <component x="750" y="320" name="format1" title="format" color="magenta1">
+ <component x="750" y="320" name="format1" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text12" name="pattern"/>
   <reference target="list2" name="values"/>
  </component>
- <component x="20" y="0" name="get" title="get" color="green1">
+ <component x="20" y="10" name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text" name="url"/>
  </component>
- <component x="20" y="70" name="get2" title="get" color="green1">
+ <component x="20" y="60" name="get2" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text2" name="url"/>
  </component>
- <component x="20" y="150" name="get3" title="get" color="green1">
+ <component x="20" y="100" name="get3" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component x="370" y="0" name="get4" title="get" color="green1">
+ <component x="310" y="10" name="get4" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text4" name="url"/>
  </component>
- <component x="230" y="0" name="get5" title="get" color="green1">
+ <component x="200" y="10" name="get5" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
- <component x="20" y="220" name="get6" title="get" color="green1">
+ <component x="20" y="140" name="get6" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text6" name="url"/>
@@ -79,19 +79,19 @@
   <service name="get"/>
   <reference target="text7" name="url"/>
  </component>
- <component name="item2" title="{propval} :" color="orange1">
+ <component name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="user" name="value"/>
   <property>user</property>
  </component>
- <component name="item3" title="{propval} :" color="orange1">
+ <component name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="params" name="value"/>
   <property>name</property>
  </component>
- <component name="join" title="join" color="magenta1">
+ <component name="join" title="join" color="cyan1">
   <implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text9" name="separator"/>
@@ -168,13 +168,13 @@
   <service name="params"/>
   <property name="query" visible="false"/>
  </component>
- <component x="410" y="290" name="parse" title="parse" color="magenta1">
+ <component x="340" y="180" name="parse" title="parse" color="cyan1">
   <implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference target="text8" name="regexp"/>
   <reference target="join" name="string"/>
  </component>
- <component x="20" y="370" name="property" title="{propval} :" color="orange1">
+ <component x="20" y="220" name="property" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="list" name="value"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
index 86d4ed3365..659fcbacba 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
@@ -24,32 +24,34 @@
  <service name="exec" promote="exec"/>
  <service name="exec2" promote="exec2"/>
  <service name="if" promote="if"/>
- <service name="random" promote="random"/>
+ <service name="random1" promote="random1"/>
+ <service name="randoms1" promote="randoms1"/>
+ <service name="randoms2" promote="randoms2"/>
  <service name="sin" promote="sin"/>
- <component x="20" y="251" name="cos" title="cos" color="magenta1">
+ <component x="20" y="170" name="cos" title="cos" color="cyan1">
   <implementation.python script="nuvem/cos_.py"/>
   <service name="cos"/>
   <reference target="number7" name="x"/>
  </component>
- <component x="170" y="11" name="eval" title="expr" color="magenta1">
+ <component x="150" y="10" name="eval" title="expr" color="cyan1">
   <implementation.python script="nuvem/eval_.py"/>
   <service name="eval"/>
   <reference target="text3" name="py"/>
   <reference name="ref"/>
  </component>
- <component x="180" y="85" name="eval2" title="expr" color="magenta1">
+ <component x="170" y="70" name="eval2" title="expr" color="cyan1">
   <implementation.python script="nuvem/eval_.py"/>
   <service name="eval"/>
   <reference target="text4" name="py"/>
   <reference target="number3" name="ref"/>
  </component>
- <component x="156" y="267" name="exec" title="script" color="magenta1">
+ <component x="150" y="210" name="exec" title="script" color="cyan1">
   <implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference target="get" name="py"/>
   <reference target="number4" name="ref"/>
  </component>
- <component x="160" y="172" name="exec2" title="script" color="magenta1">
+ <component x="150" y="140" name="exec2" title="script" color="cyan1">
   <implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference target="text6" name="py"/>
@@ -60,13 +62,13 @@
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
- <component name="greater" title="gt" color="magenta1">
+ <component name="greater" title="gt" color="cyan1">
   <implementation.python script="nuvem/greater.py"/>
   <service name="greater"/>
   <reference target="number2" name="value1"/>
   <reference target="number" name="value2"/>
  </component>
- <component x="19" y="9" name="if" title="if" color="magenta1">
+ <component x="19" y="9" name="if" title="if" color="cyan1">
   <implementation.python script="nuvem/if_.py"/>
   <service name="if"/>
   <reference target="greater" name="condition"/>
@@ -78,6 +80,26 @@
   <service name="number"/>
   <property>5</property>
  </component>
+ <component x="390" y="10" name="number1" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3</property>
+ </component>
+ <component x="480" y="90" name="number10" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>5</property>
+ </component>
+ <component x="530" y="120" name="number11" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
+ </component>
+ <component x="520" y="140" name="number12" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>100</property>
+ </component>
  <component name="number2" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
@@ -108,11 +130,40 @@
   <service name="number"/>
   <property>0.5</property>
  </component>
- <component x="24" y="158" name="random" title="rand" color="magenta1">
+ <component x="490" y="0" name="number8" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>5</property>
+ </component>
+ <component x="480" y="40" name="number9" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3</property>
+ </component>
+ <component x="310" y="10" name="random1" title="rand" color="cyan1">
   <implementation.python script="nuvem/random_.py"/>
   <service name="random"/>
- </component>
- <component x="21" y="198" name="sin" title="sin" color="magenta1">
+  <reference target="number1" name="range"/>
+ </component>
+ <component x="390" y="10" name="randoms1" title="rands" color="cyan1">
+  <implementation.python script="nuvem/randoms.py"/>
+  <service name="randoms"/>
+  <reference target="number8" name="n"/>
+  <reference target="number9" name="range"/>
+ </component>
+ <component x="390" y="100" name="randoms2" title="rands" color="cyan1">
+  <implementation.python script="nuvem/randoms.py"/>
+  <service name="randoms"/>
+  <reference target="number10" name="n"/>
+  <reference target="range1" name="range"/>
+ </component>
+ <component x="480" y="120" name="range1" title="range" color="yellow1">
+  <implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference target="number11" name="first"/>
+  <reference target="number12" name="last"/>
+ </component>
+ <component x="20" y="130" name="sin" title="sin" color="cyan1">
   <implementation.python script="nuvem/sin_.py"/>
   <service name="sin"/>
   <reference target="number6" name="x"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
index 2448aca193..493e9a253a 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
@@ -28,7 +28,7 @@
  <service name="weather" promote="weather"/>
  <service name="weather2" promote="weather2"/>
  <service name="yahoosearch" promote="yahoosearch"/>
- <component x="336" y="48" name="bingsearch" title="bing" color="red1">
+ <component x="330" y="10" name="bingsearch" title="bing" color="pink1">
   <implementation.python script="nuvem/bsearch.py"/>
   <service name="bingsearch"/>
   <reference target="text10" name="query"/>
@@ -36,7 +36,7 @@
    <binding.http uri="http://www.bing.com/search"/>
   </reference>
  </component>
- <component x="650" y="20" name="gaddress1" title="address" color="red1">
+ <component x="330" y="50" name="gaddress1" title="address" color="pink1">
   <implementation.python script="nuvem/gaddress.py"/>
   <service name="gaddress"/>
   <reference target="text1" name="address"/>
@@ -44,12 +44,12 @@
    <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
   </reference>
  </component>
- <component x="20" y="300" name="get" title="get" color="green1">
+ <component x="20" y="250" name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component x="650" y="80" name="ggeopos1" title="geo position" color="red1">
+ <component x="490" y="10" name="ggeopos1" title="geo position" color="pink1">
   <implementation.python script="nuvem/ggeopos.py"/>
   <service name="ggeopos"/>
   <reference target="number1" name="latitude"/>
@@ -58,7 +58,7 @@
    <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
   </reference>
  </component>
- <component x="347" y="106" name="googlemap" title="google map" color="red1">
+ <component x="310" y="100" name="googlemap" title="google map" color="pink1">
   <implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list2" name="locations"/>
@@ -66,7 +66,7 @@
    <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component x="15" y="96" name="googlemap2" title="google map" color="red1">
+ <component x="15" y="96" name="googlemap2" title="google map" color="pink1">
   <implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list3" name="locations"/>
@@ -74,7 +74,7 @@
    <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component x="18" y="0" name="googlesearch" title="google" color="red1">
+ <component x="20" y="10" name="googlesearch" title="google" color="pink1">
   <implementation.python script="nuvem/gsearch.py"/>
   <service name="googlesearch"/>
   <reference target="text" name="query"/>
@@ -82,22 +82,22 @@
    <binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
   </reference>
  </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="list" name="value"/>
   <property>A</property>
  </component>
- <component name="item2" title="{propval} :" color="orange1">
+ <component name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="pair4" name="value"/>
+  <reference target="list24" name="value"/>
   <property>A</property>
  </component>
- <component name="item3" title="{propval} :" color="orange1">
+ <component name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
-  <reference target="pair5" name="value"/>
+  <reference target="list25" name="value"/>
   <property>B</property>
  </component>
  <component name="list" title="list" color="yellow1">
@@ -114,6 +114,18 @@
   <reference target="item" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
+ <component name="list24" title="list2" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="text7" name="name"/>
+  <reference target="text5" name="value"/>
+ </component>
+ <component name="list25" title="list2" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="text8" name="name"/>
+  <reference target="text6" name="value"/>
+ </component>
  <component name="list3" title="list" color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
@@ -146,18 +158,6 @@
   <service name="number"/>
   <property>-122.260526</property>
  </component>
- <component name="pair4" title="pair" color="yellow1">
-  <implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="text7" name="name"/>
-  <reference target="text5" name="value"/>
- </component>
- <component name="pair5" title="pair" color="yellow1">
-  <implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="text8" name="name"/>
-  <reference target="text6" name="value"/>
- </component>
  <component name="text" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
@@ -213,7 +213,7 @@
   <service name="text"/>
   <property>apache tuscany</property>
  </component>
- <component x="18" y="49" name="weather" title="weather" color="red1">
+ <component x="18" y="49" name="weather" title="weather" color="pink1">
   <implementation.python script="nuvem/gweather.py"/>
   <service name="weather"/>
   <reference target="number" name="zip"/>
@@ -221,7 +221,7 @@
    <binding.http uri="http://www.google.com/ig/api"/>
   </reference>
  </component>
- <component x="190" y="51" name="weather2" title="weather" color="red1">
+ <component x="190" y="51" name="weather2" title="weather" color="pink1">
   <implementation.python script="nuvem/gweather.py"/>
   <service name="weather"/>
   <reference target="text2" name="zip"/>
@@ -229,7 +229,7 @@
    <binding.http uri="http://www.google.com/ig/api"/>
   </reference>
  </component>
- <component x="204" y="5" name="yahoosearch" title="yahoo" color="red1">
+ <component x="180" y="10" name="yahoosearch" title="yahoo" color="pink1">
   <implementation.python script="nuvem/ysearch.py"/>
   <service name="yahoosearch"/>
   <reference target="text9" name="query"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsms/app.composite b/sca-cpp/trunk/modules/edit/apps/testsms/app.composite
index a5d82a2891..d2abbaae28 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsms/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsms/app.composite
@@ -85,7 +85,7 @@
   <service name="text"/>
   <property>Hello there</property>
  </component>
- <component x="140" y="30" name="twsms1" title="sms" color="blue1">
+ <component x="20" y="10" name="twsms1" title="sms" color="blue1">
   <implementation.python script="nuvem/twsms.py"/>
   <service name="twsms"/>
   <reference target="keychain1" name="sid"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
index b331349b20..28ec9654d8 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
@@ -28,63 +28,63 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component name="format" title="format" color="magenta1">
+ <component name="format" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text7" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <component name="list" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="now" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="list3" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item2" name="item" clonable="true"/>
-  <reference target="item" name="item" clonable="true"/>
-  <reference target="item3" name="item" clonable="true"/>
-  <reference target="item4" name="item" clonable="true"/>
-  <reference target="item5" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="now" title="now" color="orange1">
-  <implementation.python script="nuvem/now.py"/>
-  <service name="now"/>
- </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="twprofile" name="value"/>
   <property>twitprofile</property>
  </component>
- <component name="item2" title="{propval} :" color="orange1">
+ <component name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="fbprofile" name="value"/>
   <property>name</property>
  </component>
- <component name="item3" title="{propval} :" color="orange1">
+ <component name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="twtimeline" name="value"/>
   <property>twittimeline</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="twfriends" name="value"/>
   <property>twitfriends</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="twfollowers" name="value"/>
   <property>twitfollowers</property>
  </component>
- <component x="34" y="286" name="sendgtalk" title="gtalk" color="blue1">
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="now" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="now" title="now" color="orange1">
+  <implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+ </component>
+ <component x="20" y="210" name="sendgtalk" title="gtalk" color="blue1">
   <implementation.cpp path="lib/chat" library="libchat-sender2"/>
   <service name="sendgtalk"/>
   <reference target="text8" name="jid"/>
@@ -92,7 +92,7 @@
   <reference target="text6" name="to"/>
   <reference target="format" name="msg"/>
  </component>
- <component x="33" y="12" 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"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
index 54771ecec8..7021ddb2e9 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
@@ -27,25 +27,37 @@
  <service name="replace" promote="replace"/>
  <service name="split" promote="split"/>
  <service name="uppercase" promote="uppercase"/>
- <component x="19" y="7" name="contains" title="contains" color="magenta1">
+ <component x="19" y="7" name="contains" title="contains" color="cyan1">
   <implementation.python script="nuvem/contains.py"/>
   <service name="contains"/>
   <reference target="text10" name="search"/>
   <reference target="text9" name="string"/>
  </component>
- <component x="176" y="115" name="format" title="format" color="magenta1">
+ <component x="150" y="110" name="format" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text13" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <component x="369" y="141" name="format2" title="format" color="magenta1">
+ <component x="310" y="130" name="format2" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text14" name="pattern"/>
   <reference target="list3" name="values"/>
  </component>
- <component x="361" y="8" name="join" title="join" color="magenta1">
+ <component name="item" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text17" name="value"/>
+  <property>a</property>
+ </component>
+ <component name="item2" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text18" name="value"/>
+  <property>b</property>
+ </component>
+ <component x="300" y="10" name="join" title="join" color="cyan1">
   <implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text6" name="separator"/>
@@ -72,37 +84,25 @@
   <reference target="item2" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component x="20" y="226" name="lowercase" title="lower" color="magenta1">
+ <component x="20" y="226" name="lowercase" title="lower" color="cyan1">
   <implementation.python script="nuvem/lowercase.py"/>
   <service name="lowercase"/>
   <reference target="text2" name="string"/>
  </component>
- <component x="142" y="252" name="parse" title="parse" color="magenta1">
+ <component x="150" y="230" name="parse" title="parse" color="cyan1">
   <implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference target="text19" name="regexp"/>
   <reference target="text20" name="string"/>
  </component>
- <component name="item" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text17" name="value"/>
-  <property>a</property>
- </component>
- <component name="item2" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text18" name="value"/>
-  <property>b</property>
- </component>
- <component x="175" y="6" name="replace" title="replace" color="magenta1">
+ <component x="150" y="10" name="replace" title="replace" color="cyan1">
   <implementation.python script="nuvem/replace.py"/>
   <service name="replace"/>
   <reference target="text4" name="from"/>
   <reference target="text5" name="to"/>
   <reference target="text3" name="string"/>
  </component>
- <component x="23" y="89" name="split" title="split" color="magenta1">
+ <component x="23" y="89" name="split" title="split" color="cyan1">
   <implementation.python script="nuvem/split.py"/>
   <service name="split"/>
   <reference target="text11" name="separator"/>
@@ -208,7 +208,7 @@
   <service name="text"/>
   <property>abcdef</property>
  </component>
- <component x="20" y="172" name="uppercase" title="upper" color="magenta1">
+ <component x="20" y="172" name="uppercase" title="upper" color="cyan1">
   <implementation.python script="nuvem/uppercase.py"/>
   <service name="uppercase"/>
   <reference target="text" name="string"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
index 68f9e36675..f42ba5fa4b 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
@@ -32,36 +32,36 @@
   <service name="email"/>
   <property name="email"/>
  </component>
- <component x="14" y="1" name="host" title="host" color="green1">
+ <component x="20" y="10" name="host" title="host" color="green1">
   <implementation.python script="nuvem/host.py"/>
   <service name="host"/>
   <property name="host"/>
  </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="text4" name="value"/>
   <property>parmx</property>
  </component>
- <component name="item2" title="{propval} :" color="orange1">
+ <component name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text5" name="value"/>
   <property>parmy</property>
  </component>
- <component name="item3" title="{propval} :" color="orange1">
+ <component name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="number" name="value"/>
   <property>parmn</property>
  </component>
- <component x="330" y="60" name="keychain1" title="keychain" color="green1">
+ <component x="260" y="50" name="keychain1" title="keychain" color="green1">
   <implementation.python script="nuvem/keychain.py"/>
   <service name="keychain"/>
   <reference target="text1" name="name"/>
   <reference name="account" target="Accounts" visible="false"/>
  </component>
- <component x="330" y="10" name="keychain2" title="keychain" color="green1">
+ <component x="260" y="10" name="keychain2" title="keychain" color="green1">
   <implementation.python script="nuvem/keychain.py"/>
   <service name="keychain"/>
   <reference target="name1" name="name"/>
@@ -132,7 +132,7 @@
   <service name="text"/>
   <property>yy</property>
  </component>
- <component x="120" y="10" name="url" title="url" color="green1">
+ <component x="90" y="10" name="url" title="url" color="green1">
   <implementation.python script="nuvem/url.py"/>
   <service name="url"/>
   <reference target="text" name="address"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
index 172fbb90d9..4ee8a0a619 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
@@ -34,7 +34,7 @@
  <service name="true" promote="true"/>
  <service name="values" promote="values"/>
  <service name="values2" promote="values2"/>
- <component name="add" title="+" color="magenta1">
+ <component name="add" title="+" color="cyan1">
   <implementation.python script="nuvem/add.py"/>
   <service name="add">
    <documentation>+</documentation>
@@ -50,23 +50,106 @@
   <implementation.python script="nuvem/false_.py"/>
   <service name="false"/>
  </component>
- <component x="121" y="26" name="first" title="first" color="yellow1">
+ <component x="110" y="10" name="first" title="first" color="yellow1">
   <implementation.python script="nuvem/first.py"/>
   <service name="first"/>
   <reference target="list7" name="list"/>
  </component>
- <component name="foreach" title="foreach" color="yellow1">
-  <implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name2" name="item"/>
-  <reference target="multiply" name="transform"/>
-  <reference target="reverse" name="list"/>
+ <component name="item" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text3" name="value"/>
+  <property>a</property>
+ </component>
+ <component name="item10" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="list6" name="value"/>
+  <property>a</property>
+ </component>
+ <component name="item11" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text7" name="value"/>
+  <property>entry</property>
+ </component>
+ <component name="item12" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="list10" name="value"/>
+  <property>entry</property>
  </component>
- <component x="123" y="147" name="itemnb" title="item #" color="yellow1">
+ <component name="item13" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text9" name="value"/>
+  <property>test</property>
+ </component>
+ <component name="item14" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text10" name="value"/>
+  <property>d</property>
+ </component>
+ <component name="item15" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text11" name="value"/>
+  <property>x</property>
+ </component>
+ <component name="item2" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text4" name="value"/>
+  <property>d</property>
+ </component>
+ <component name="item3" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text5" name="value"/>
+  <property>ccc</property>
+ </component>
+ <component name="item4" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text2" name="value"/>
+  <property>b</property>
+ </component>
+ <component name="item5" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text8" name="value"/>
+  <property>c</property>
+ </component>
+ <component name="item6" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="number11" name="value"/>
+  <property>c</property>
+ </component>
+ <component name="item7" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text6" name="value"/>
+  <property>b</property>
+ </component>
+ <component name="item8" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="list4" name="value"/>
+  <property>a</property>
+ </component>
+ <component name="item9" title="{propval}:" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="list5" name="value"/>
+  <property>x</property>
+ </component>
+ <component x="110" y="100" name="itemnb" title="item #" color="yellow1">
   <implementation.python script="nuvem/itemnb.py"/>
   <service name="itemnb"/>
   <reference target="number8" name="index"/>
-  <reference target="foreach" name="list"/>
+  <reference target="map" name="list"/>
  </component>
  <component name="list" title="list" color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
@@ -124,13 +207,13 @@
   <reference target="number3" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component x="430" y="269" name="list8" title="list" color="yellow1">
+ <component x="357" y="208" name="list8" title="list" color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="item11" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component x="407" y="354" name="list9" title="list" color="yellow1">
+ <component x="268" y="279" name="list9" title="list" color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="item12" name="item" clonable="true"/>
@@ -142,7 +225,14 @@
   <reference target="name3" name="name"/>
   <reference target="list2" name="list"/>
  </component>
- <component name="multiply" title="*" color="magenta1">
+ <component name="map" title="map" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
+  <service name="map"/>
+  <reference target="name2" name="item"/>
+  <reference target="multiply" name="transform"/>
+  <reference target="reverse" name="list"/>
+ </component>
+ <component name="multiply" title="*" color="cyan1">
   <implementation.python script="nuvem/multiply.py"/>
   <service name="multiply">
    <documentation>*</documentation>
@@ -254,96 +344,6 @@
   <service name="number"/>
   <property>0</property>
  </component>
- <component name="item" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text3" name="value"/>
-  <property>a</property>
- </component>
- <component name="item10" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="list6" name="value"/>
-  <property>a</property>
- </component>
- <component name="item11" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text7" name="value"/>
-  <property>entry</property>
- </component>
- <component name="item12" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="list10" name="value"/>
-  <property>entry</property>
- </component>
- <component name="item13" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text9" name="value"/>
-  <property>test</property>
- </component>
- <component name="item14" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text10" name="value"/>
-  <property>d</property>
- </component>
- <component name="item15" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text11" name="value"/>
-  <property>x</property>
- </component>
- <component name="item2" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text4" name="value"/>
-  <property>d</property>
- </component>
- <component name="item3" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text5" name="value"/>
-  <property>ccc</property>
- </component>
- <component name="item4" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text2" name="value"/>
-  <property>b</property>
- </component>
- <component name="item5" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text8" name="value"/>
-  <property>c</property>
- </component>
- <component name="item6" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="number11" name="value"/>
-  <property>c</property>
- </component>
- <component name="item7" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text6" name="value"/>
-  <property>b</property>
- </component>
- <component name="item8" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="list4" name="value"/>
-  <property>a</property>
- </component>
- <component name="item9" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="list5" name="value"/>
-  <property>x</property>
- </component>
  <component name="range" title="range" color="yellow1">
   <implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
@@ -362,7 +362,7 @@
   <reference target="number12" name="first"/>
   <reference target="number13" name="last"/>
  </component>
- <component x="437" y="24" name="reduce2" title="reduce" color="yellow1">
+ <component x="360" y="10" name="reduce2" title="reduce" color="yellow1">
   <implementation.python script="nuvem/reduce_.py"/>
   <service name="reduce"/>
   <reference target="name6" name="item"/>
@@ -371,7 +371,7 @@
   <reference target="number14" name="init"/>
   <reference target="range2" name="list"/>
  </component>
- <component x="290" y="18" name="rest" title="rest" color="yellow1">
+ <component x="240" y="10" name="rest" title="rest" color="yellow1">
   <implementation.python script="nuvem/rest.py"/>
   <service name="rest"/>
   <reference target="list" name="list"/>
@@ -381,18 +381,18 @@
   <service name="reverse"/>
   <reference target="range" name="list"/>
  </component>
+ <component x="830" y="170" name="second" title="second" color="yellow1">
+  <implementation.python script="nuvem/second.py"/>
+  <service name="second"/>
+  <reference target="item15" name="list"/>
+ </component>
  <component name="select" title="select" color="yellow1">
   <implementation.python script="nuvem/select.py"/>
   <service name="select"/>
   <reference target="name8" name="path"/>
   <reference target="list3" name="list"/>
  </component>
- <component x="1026" y="233" name="second" title="second" color="yellow1">
-  <implementation.python script="nuvem/second.py"/>
-  <service name="second"/>
-  <reference target="item15" name="list"/>
- </component>
- <component x="223" y="368" name="shuffle" title="shuffle" color="yellow1">
+ <component x="110" y="290" name="shuffle" title="shuffle" color="yellow1">
   <implementation.python script="nuvem/shuffle_.py"/>
   <service name="shuffle"/>
   <reference target="range3" name="list"/>
@@ -478,12 +478,12 @@
   <service name="valueof"/>
   <property>i</property>
  </component>
- <component x="1020" y="31" name="values" title="values" color="yellow1">
+ <component x="830" y="10" name="values" title="values" color="yellow1">
   <implementation.python script="nuvem/values.py"/>
   <service name="values"/>
   <reference target="lookup" name="list"/>
  </component>
- <component x="639" y="12" name="values2" title="values" color="yellow1">
+ <component x="530" y="10" name="values2" title="values" color="yellow1">
   <implementation.python script="nuvem/values.py"/>
   <service name="values"/>
   <reference target="select" name="list"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
index 32db9dd428..1cb1aee017 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
@@ -19,84 +19,84 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component x="170" y="330" name="htattrs1" title="html attrs:" color="magenta1">
+ <component x="170" y="330" name="htattrs1" title="html attrs:" color="cyan1">
   <implementation.python script="nuvem/htattrs.py"/>
   <service name="htattrs"/>
   <reference target="list2" 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="text9" name="value"/>
   <property>testpath2</property>
  </component>
- <component x="100" y="340" name="item1" title="{propval} :" color="orange1">
+ <component x="100" y="340" name="item1" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htattrs1" name="value"/>
   <property>testattrs</property>
  </component>
- <component name="item10" title="{propval} :" color="orange1">
+ <component name="item10" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text" name="value"/>
   <property>testh1</property>
  </component>
- <component x="270" y="370" name="item11" title="{propval} :" color="orange1">
+ <component x="270" y="370" name="item11" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text10" name="value"/>
   <property>onclick</property>
  </component>
- <component x="280" y="330" name="item12" title="{propval} :" color="orange1">
+ <component x="280" y="330" name="item12" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text1" name="value"/>
   <property>value</property>
  </component>
- <component name="item2" title="{propval} :" color="orange1">
+ <component name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="item" name="value"/>
   <property>testpath1</property>
  </component>
- <component name="item3" title="{propval} :" color="orange1">
+ <component name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text6" name="value"/>
   <property>testimg</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="text8" name="value"/>
   <property>testtext</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="text4" name="value"/>
   <property>testlink</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="text5" name="value"/>
   <property>testcheckbox</property>
  </component>
- <component name="item7" title="{propval} :" color="orange1">
+ <component name="item7" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text3" name="value"/>
   <property>testentry</property>
  </component>
- <component name="item8" title="{propval} :" color="orange1">
+ <component name="item8" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text2" name="value"/>
   <property>testbutton</property>
  </component>
- <component name="item9" title="{propval} :" color="orange1">
+ <component name="item9" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text7" name="value"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
index 45a4bdb153..f387e876ed 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
@@ -19,49 +19,49 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component x="100" y="310" name="item" title="{propval} :" color="orange1">
+ <component x="100" y="310" name="item" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text5" name="value"/>
   <property>testframe</property>
  </component>
- <component x="100" y="290" name="item1" title="{propval} :" color="orange1">
+ <component x="100" y="290" name="item1" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text1" name="value"/>
   <property>testselect</property>
  </component>
- <component name="item2" title="{propval} :" color="orange1">
+ <component name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="list3" name="value"/>
   <property>testlink</property>
  </component>
- <component name="item3" title="{propval} :" color="orange1">
+ <component name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text2" name="value"/>
   <property>testhtml</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="text" name="value"/>
   <property>testlist1</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="list4" name="value"/>
   <property>testlist2</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="number3" name="value"/>
   <property>a</property>
  </component>
- <component name="item7" title="{propval} :" color="orange1">
+ <component name="item7" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="number4" name="value"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite
index eb5bbc2439..e367b69a9c 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite
@@ -19,96 +19,96 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component x="260" y="220" name="htattrs1" title="html attrs:" color="magenta1">
+ <component x="260" y="220" name="htattrs1" title="html attrs:" color="cyan1">
   <implementation.python script="nuvem/htattrs.py"/>
   <service name="htattrs"/>
   <reference target="list1" name="value"/>
  </component>
- <component x="190" y="80" name="htbutton1" title="html button" color="magenta1">
+ <component x="190" y="80" name="htbutton1" title="html button" color="cyan1">
   <implementation.python script="nuvem/htbutton.py"/>
   <service name="htbutton"/>
   <reference target="text8" name="value"/>
  </component>
- <component x="210" y="180" name="htcheck1" title="html checkbox" color="magenta1">
+ <component x="210" y="180" name="htcheck1" title="html checkbox" color="cyan1">
   <implementation.python script="nuvem/htcheck.py"/>
   <service name="htcheck"/>
   <reference target="text9" name="value"/>
  </component>
- <component x="180" y="10" name="htimg1" title="html img" color="magenta1">
+ <component x="180" y="10" name="htimg1" title="html img" color="cyan1">
   <implementation.python script="nuvem/htimg.py"/>
   <service name="htimg"/>
   <reference target="text1" name="value"/>
  </component>
- <component x="190" y="230" name="htimg2" title="html img" color="magenta1">
+ <component x="190" y="230" name="htimg2" title="html img" color="cyan1">
   <implementation.python script="nuvem/htimg.py"/>
   <service name="htimg"/>
   <reference target="htattrs1" name="value"/>
  </component>
- <component x="180" y="50" name="htlink1" title="html link" color="magenta1">
+ <component x="180" y="50" name="htlink1" title="html link" color="cyan1">
   <implementation.python script="nuvem/htlink.py"/>
   <service name="htlink"/>
-  <reference target="pair1" name="value"/>
+  <reference target="list21" name="value"/>
  </component>
- <component x="400" y="330" name="htstyle1" title="html style" color="magenta1">
+ <component x="400" y="330" name="htstyle1" title="html style" color="cyan1">
   <implementation.python script="nuvem/htstyle.py"/>
   <service name="htstyle"/>
   <reference target="list2" name="value"/>
  </component>
- <component x="100" y="10" name="item1" title="{propval} :" color="orange1">
+ <component x="100" y="10" name="item1" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htimg1" name="value"/>
   <property>testdynimg</property>
  </component>
- <component x="100" y="170" name="item10" title="{propval} :" color="orange1">
+ <component x="100" y="170" name="item10" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htcheck1" name="value"/>
   <property>testdyncheckbox</property>
  </component>
- <component x="110" y="230" name="item2" title="{propval} :" color="orange1">
+ <component x="110" y="230" name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htimg2" name="value"/>
   <property>teststyledimg</property>
  </component>
- <component x="400" y="300" name="item3" title="{propval} :" color="orange1">
+ <component x="400" y="300" name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text3" name="value"/>
   <property>onclick</property>
  </component>
- <component x="510" y="290" name="item4" title="{propval} :" color="orange1">
+ <component x="510" y="290" name="item4" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text4" name="value"/>
   <property>width</property>
  </component>
- <component x="510" y="320" name="item5" title="{propval} :" color="orange1">
+ <component x="510" y="320" name="item5" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text5" name="value"/>
   <property>height</property>
  </component>
- <component x="400" y="220" name="item6" title="{propval} :" color="orange1">
+ <component x="400" y="220" name="item6" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text10" name="value"/>
   <property>id</property>
  </component>
- <component x="400" y="260" name="item7" title="{propval} :" color="orange1">
+ <component x="400" y="260" name="item7" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text2" name="value"/>
   <property>src</property>
  </component>
- <component x="90" y="50" name="item8" title="{propval} :" color="orange1">
+ <component x="90" y="50" name="item8" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htlink1" name="value"/>
   <property>testdynlink</property>
  </component>
- <component x="90" y="120" name="item9" title="{propval} :" color="orange1">
+ <component x="90" y="120" name="item9" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htbutton1" name="value"/>
@@ -140,9 +140,9 @@
   <reference target="item5" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component x="240" y="50" name="pair1" title="pair" color="yellow1">
+ <component x="240" y="50" name="list21" title="list2" color="yellow1">
   <implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
+  <service name="list2"/>
   <reference target="text6" name="name"/>
   <reference target="text7" name="value"/>
  </component>
diff --git a/sca-cpp/trunk/modules/edit/apps/twsms/app.composite b/sca-cpp/trunk/modules/edit/apps/twsms/app.composite
index 45914449e7..66523f4754 100644
--- a/sca-cpp/trunk/modules/edit/apps/twsms/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/twsms/app.composite
@@ -20,42 +20,37 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="item" promote="property"/>
  <service name="send" promote="send"/>
- <component x="750" y="320" name="format1" title="format" color="magenta1">
+ <component x="280" y="260" name="format2" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text12" name="pattern"/>
-  <reference target="list2" name="values"/>
+  <reference target="list31" name="values"/>
  </component>
- <component x="120" y="10" name="format2" title="format" color="magenta1">
+ <component x="100" y="10" name="format4" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text1" name="pattern"/>
-  <reference target="list1" name="values"/>
- </component>
- <component x="530" y="90" name="format3" title="format" color="magenta1">
-  <implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text2" name="pattern"/>
-  <reference target="list5" name="values"/>
- </component>
- <component x="630" y="190" name="host1" title="host" color="green1">
-  <implementation.python script="nuvem/host.py"/>
-  <service name="host"/>
-  <property name="host" visible="false"/>
- </component>
- <component x="520" y="80" name="item1" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="format3" name="value"/>
-  <property>sampleurl1</property>
- </component>
- <component x="520" y="180" name="item2" title="{propval} :" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="text3" name="value"/>
-  <property>sampleurl2</property>
- </component>
- <component name="list1" title="list" color="yellow1">
+  <reference target="list6" name="values"/>
+ </component>
+ <component x="180" y="330" name="list11" title="list" color="yellow1">
+  <implementation.python script="nuvem/single.py"/>
+  <service name="list1"/>
+  <reference target="format2" name="value"/>
+ </component>
+ <component x="110" y="180" name="list21" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference target="text15" name="first"/>
+  <reference target="list11" name="second"/>
+ </component>
+ <component x="410" y="310" name="list31" title="list" color="yellow1">
+  <implementation.python script="nuvem/triple.py"/>
+  <service name="list3"/>
+  <reference target="param4" name="first"/>
+  <reference target="param5" name="second"/>
+  <reference target="param6" name="third"/>
+ </component>
+ <component name="list6" title="list.." color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="param1" name="item" clonable="true"/>
@@ -64,64 +59,37 @@
   <reference target="text10" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component name="list2" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="param4" name="item" clonable="true"/>
-  <reference target="param5" name="item" clonable="true"/>
-  <reference target="param6" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="list3" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text15" name="item" clonable="true"/>
-  <reference target="list4" 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="format1" 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="host1" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component x="160" y="60" name="param1" title="?param" color="green1">
+ <component x="480" y="200" name="param1" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>sid</property>
   <property name="query" visible="false"/>
  </component>
- <component x="530" y="100" name="param2" title="?param" color="green1">
+ <component x="480" y="250" name="param2" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>sid</property>
   <property name="query" visible="false"/>
  </component>
- <component x="530" y="70" name="param3" title="?param" color="green1">
+ <component x="490" y="220" name="param3" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>token</property>
   <property name="query" visible="false"/>
  </component>
- <component x="250" y="240" name="param4" title="?param" color="green1">
+ <component x="430" y="310" name="param4" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>from</property>
   <property name="query" visible="false"/>
  </component>
- <component x="260" y="270" name="param5" title="?param" color="green1">
+ <component x="430" y="330" name="param5" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>to</property>
   <property name="query" visible="false"/>
  </component>
- <component x="260" y="300" name="param6" title="?param" color="green1">
+ <component x="440" y="370" name="param6" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>msg</property>
@@ -130,42 +98,32 @@
  <component x="80" y="10" name="post1" title="post" color="green1">
   <implementation.cpp path="lib/http" library="libhttppost"/>
   <service name="post"/>
-  <reference target="format2" name="url"/>
-  <reference target="list3" name="content"/>
+  <reference target="format4" name="url"/>
+  <reference target="list21" name="content"/>
  </component>
- <component x="30" y="10" name="send" title="{compname}" color="green1">
+ <component x="10" y="10" name="send" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference target="post1" name="content"/>
  </component>
- <component x="450" y="300" name="text1" title=" '{propval}'" color="orange1">
+ <component x="430" y="80" name="text1" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>https://{0}:{1}@api.twilio.com/2010-04-01/Accounts/{2}/SMS/Messages</property>
  </component>
- <component x="540" y="130" name="text10" title=" '{propval}'" color="orange1">
+ <component x="490" y="270" name="text10" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>SMS/Messages</property>
  </component>
- <component x="550" y="450" name="text12" title=" '{propval}'" color="orange1">
+ <component x="410" y="280" name="text12" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>From={0}&amp;To={1}&amp;Body={2}</property>
  </component>
- <component x="710" y="290" name="text15" title=" '{propval}'" color="orange1">
+ <component x="180" y="300" name="text15" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>application/x-www-form-urlencoded</property>
  </component>
- <component x="590" y="100" name="text2" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://{0}/c/send?sid=...&amp;</property>
- </component>
- <component x="600" y="180" name="text3" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>token=...&amp;from=...&amp;to=...&amp;msg=...</property>
- </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite b/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite
index 6785c0477f..75cbf497b6 100644
--- a/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite
@@ -1,45 +1,103 @@
 <?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="palette" targetNamespace="http://palette">
+ <service name="frames" promote="frames"/>
  <service name="htattrs" promote="htattrs"/>
  <service name="htbutton" promote="htbutton"/>
  <service name="htcheck" promote="htcheck"/>
  <service name="htimg" promote="htimg"/>
+ <service name="htinline" promote="htinline"/>
  <service name="htlink" promote="htlink"/>
  <service name="htstyle" promote="htstyle"/>
+ <service name="left" promote="left"/>
  <service name="pixels" promote="pixels"/>
- <component x="90" y="110" name="htattrs" title="html attrs:" color="magenta1">
+ <service name="top" promote="top"/>
+ <service name="transform" promote="transform"/>
+ <service name="transition" promote="transition"/>
+ <component x="170" y="160" name="frames" title="frames" color="white1">
+  <implementation.python script="nuvem/frames.py"/>
+  <service name="frames"/>
+  <reference name="msec"/>
+  <reference name="loop"/>
+  <reference name="content"/>
+ </component>
+ <component x="140" y="60" name="htattrs" title="attrs:" color="white1">
   <implementation.python script="nuvem/htattrs.py"/>
   <service name="htattrs"/>
   <reference name="value"/>
  </component>
- <component x="180" y="10" name="htbutton" title="html button" color="magenta1">
+ <component x="130" y="10" name="htbutton" title="button" color="white1">
   <implementation.python script="nuvem/htbutton.py"/>
   <service name="htbutton"/>
   <reference name="value"/>
  </component>
- <component x="180" y="60" name="htcheck" title="html checkbox" color="magenta1">
+ <component x="250" y="10" name="htcheck" title="checkbox" color="white1">
   <implementation.python script="nuvem/htcheck.py"/>
   <service name="htcheck"/>
   <reference name="value"/>
  </component>
- <component x="90" y="10" name="htimg" title="html img" color="magenta1">
+ <component x="80" y="10" name="htimg" title="img" color="white1">
   <implementation.python script="nuvem/htimg.py"/>
   <service name="htimg"/>
   <reference name="value"/>
  </component>
- <component x="90" y="60" name="htlink" title="html link" color="magenta1">
+ <component x="80" y="60" name="htinline" title="inline" color="white1">
+  <implementation.python script="nuvem/htinline.py"/>
+  <service name="htinline"/>
+  <reference name="value"/>
+ </component>
+ <component x="200" y="10" name="htlink" title="link" color="white1">
   <implementation.python script="nuvem/htlink.py"/>
   <service name="htlink"/>
   <reference name="value"/>
  </component>
- <component x="190" y="110" name="htstyle" title="html style" color="magenta1">
+ <component x="200" y="60" name="htstyle" title="style" color="white1">
   <implementation.python script="nuvem/htstyle.py"/>
   <service name="htstyle"/>
   <reference name="value"/>
  </component>
- <component x="90" y="160" name="pixels" title="pixels" color="magenta1">
+ <component x="230" y="110" name="left" title="left" color="white1">
+  <implementation.python script="nuvem/left.py"/>
+  <service name="left"/>
+  <reference name="value"/>
+ </component>
+ <component x="260" y="60" name="pixels" title="pixels" color="white1">
   <implementation.python script="nuvem/pixels.py"/>
   <service name="pixels"/>
   <reference name="value"/>
  </component>
+ <component x="170" y="110" name="top" title="top" color="white1">
+  <implementation.python script="nuvem/top.py"/>
+  <service name="top"/>
+  <reference name="value"/>
+ </component>
+ <component x="80" y="160" name="transform" title="transform" color="white1">
+  <implementation.python script="nuvem/transform.py"/>
+  <service name="transform"/>
+  <reference name="x"/>
+  <reference name="y"/>
+  <reference name="d"/>
+ </component>
+ <component x="80" y="110" name="transition" title="transition" color="white1">
+  <implementation.python script="nuvem/transition.py"/>
+  <service name="transition"/>
+  <reference name="value"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
index b2c933eec4..f89cae2c5d 100644
--- a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
@@ -1,4 +1,22 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="animation" promote="animation"/>
  <service name="call" promote="call"/>
@@ -8,7 +26,7 @@
  <service name="start" promote="start"/>
  <service name="stop" promote="stop"/>
  <service name="timer" promote="timer"/>
- <component x="90" y="170" name="animation" title="animation" color="green1">
+ <component x="160" y="60" name="animation" title="animation" color="green1">
   <implementation.python script="nuvem/animation.py"/>
   <service name="animation" visible="false">
    <binding.http uri="animation"/>
@@ -17,20 +35,20 @@
   <reference name="loop"/>
   <reference name="content"/>
  </component>
- <component x="90" y="70" name="call" title="call" color="green1">
+ <component x="190" y="10" name="call" title="call" color="green1">
   <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference name="name"/>
   <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component x="90" y="120" name="location" title="location" color="green1">
+ <component x="80" y="60" name="location" title="location" color="green1">
   <implementation.python script="nuvem/location.py"/>
   <service name="location" visible="false">
    <binding.http uri="location"/>
   </service>
   <reference name="content"/>
  </component>
- <component x="170" y="120" name="schedule" title="schedule" color="green1">
+ <component x="240" y="60" name="schedule" title="schedule" color="green1">
   <implementation.python script="nuvem/schedule.py"/>
   <service name="schedule" visible="false">
    <binding.http uri="schedule"/>
@@ -38,26 +56,26 @@
   <reference name="n"/>
   <reference name="content"/>
  </component>
- <component x="150" y="70" name="service" title="{compname}" color="green1">
+ <component x="240" y="10" name="service" title="{compname}" color="green1">
   <implementation.python script="nuvem/service.py"/>
   <service name="service" visible="false"/>
   <reference name="content"/>
  </component>
- <component x="90" y="10" name="start" title="start" color="green1">
+ <component x="80" 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 name="content"/>
  </component>
- <component x="150" y="10" name="stop" title="stop" color="green1">
+ <component x="130" y="10" name="stop" title="stop" color="green1">
   <implementation.python script="nuvem/stop.py"/>
   <service name="stop" visible="false">
    <binding.http uri="stop"/>
   </service>
   <reference name="content"/>
  </component>
- <component x="210" y="10" name="timer" title="timer" color="green1">
+ <component x="80" y="110" name="timer" title="timer" color="green1">
   <implementation.python script="nuvem/timer.py"/>
   <service name="timer" visible="false">
    <binding.http uri="timer"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
index 42d67af548..cca0b174b8 100644
--- a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
@@ -1,4 +1,22 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="delete" promote="delete"/>
  <service name="filedb" promote="filedb"/>
@@ -7,45 +25,45 @@
  <service name="post" promote="post"/>
  <service name="put" promote="put"/>
  <service name="sqldb" promote="sqldb"/>
- <component x="230" y="60" name="delete" title="delete" color="red1">
+ <component x="270" y="60" name="delete" title="delete" color="pink1">
   <implementation.python script="nuvem/delete.py"/>
   <service name="delete"/>
   <reference name="collection"/>
   <reference name="id"/>
  </component>
- <component x="90" y="10" name="filedb" title="file" color="red1">
+ <component x="80" y="10" 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 x="90" y="60" name="get" title="get" color="red1">
+ <component x="80" y="60" name="get" title="get" color="pink1">
   <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference name="collection"/>
   <reference name="id"/>
  </component>
- <component x="150" y="10" name="nosqldb" title="index **" color="red1">
+ <component x="140" y="10" name="nosqldb" title="index **" color="pink1">
   <implementation.python script="nuvem/nosqldb.py"/>
   <service name="nosqldb"/>
   <reference name="db" target="AppDataNoSQLCache" visible="false"/>
   <property name="host" visible="false"/>
  </component>
- <component x="90" y="130" name="post" title="post" color="red1">
+ <component x="200" y="60" name="post" title="post" color="pink1">
   <implementation.python script="nuvem/post.py"/>
   <service name="post"/>
   <reference name="collection"/>
   <reference name="id"/>
   <reference name="value"/>
  </component>
- <component x="160" y="60" name="put" title="put" color="red1">
+ <component x="140" y="60" name="put" title="put" color="pink1">
   <implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference name="collection"/>
   <reference name="id"/>
   <reference name="value"/>
  </component>
- <component x="240" y="10" name="sqldb" title="sql **" color="red1">
+ <component x="210" y="10" name="sqldb" title="sql **" color="pink1">
   <implementation.python script="nuvem/sqldb.py"/>
   <service name="sqldb"/>
   <reference name="db" target="AppDataSQLCache" visible="false"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
index 6dcfb9eb43..6c8cbaa553 100644
--- a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
@@ -1,4 +1,22 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="delete" promote="delete"/>
  <service name="email" promote="email"/>
@@ -13,73 +31,73 @@
  <service name="put" promote="put"/>
  <service name="url" promote="url"/>
  <service name="user" promote="user"/>
- <component x="90" y="240" name="delete" title="delete" color="green1">
+ <component x="80" y="170" name="delete" title="delete" color="green1">
   <implementation.cpp path="lib/http" library="libhttpdelete"/>
   <service name="delete"/>
   <reference name="url"/>
  </component>
- <component x="250" y="60" name="email" title="email" color="green1">
+ <component x="130" y="60" name="email" title="email" color="green1">
   <implementation.python script="nuvem/email.py"/>
   <service name="email"/>
   <property name="email" visible="false"/>
  </component>
- <component x="90" y="170" name="get" title="get" color="green1">
+ <component x="80" y="120" name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference name="url"/>
  </component>
- <component x="90" y="10" name="host" title="host" color="green1">
+ <component x="80" y="10" name="host" title="host" color="green1">
   <implementation.python script="nuvem/host.py"/>
   <service name="host"/>
   <property name="host" visible="false"/>
  </component>
- <component x="90" y="110" name="keychain" title="keychain" color="green1">
+ <component x="190" y="60" name="keychain" title="keychain" color="green1">
   <implementation.python script="nuvem/keychain.py"/>
   <service name="keychain"/>
   <reference name="name"/>
   <reference name="account" target="Accounts" visible="false"/>
  </component>
- <component x="90" y="60" name="param" title="?param" color="green1">
+ <component x="250" y="10" name="param" title="?param" color="green1">
   <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>x</property>
   <property name="query" visible="false"/>
  </component>
- <component x="230" y="10" name="params" title="?params" color="green1">
+ <component x="180" y="10" name="params" title="?params" color="green1">
   <implementation.python script="nuvem/params.py"/>
   <service name="params"/>
   <property name="query" visible="false"/>
  </component>
- <component x="170" y="240" name="patch" title="patch" color="green1">
+ <component x="260" y="120" name="patch" title="patch" color="green1">
   <implementation.cpp path="lib/http" library="libhttppatch"/>
   <service name="patch"/>
   <reference name="url"/>
   <reference name="content"/>
  </component>
- <component x="160" y="10" name="path" title="path" color="green1">
+ <component x="130" y="10" name="path" title="path" color="green1">
   <implementation.python script="nuvem/path.py"/>
   <service name="path"/>
   <property name="path" visible="false"/>
  </component>
- <component x="230" y="170" name="post" title="post" color="green1">
+ <component x="200" y="120" name="post" title="post" color="green1">
   <implementation.cpp path="lib/http" library="libhttppost"/>
   <service name="post"/>
   <reference name="url"/>
   <reference name="content"/>
  </component>
- <component x="160" y="170" name="put" title="put" color="green1">
+ <component x="140" y="120" name="put" title="put" color="green1">
   <implementation.cpp path="lib/http" library="libhttpput"/>
   <service name="put"/>
   <reference name="url"/>
   <reference name="content"/>
  </component>
- <component x="190" y="110" name="url" title="url" color="green1">
+ <component x="270" y="60" name="url" title="url" color="green1">
   <implementation.python script="nuvem/url.py"/>
   <service name="url"/>
   <reference name="address"/>
   <reference name="args"/>
  </component>
- <component x="180" y="60" name="user" title="user" color="green1">
+ <component x="80" y="60" name="user" title="user" color="green1">
   <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user" visible="false"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
index 4190398e80..2f4051d7b9 100644
--- a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
@@ -1,4 +1,22 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="append" promote="append"/>
  <service name="empty" promote="empty"/>
@@ -7,91 +25,105 @@
  <service name="itemnb" promote="itemnb"/>
  <service name="last" promote="last"/>
  <service name="list" promote="list"/>
+ <service name="list1" promote="list1"/>
+ <service name="list2" promote="list2"/>
+ <service name="list3" promote="list3"/>
  <service name="lookup" promote="lookup"/>
  <service name="names" promote="names"/>
- <service name="pair" promote="pair"/>
  <service name="range" promote="range"/>
  <service name="rest" promote="rest"/>
  <service name="second" promote="second"/>
  <service name="select" promote="select"/>
  <service name="values" promote="values"/>
- <component x="170" y="70" name="append" title="+" color="yellow1">
+ <component x="140" y="70" name="append" title="+" color="yellow1">
   <implementation.python script="nuvem/append.py"/>
   <service name="append"/>
   <reference name="first"/>
   <reference name="second"/>
  </component>
- <component x="230" y="10" name="empty" title="empty" color="yellow1">
+ <component x="80" y="70" name="empty" title="empty" color="yellow1">
   <implementation.python script="nuvem/empty.py"/>
   <service name="empty"/>
  </component>
- <component x="90" y="140" name="first" title="first" color="yellow1">
+ <component x="80" y="130" name="first" title="first" color="yellow1">
   <implementation.python script="nuvem/first.py"/>
   <service name="first"/>
   <reference name="list"/>
  </component>
- <component x="90" y="70" name="insert" title="insert" color="yellow1">
+ <component x="200" y="70" name="insert" title="insert" color="yellow1">
   <implementation.python script="nuvem/insert.py"/>
   <service name="insert"/>
   <reference name="value"/>
   <reference name="list"/>
  </component>
- <component x="230" y="140" name="itemnb" title="item #" color="yellow1">
+ <component x="80" y="180" name="itemnb" title="item #" color="yellow1">
   <implementation.python script="nuvem/itemnb.py"/>
   <service name="itemnb"/>
   <reference name="index"/>
   <reference name="list"/>
  </component>
- <component x="160" y="190" name="last" title="last" color="yellow1">
+ <component x="200" y="130" name="last" title="last" color="yellow1">
   <implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference name="list"/>
  </component>
- <component x="90" y="13" name="list" title="list" color="yellow1">
+ <component x="80" y="10" name="list" title="list.." color="yellow1">
   <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference name="item" clonable="true"/>
  </component>
- <component x="90" y="240" name="lookup" title="lookup" color="yellow1">
+ <component x="140" y="10" name="list1" title="list" color="yellow1">
+  <implementation.python script="nuvem/single.py"/>
+  <service name="list1"/>
+  <reference name="value"/>
+ </component>
+ <component x="200" y="10" name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="list2"/>
+  <reference name="first"/>
+  <reference name="second"/>
+ </component>
+ <component x="260" y="10" name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/triple.py"/>
+  <service name="list3"/>
+  <reference name="first"/>
+  <reference name="second"/>
+  <reference name="third"/>
+ </component>
+ <component x="160" y="180" name="lookup" title="lookup" color="yellow1">
   <implementation.python script="nuvem/lookup.py"/>
   <service name="lookup"/>
   <reference name="name"/>
   <reference name="list"/>
  </component>
- <component x="90" y="310" name="names" title="names" color="yellow1">
+ <component x="80" y="250" name="names" title="names" color="yellow1">
   <implementation.python script="nuvem/names.py"/>
   <service name="names"/>
   <reference name="list"/>
  </component>
- <component x="160" y="10" name="pair" title="pair" color="yellow1">
-  <implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference name="name"/>
-  <reference name="value"/>
- </component>
- <component x="230" y="70" name="range" title="range" color="yellow1">
+ <component x="240" y="250" name="range" title="range" color="yellow1">
   <implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
   <reference name="first"/>
   <reference name="last"/>
  </component>
- <component x="90" y="190" name="rest" title="rest" color="yellow1">
+ <component x="140" y="130" name="rest" title="rest" color="yellow1">
   <implementation.python script="nuvem/rest.py"/>
   <service name="rest"/>
   <reference name="list"/>
  </component>
- <component x="150" y="140" name="second" title="second" color="yellow1">
+ <component x="250" y="130" name="second" title="second" color="yellow1">
   <implementation.python script="nuvem/second.py"/>
   <service name="second"/>
   <reference name="list"/>
  </component>
- <component x="170" y="240" name="select" title="select" color="yellow1">
+ <component x="240" y="180" name="select" title="select" color="yellow1">
   <implementation.python script="nuvem/select.py"/>
   <service name="select"/>
   <reference name="path"/>
   <reference name="list"/>
  </component>
- <component x="170" y="310" name="values" title="values" color="yellow1">
+ <component x="160" y="250" name="values" title="values" color="yellow1">
   <implementation.python script="nuvem/values.py"/>
   <service name="values"/>
   <reference name="list"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
index 0c5a769567..4d84272fd5 100644
--- a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
@@ -1,4 +1,22 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="and" promote="and"/>
  <service name="equals" promote="equals"/>
@@ -7,43 +25,43 @@
  <service name="lesser" promote="lesser"/>
  <service name="not" promote="not"/>
  <service name="or" promote="or"/>
- <component x="140" y="10" name="and" title="and" color="magenta1">
+ <component x="140" y="10" name="and" title="and" color="green1">
   <implementation.python script="nuvem/and_.py"/>
   <service name="and"/>
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="90" y="100" name="equals" title="=" color="magenta1">
+ <component x="80" y="100" name="equals" title="=" color="green1">
   <implementation.python script="nuvem/equals.py"/>
   <service name="equals"/>
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="210" y="100" name="greater" title="gt" color="magenta1">
+ <component x="200" y="100" name="greater" title="gt" color="green1">
   <implementation.python script="nuvem/greater.py"/>
   <service name="greater"/>
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="90" y="10" name="if" title="if" color="magenta1">
+ <component x="80" y="10" name="if" title="if" color="green1">
   <implementation.python script="nuvem/if_.py"/>
   <service name="if"/>
   <reference name="condition"/>
   <reference name="then"/>
   <reference name="else"/>
  </component>
- <component x="150" y="100" name="lesser" title="lt" color="magenta1">
+ <component x="140" y="100" name="lesser" title="lt" color="green1">
   <implementation.python script="nuvem/lesser.py"/>
   <service name="lesser"/>
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="260" y="10" name="not" title="not" color="magenta1">
+ <component x="260" y="10" name="not" title="not" color="green1">
   <implementation.python script="nuvem/not_.py"/>
   <service name="not"/>
   <reference name="value"/>
  </component>
- <component x="200" y="10" name="or" title="or" color="magenta1">
+ <component x="200" y="10" name="or" title="or" color="green1">
   <implementation.python script="nuvem/or_.py"/>
   <service name="or"/>
   <reference name="value1"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
index 3e86647d1d..7dc4e88f2f 100644
--- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
@@ -1,19 +1,41 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="add" promote="add"/>
+ <service name="ceil" promote="ceil"/>
  <service name="cos" promote="cos"/>
  <service name="distance" promote="distance"/>
  <service name="divide" promote="divide"/>
+ <service name="floor" promote="floor"/>
  <service name="max" promote="max"/>
  <service name="min" promote="min"/>
+ <service name="mod" promote="mod"/>
  <service name="multiply" promote="multiply"/>
  <service name="pi" promote="pi"/>
  <service name="random" promote="random"/>
+ <service name="randoms" promote="randoms"/>
  <service name="round" promote="round"/>
  <service name="sin" promote="sin"/>
  <service name="subtract" promote="subtract"/>
  <service name="sum" promote="sum"/>
- <component x="90" y="10" name="add" title="+" color="magenta1">
+ <component x="80" y="10" name="add" title="+" color="cyan1">
   <implementation.python script="nuvem/add.py"/>
   <service name="add">
    <documentation>+</documentation>
@@ -21,18 +43,23 @@
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="250" y="200" name="cos" title="cos" color="magenta1">
+ <component x="270" y="130" name="ceil" title="ceil" color="cyan1">
+  <implementation.python script="nuvem/ceil_.py"/>
+  <service name="ceil"/>
+  <reference name="x"/>
+ </component>
+ <component x="210" y="190" name="cos" title="cos" color="cyan1">
   <implementation.python script="nuvem/cos_.py"/>
   <service name="cos"/>
   <reference name="x"/>
  </component>
- <component x="90" y="200" name="distance" title="distance **" color="magenta1">
+ <component x="80" y="240" name="distance" title="distance **" color="cyan1">
   <implementation.python script="nuvem/distance.py"/>
   <service name="distance"/>
   <reference name="location1"/>
   <reference name="location2"/>
  </component>
- <component x="270" y="10" name="divide" title="/" color="magenta1">
+ <component x="270" y="10" name="divide" title="/" color="cyan1">
   <implementation.python script="nuvem/divide.py"/>
   <service name="divide">
    <documentation>/</documentation>
@@ -40,17 +67,28 @@
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="160" y="80" name="max" title="max" color="magenta1">
+ <component x="210" y="130" name="floor" title="floor" color="cyan1">
+  <implementation.python script="nuvem/floor_.py"/>
+  <service name="floor"/>
+  <reference name="x"/>
+ </component>
+ <component x="150" y="80" name="max" title="max" color="cyan1">
   <implementation.python script="nuvem/max_.py"/>
   <service name="max"/>
   <reference name="l"/>
  </component>
- <component x="230" y="80" name="min" title="min" color="magenta1">
+ <component x="210" y="80" name="min" title="min" color="cyan1">
   <implementation.python script="nuvem/min_.py"/>
   <service name="min"/>
   <reference name="l"/>
  </component>
- <component x="210" y="10" name="multiply" title="*" color="magenta1">
+ <component x="80" y="130" name="mod" title="mod" color="cyan1">
+  <implementation.python script="nuvem/mod.py"/>
+  <service name="mod"/>
+  <reference name="n"/>
+  <reference name="x"/>
+ </component>
+ <component x="210" y="10" name="multiply" title="*" color="cyan1">
   <implementation.python script="nuvem/multiply.py"/>
   <service name="multiply">
    <documentation>*</documentation>
@@ -58,26 +96,33 @@
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="240" y="130" name="pi" title="pi" color="magenta1">
+ <component x="80" y="190" name="pi" title="pi" color="cyan1">
   <implementation.python script="nuvem/pi_.py"/>
   <service name="pi"/>
  </component>
- <component x="170" y="130" name="random" title="rand" color="magenta1">
+ <component x="170" y="240" name="random" title="rand" color="cyan1">
   <implementation.python script="nuvem/random_.py"/>
   <service name="random"/>
+  <reference name="range"/>
+ </component>
+ <component x="230" y="240" name="randoms" title="rands" color="cyan1">
+  <implementation.python script="nuvem/randoms.py"/>
+  <service name="randoms"/>
+  <reference name="n"/>
+  <reference name="range"/>
  </component>
- <component x="90" y="130" name="round" title="round" color="magenta1">
+ <component x="150" y="130" name="round" title="round" color="cyan1">
   <implementation.python script="nuvem/round_.py"/>
   <service name="round"/>
   <reference name="n"/>
   <reference name="x"/>
  </component>
- <component x="190" y="200" name="sin" title="sin" color="magenta1">
+ <component x="150" y="190" name="sin" title="sin" color="cyan1">
   <implementation.python script="nuvem/sin_.py"/>
   <service name="sin"/>
   <reference name="x"/>
  </component>
- <component x="150" y="10" name="subtract" title="-" color="magenta1">
+ <component x="150" y="10" name="subtract" title="-" color="cyan1">
   <implementation.python script="nuvem/subtract.py"/>
   <service name="subtract">
    <documentation>-</documentation>
@@ -85,7 +130,7 @@
   <reference name="value1"/>
   <reference name="value2"/>
  </component>
- <component x="90" y="80" name="sum" title="sum" color="magenta1">
+ <component x="80" y="80" name="sum" title="sum" color="cyan1">
   <implementation.python script="nuvem/sum_.py"/>
   <service name="sum"/>
   <reference name="l"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
index 315a44b105..2cc03ae365 100644
--- a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
@@ -1,14 +1,32 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="eval" promote="eval"/>
  <service name="exec" promote="exec"/>
- <component x="90" y="10" name="eval" title="expr" color="magenta1">
+ <component x="80" y="10" name="eval" title="expr" color="green1">
   <implementation.python script="nuvem/eval_.py"/>
   <service name="eval"/>
   <reference name="py"/>
   <reference name="ref"/>
  </component>
- <component x="170" y="10" name="exec" title="script" color="magenta1">
+ <component x="150" y="10" name="exec" title="script" color="green1">
   <implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference name="py"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
index eb359ee84f..db58cdcd08 100644
--- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
@@ -1,4 +1,22 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="bsearch" promote="bsearch"/>
  <service name="gaddress" promote="gaddress"/>
@@ -9,7 +27,7 @@
  <service name="gweather" promote="gweather"/>
  <service name="traffic" promote="traffic"/>
  <service name="ysearch" promote="ysearch"/>
- <component x="250" y="10" name="bsearch" title="bing" color="red1">
+ <component x="240" y="10" name="bsearch" title="bing" color="blue1">
   <implementation.python script="nuvem/bsearch.py"/>
   <service name="bsearch"/>
   <reference name="query"/>
@@ -17,7 +35,7 @@
    <binding.http uri="http://www.bing.com/search"/>
   </reference>
  </component>
- <component x="90" y="110" name="gaddress" title="address" color="red1">
+ <component x="140" y="60" name="gaddress" title="address" color="blue1">
   <implementation.python script="nuvem/gaddress.py"/>
   <service name="gaddress"/>
   <reference name="address"/>
@@ -25,7 +43,7 @@
    <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
   </reference>
  </component>
- <component x="180" y="110" name="ggeopos" title="geo position" color="red1">
+ <component x="220" y="60" name="ggeopos" title="geo position" color="blue1">
   <implementation.python script="nuvem/ggeopos.py"/>
   <service name="ggeopos"/>
   <reference name="latitude"/>
@@ -34,7 +52,7 @@
    <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
   </reference>
  </component>
- <component x="90" y="60" name="gimages" title="google images" color="red1">
+ <component x="80" y="120" name="gimages" title="images" color="blue1">
   <implementation.python script="nuvem/gimages.py"/>
   <service name="gimages"/>
   <reference name="query"/>
@@ -42,7 +60,7 @@
    <binding.http uri="https://ajax.googleapis.com/ajax/services/search/images"/>
   </reference>
  </component>
- <component x="210" y="60" name="gmap" title="google map" color="red1">
+ <component x="80" y="60" name="gmap" title="map" color="blue1">
   <implementation.python script="nuvem/gmap.py"/>
   <service name="gmap"/>
   <reference name="locations"/>
@@ -50,7 +68,7 @@
    <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component x="90" y="10" name="gsearch" title="google" color="red1">
+ <component x="80" y="10" name="gsearch" title="google" color="blue1">
   <implementation.python script="nuvem/gsearch.py"/>
   <service name="gsearch"/>
   <reference name="query"/>
@@ -58,7 +76,7 @@
    <binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
   </reference>
  </component>
- <component x="90" y="180" name="gweather" title="weather" color="red1">
+ <component x="150" y="120" name="gweather" title="weather" color="blue1">
   <implementation.python script="nuvem/gweather.py"/>
   <service name="gweather"/>
   <reference name="zip"/>
@@ -66,12 +84,12 @@
    <binding.http uri="http://www.google.com/ig/api"/>
   </reference>
  </component>
- <component x="180" y="180" name="traffic" title="traffic **" color="red1">
+ <component x="230" y="120" name="traffic" title="traffic **" color="blue1">
   <implementation.python script="nuvem/traffic.py"/>
   <service name="traffic"/>
   <reference name="location"/>
  </component>
- <component x="170" y="10" name="ysearch" title="yahoo" color="red1">
+ <component x="160" y="10" name="ysearch" title="yahoo" color="blue1">
   <implementation.python script="nuvem/ysearch.py"/>
   <service name="ysearch"/>
   <reference name="query"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
index d319fc9c45..5e02303857 100644
--- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
@@ -1,4 +1,22 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="bzprofile" promote="bzprofile"/>
  <service name="fbalbums" promote="fbalbums"/>
@@ -11,7 +29,7 @@
  <service name="twfriends" promote="twfriends"/>
  <service name="twprofile" promote="twprofile"/>
  <service name="twtimeline" promote="twtimeline"/>
- <component x="90" y="320" name="bzprofile" title="buzz profile" color="blue1">
+ <component x="80" y="260" name="bzprofile" title="buzz profile" color="blue1">
   <implementation.python script="nuvem/bzprofile.py"/>
   <service name="bzprofile"/>
   <reference name="id"/>
@@ -19,7 +37,7 @@
    <binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
   </reference>
  </component>
- <component x="90" y="230" name="fbalbums" title="facebook albums" color="blue1">
+ <component x="190" y="60" name="fbalbums" title="facebook albums" color="blue1">
   <implementation.python script="nuvem/fbalbums.py"/>
   <service name="fbalbums"/>
   <reference name="id"/>
@@ -27,7 +45,7 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component x="90" y="50" name="fbfriends" title="facebook friends" color="blue1">
+ <component x="190" y="10" name="fbfriends" title="facebook friends" color="blue1">
   <implementation.python script="nuvem/fbfriends.py"/>
   <service name="fbfriends"/>
   <reference name="id"/>
@@ -35,7 +53,7 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component x="90" y="90" name="fbgroups" title="facebook groups" color="blue1">
+ <component x="80" y="60" name="fbgroups" title="facebook groups" color="blue1">
   <implementation.python script="nuvem/fbgroups.py"/>
   <service name="fbgroups"/>
   <reference name="id"/>
@@ -43,7 +61,7 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component x="90" y="10" name="fbprofile" title="facebook profile" color="blue1">
+ <component x="80" y="10" name="fbprofile" title="facebook profile" color="blue1">
   <implementation.python script="nuvem/fbprofile.py"/>
   <service name="fbprofile"/>
   <reference name="id"/>
@@ -51,7 +69,7 @@
    <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component x="90" y="270" name="flkalbum" title="flicker album" color="blue1">
+ <component x="80" y="210" name="flkalbum" title="flicker album" color="blue1">
   <implementation.python script="nuvem/flkalbum.py"/>
   <service name="flkalbum"/>
   <reference name="id"/>
@@ -59,7 +77,7 @@
    <binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
   </reference>
  </component>
- <component x="220" y="230" name="picalbum" title="picasa album" color="blue1">
+ <component x="190" y="210" name="picalbum" title="picasa album" color="blue1">
   <implementation.python script="nuvem/picalbum.py"/>
   <service name="picalbum"/>
   <reference name="id"/>
@@ -67,7 +85,7 @@
    <binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
   </reference>
  </component>
- <component x="90" y="180" name="twfollowers" title="twitter followers" color="blue1">
+ <component x="80" y="160" name="twfollowers" title="twitter followers" color="blue1">
   <implementation.python script="nuvem/twfollowers.py"/>
   <service name="twfollowers"/>
   <reference name="id"/>
@@ -75,7 +93,7 @@
    <binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
   </reference>
  </component>
- <component x="210" y="180" name="twfriends" title="twitter friends" color="blue1">
+ <component x="190" y="160" name="twfriends" title="twitter friends" color="blue1">
   <implementation.python script="nuvem/twfriends.py"/>
   <service name="twfriends"/>
   <reference name="id"/>
@@ -83,7 +101,7 @@
    <binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
   </reference>
  </component>
- <component x="90" y="140" name="twprofile" title="twitter profile" color="blue1">
+ <component x="80" y="110" name="twprofile" title="twitter profile" color="blue1">
   <implementation.python script="nuvem/twprofile.py"/>
   <service name="twprofile"/>
   <reference name="id"/>
@@ -91,7 +109,7 @@
    <binding.http uri="http://api.twitter.com/1/users/show.json"/>
   </reference>
  </component>
- <component x="200" y="140" name="twtimeline" title="twitter timeline" color="blue1">
+ <component x="190" y="110" name="twtimeline" title="twitter timeline" color="blue1">
   <implementation.python script="nuvem/twtimeline.py"/>
   <service name="twtimeline"/>
   <reference name="id"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
index db125c9793..90a48291ca 100644
--- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
@@ -1,17 +1,35 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="sendemail" promote="sendemail"/>
  <service name="sendgtalk" promote="sendgtalk"/>
  <service name="twsms" promote="twsms"/>
  <service name="voicecall" promote="voicecall"/>
- <component x="170" y="10" name="sendemail" title="email **" color="blue1">
+ <component x="150" y="10" name="sendemail" title="email **" color="blue1">
   <implementation.python script="nuvem/sendemail.py"/>
   <service name="sendemail"/>
   <reference name="from"/>
   <reference name="to"/>
   <reference name="msg"/>
  </component>
- <component x="90" y="10" name="sendgtalk" title="gtalk" color="blue1">
+ <component x="80" y="10" name="sendgtalk" title="gtalk" color="blue1">
   <implementation.cpp path="lib/chat" library="libchat-sender2"/>
   <service name="sendgtalk"/>
   <reference name="jid"/>
@@ -19,7 +37,7 @@
   <reference name="to"/>
   <reference name="msg"/>
  </component>
- <component x="90" y="120" name="twsms" title="sms" color="blue1">
+ <component x="230" y="10" name="twsms" title="sms" color="blue1">
   <implementation.python script="nuvem/twsms.py"/>
   <service name="twsms"/>
   <reference name="sid"/>
@@ -29,7 +47,7 @@
   <reference name="msg"/>
   <reference name="s" wiredByImpl="true" visible="false"/>
  </component>
- <component x="170" y="120" name="voicecall" title="voice **" color="blue1">
+ <component x="80" y="120" name="voicecall" title="voice **" color="blue1">
   <implementation.python script="nuvem/voicecall.py"/>
   <service name="voicecall"/>
   <reference name="to"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
index 925766a32f..6b9214f6e4 100644
--- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
@@ -1,4 +1,22 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="contains" promote="contains"/>
  <service name="format" promote="format"/>
@@ -8,49 +26,49 @@
  <service name="replace" promote="replace"/>
  <service name="split" promote="split"/>
  <service name="uppercase" promote="uppercase"/>
- <component x="90" y="10" name="contains" title="contains" color="magenta1">
+ <component x="80" y="10" name="contains" title="contains" color="cyan1">
   <implementation.python script="nuvem/contains.py"/>
   <service name="contains"/>
   <reference name="search"/>
   <reference name="string"/>
  </component>
- <component x="90" y="90" name="format" title="format" color="magenta1">
+ <component x="80" y="90" name="format" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference name="pattern"/>
   <reference name="values"/>
  </component>
- <component x="160" y="160" name="join" title="join" color="magenta1">
+ <component x="280" y="10" name="join" title="join" color="cyan1">
   <implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference name="separator"/>
   <reference name="list"/>
  </component>
- <component x="90" y="230" name="lowercase" title="lower" color="magenta1">
+ <component x="210" y="90" name="lowercase" title="lower" color="cyan1">
   <implementation.python script="nuvem/lowercase.py"/>
   <service name="lowercase"/>
   <reference name="string"/>
  </component>
- <component x="170" y="90" name="parse" title="parse" color="magenta1">
+ <component x="150" y="90" name="parse" title="parse" color="cyan1">
   <implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference name="regexp"/>
   <reference name="string"/>
  </component>
- <component x="180" y="10" name="replace" title="replace" color="magenta1">
+ <component x="150" y="10" name="replace" title="replace" color="cyan1">
   <implementation.python script="nuvem/replace.py"/>
   <service name="replace"/>
   <reference name="from"/>
   <reference name="to"/>
   <reference name="string"/>
  </component>
- <component x="90" y="160" name="split" title="split" color="magenta1">
+ <component x="220" y="10" name="split" title="split" color="cyan1">
   <implementation.python script="nuvem/split.py"/>
   <service name="split"/>
   <reference name="separator"/>
   <reference name="string"/>
  </component>
- <component x="160" y="230" name="uppercase" title="upper" color="magenta1">
+ <component x="270" y="90" name="uppercase" title="upper" color="cyan1">
   <implementation.python script="nuvem/uppercase.py"/>
   <service name="uppercase"/>
   <reference name="string"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
index febefec9a1..566278c44b 100644
--- a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
@@ -1,25 +1,43 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="filter" promote="filter"/>
- <service name="foreach" promote="foreach"/>
+ <service name="map" promote="map"/>
  <service name="reduce" promote="reduce"/>
  <service name="reverse" promote="reverse"/>
  <service name="shuffle" promote="shuffle"/>
- <component x="170" y="10" name="filter" title="filter" color="yellow1">
+ <component x="160" y="10" name="filter" title="filter" color="yellow1">
   <implementation.python script="nuvem/filter_.py"/>
   <service name="filter"/>
   <reference name="item"/>
   <reference name="condition"/>
   <reference name="list"/>
  </component>
- <component x="90" y="10" name="foreach" title="foreach" color="yellow1">
+ <component x="80" y="10" name="map" title="map" color="yellow1">
   <implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
+  <service name="map"/>
   <reference name="item"/>
   <reference name="transform"/>
   <reference name="list"/>
  </component>
- <component x="240" y="10" name="reduce" title="reduce" color="yellow1">
+ <component x="80" y="90" name="reduce" title="reduce" color="yellow1">
   <implementation.python script="nuvem/reduce_.py"/>
   <service name="reduce"/>
   <reference name="item"/>
@@ -28,12 +46,12 @@
   <reference name="init"/>
   <reference name="list"/>
  </component>
- <component x="90" y="120" name="reverse" title="reverse" color="yellow1">
+ <component x="220" y="10" name="reverse" title="reverse" color="yellow1">
   <implementation.python script="nuvem/reverse.py"/>
   <service name="reverse"/>
   <reference name="list"/>
  </component>
- <component x="170" y="120" name="shuffle" title="shuffle" color="yellow1">
+ <component x="160" y="90" name="shuffle" title="shuffle" color="yellow1">
   <implementation.python script="nuvem/shuffle_.py"/>
   <service name="shuffle"/>
   <reference name="list"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
index 8f143e42bf..4cd3a9d14e 100644
--- a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
@@ -1,4 +1,22 @@
 <?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="palette" targetNamespace="http://palette">
  <service name="comment" promote="comment"/>
  <service name="false" promote="false"/>
@@ -10,50 +28,50 @@
  <service name="text" promote="text"/>
  <service name="true" promote="true"/>
  <service name="valueof" promote="valueof"/>
- <component x="160" y="160" name="comment" title="{propval}" color="white">
+ <component x="210" y="110" name="comment" title="{propval}" color="white">
   <implementation.python script="nuvem/comment.py"/>
   <service name="comment" visible="false"/>
   <property>comment</property>
  </component>
- <component x="160" y="110" name="false" title="false" color="orange1">
+ <component x="260" y="10" name="false" title="false" color="orange1">
   <implementation.python script="nuvem/false_.py"/>
   <service name="false"/>
  </component>
- <component x="90" y="60" name="item" title="{propval} :" color="orange1">
+ <component x="80" y="60" name="item" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference name="value"/>
   <property>name</property>
  </component>
- <component x="230" y="10" name="name" title="" color="orange1">
+ <component x="150" y="60" name="name" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>name</property>
  </component>
- <component x="230" y="110" name="nothing" title="nothing" color="orange1">
+ <component x="80" y="110" name="nothing" title="nothing" color="orange1">
   <implementation.python script="nuvem/nothing.py"/>
   <service name="nothing"/>
  </component>
- <component x="90" y="160" name="now" title="now" color="orange1">
+ <component x="150" y="110" name="now" title="now" color="orange1">
   <implementation.python script="nuvem/now.py"/>
   <service name="now"/>
   <reference name="format"/>
  </component>
- <component x="160" y="10" name="number" title="#" color="orange1">
+ <component x="140" y="10" name="number" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>123</property>
  </component>
- <component x="90" y="10" name="text" title=" '{propval}'" color="orange1">
+ <component x="80" y="10" name="text" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>text</property>
  </component>
- <component x="90" y="110" name="true" title="true" color="orange1">
+ <component x="200" y="10" name="true" title="true" color="orange1">
   <implementation.python script="nuvem/true_.py"/>
   <service name="true"/>
  </component>
- <component x="170" y="60" name="valueof" title="valueof" color="orange1">
+ <component x="210" y="60" name="valueof" title="valueof" color="orange1">
   <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>name</property>
diff --git a/sca-cpp/trunk/modules/edit/store/all/store.apps b/sca-cpp/trunk/modules/edit/store/all/store.apps
index bdb1552e46..caf7142403 100644
--- a/sca-cpp/trunk/modules/edit/store/all/store.apps
+++ b/sca-cpp/trunk/modules/edit/store/all/store.apps
@@ -1 +1 @@
-((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test SMS API") (id "testsms")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb")) (entry (title "Test HTML generator components") (id "testwidgets3")) (entry (title "Test animation components") (id "testanimation")))
+((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test SMS API") (id "testsms")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb")) (entry (title "Test HTML generator components") (id "testwidgets3")) (entry (title "Test animation components") (id "testanimation")))
diff --git a/sca-cpp/trunk/modules/edit/store/featured/store.apps b/sca-cpp/trunk/modules/edit/store/featured/store.apps
index 956dffb9eb..18bd47e8dd 100644
--- a/sca-cpp/trunk/modules/edit/store/featured/store.apps
+++ b/sca-cpp/trunk/modules/edit/store/featured/store.apps
@@ -1 +1 @@
-((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")))
+((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")))
diff --git a/sca-cpp/trunk/modules/edit/store/new/store.apps b/sca-cpp/trunk/modules/edit/store/new/store.apps
index 956dffb9eb..18bd47e8dd 100644
--- a/sca-cpp/trunk/modules/edit/store/new/store.apps
+++ b/sca-cpp/trunk/modules/edit/store/new/store.apps
@@ -1 +1 @@
-((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")))
+((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")))
diff --git a/sca-cpp/trunk/modules/edit/store/top/store.apps b/sca-cpp/trunk/modules/edit/store/top/store.apps
index 956dffb9eb..18bd47e8dd 100644
--- a/sca-cpp/trunk/modules/edit/store/top/store.apps
+++ b/sca-cpp/trunk/modules/edit/store/top/store.apps
@@ -1 +1 @@
-((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")))
+((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")))
-- 
cgit v1.2.3