Add a few sample and test apps. Refactor some of the utility components and adjusted apps to use them.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1094208 13f79535-47bb-0310-9956-ffa450edef68
author: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2011-04-17 22:13:58 +0000
committer: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2011-04-17 22:13:58 +0000
commit: 7df272063ba2167d797bda383680bfcf648418f8 (patch)
tree: bf69c23fe6d2ea3a07fccb92fa8d9962660b81ad /sca-cpp
parent: 7779274ac986c038ab2f444fe04bd21051153294 (diff)
56 files changed, 2808 insertions, 1499 deletions
diff --git a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite
index 4a3902e47e..46ada96983 100644
--- a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite
@@ -19,13 +19,13 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://buzzprofile" name="buzzprofile">
  <service name="example" promote="example"/>
- <component t:x="107" t:y="131" name="example" t:title="http get" t:color="green1">
+ <component t:x="107" t:y="131" name="example" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text2" name="url"/>
  </component>
  <service name="profile" promote="profile"/>
- <component t:x="106" t:y="36" name="profile" t:title="http get" t:color="green1">
+ <component t:x="106" t:y="36" name="profile" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="format" name="url"/>
@@ -41,12 +41,12 @@
   <service name="path"/>
   <property name="path" t:visible="false"/>
  </component>
- <component t:x="175" t:y="131" name="text2" t:title="text" t:color="orange1">
+ <component t:x="175" t:y="131" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>https://buzzprofile.sca-store.com:8453/components/profile/jsdelfino</property>
  </component>
- <component t:x="235" t:y="36" name="text" t:title="text" t:color="orange1">
+ <component t:x="235" t:y="36" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
diff --git a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html
new file mode 100644
index 0000000000..e0b04fe70a
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html
@@ -0,0 +1,24 @@
+<?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="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test buzzprofile component</H2>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.composite b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
index 6188773f22..fb03b89d3c 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
@@ -18,20 +18,9 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://me360" name="me360">
- <component t:x="616" t:y="72" name="text" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>100001053301307</property>
- </component>
- <component t:x="395" t:y="292" name="get" t:title="http get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="format" name="url"/>
- </component>
  <component t:x="635" t:y="232" name="list" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text4" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
  <component t:x="574" t:y="204" name="format" t:title="format" t:color="magenta1">
@@ -40,30 +29,15 @@
   <reference target="text3" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <service name="page" promote="page"/>
- <component t:x="131" t:y="16" name="page" t:title="when page opens" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="pair4" name="content"/>
- </component>
- <component t:x="393" t:y="86" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>fbprofile</property>
- </component>
- <component t:x="241" t:y="69" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>me360</property>
- </component>
- <component t:x="451" t:y="116" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>twitprofile</property>
+ <component t:x="453" t:y="45" name="fbprofile" t:title="facebook profile" t:color="blue1">
+  <t:implementation.python script="nuvem/fbprofile.py"/>
+  <service name="fbprofile"/>
+  <reference target="text" name="id"/>
+  <reference name="fb" t:visible="false">
+   <t:binding.http uri="https://graph.facebook.com"/>
+  </reference>
  </component>
- <component t:x="451" t:y="144" name="twprofile" t:title="twitter profile" t:color="blue1">
+ <component t:x="433" t:y="87" name="twprofile" t:title="twitter profile" t:color="blue1">
   <t:implementation.python script="nuvem/twprofile.py"/>
   <service name="twprofile"/>
   <reference target="text2" name="id"/>
@@ -71,64 +45,89 @@
    <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
   </reference>
  </component>
- <component t:x="451" t:y="72" name="fbprofile" t:title="facebook profile" t:color="blue1">
-  <t:implementation.python script="nuvem/fbprofile.py"/>
-  <service name="fbprofile"/>
-  <reference target="text" name="id"/>
-  <reference name="fb" t:visible="false">
-   <t:binding.http uri="https://graph.facebook.com"/>
-  </reference>
- </component>
- <component t:x="451" t:y="188" name="name3" t:title="name" t:color="orange1">
+ <component t:x="491" t:y="108" name="name" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>buzzprofile</property>
- </component>
- <component t:x="392" t:y="44" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="fbprofile" name="value"/>
+  <property>buzz</property>
  </component>
- <component t:x="315" t:y="44" name="list2" t:title="list" t:color="yellow1">
+ <component t:x="242" t:y="23" name="list2" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="256" t:y="16" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name4" name="name"/>
-  <reference target="list2" name="value"/>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="126" t:y="23" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="list2" name="content"/>
  </component>
- <component t:x="392" t:y="116" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="twprofile" name="value"/>
+ <component t:x="224" t:y="222" name="get" t:title="get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="format" name="url"/>
  </component>
- <service name="pair3" promote="pair3"/>
- <component t:x="173" t:y="275" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
-  <reference target="get" name="value"/>
+ <service name="buzz" promote="buzz"/>
+ <component name="buzz" t:x="127" t:y="220" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="get" name="content"/>
  </component>
- <component t:x="549" t:y="144" name="text2" t:title="text" t:color="orange1">
+ <component t:x="276" t:y="220" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>jsdelfino</property>
+  <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
+ </component>
+ <service name="call" promote="call"/>
+ <component t:x="583" t:y="156" name="call" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="306" t:y="111" name="bzprofile" t:title="buzz profile" t:color="blue1">
+  <t:implementation.python script="nuvem/bzprofile.py"/>
+  <service name="bzprofile"/>
+  <reference target="text4" name="id"/>
+  <reference name="bz" t:visible="false">
+   <t:binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
+  </reference>
  </component>
- <component t:x="361" t:y="303" name="text3" t:title="text" t:color="orange1">
+ <component t:x="398" t:y="25" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
+  <property>100001053301307</property>
+ </component>
+ <component t:x="213" t:y="23" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="fbprofile" name="value"/>
+  <property>fbprofile</property>
  </component>
- <component t:x="438" t:y="331" name="text4" t:title="text" t:color="orange1">
+ <component t:x="394" t:y="67" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
+ <component t:x="395" t:y="111" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
+ </component>
+ <component t:x="213" t:y="67" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twprofile" name="value"/>
+  <property>twitprofile</property>
+ </component>
+ <component t:x="213" t:y="111" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="bzprofile" name="value"/>
+  <property>buzzprofile</property>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.html b/sca-cpp/trunk/modules/edit/apps/me360/app.html
index ebc98e5072..31ed5e58bd 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/me360/app.html
@@ -18,41 +18,58 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="section" class="section" style="position: absolute; top: 52px; left: 0px; ">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Me360</H2>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
   <SPAN>Facebook</SPAN>
  </SPAN>
- <SPAN id="fbprofile" class="table" style="position: absolute; top: 93px; left: 1px; ">
-  <TABLE class="datatable">
+ <SPAN id="section" class="section" style="position: absolute; top: 225px; width: 100%; left: 2px; ">
+  <SPAN>Twitter</SPAN>
+ </SPAN>
+ <SPAN id="fbprofile" class="table" style="position: absolute; top: 54px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="twitprofile" class="table" style="position: absolute; top: 292px; left: 2px; ">
-  <TABLE class="datatable">
+ <SPAN id="twitprofile" class="table" style="position: absolute; top: 252px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 253px; left: 1px; ">
-  <SPAN>Twitter</SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 1143px; width: 100%; left: 2px; ">
+  <SPAN>Buzz</SPAN>
  </SPAN>
- <SPAN id="h2" class="h2" style="position: absolute; top: 11px; left: 0px; ">
-  <H2>Me360</H2>
+ <SPAN id="buzzprofile" class="table" style="position: absolute; top: 1170px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>table</TD>
+     <TD>...</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
  </SPAN>
 </DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
index 74af00ee41..d81de55232 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
@@ -18,468 +18,427 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://nearme" name="nearme">
- <service name="location" promote="location"/>
- <component t:x="1" t:y="138" name="location" t:title="on location change" t:color="green1">
-  <t:implementation.python script="nuvem/location.py"/>
-  <service name="location" t:visible="false">
-   <t:binding.http uri="location"/>
-  </service>
-  <reference target="put" name="content"/>
- </component>
- <component t:x="827" t:y="143" name="filedb2" t:title="File database" t:color="green1">
+ <component xmlns="" t:x="811" t:y="384" name="filedb4" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="761" t:y="257" name="filedb3" t:title="File database" t:color="green1">
+ <component xmlns="" t:x="814" t:y="554" name="filedb5" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="779" t:y="386" name="get3" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb4" name="collection"/>
-  <reference target="param4" name="id"/>
+ <component xmlns="" t:x="169" t:y="168" name="user" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="811" t:y="384" name="filedb4" t:title="File database" t:color="green1">
+ <component xmlns="" t:x="792" t:y="284" name="filedb6" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="777" t:y="543" name="get4" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb5" name="collection"/>
-  <reference target="param5" name="id"/>
- </component>
- <component t:x="814" t:y="554" name="filedb5" t:title="File database" t:color="green1">
+ <component xmlns="" t:x="648" t:y="185" name="filedb7" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="773" t:y="193" name="get2" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb3" name="collection"/>
-  <reference target="param3" name="id"/>
- </component>
- <component t:x="720" t:y="585" name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name9" name="name"/>
-  <reference target="get4" name="value"/>
- </component>
- <component t:x="717" t:y="394" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="get3" name="value"/>
- </component>
- <component t:x="721" t:y="201" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name8" name="name"/>
-  <reference target="get2" name="value"/>
- </component>
- <component t:x="314" t:y="147" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>longitude</property>
+ <component xmlns="" t:x="898" t:y="284" name="filedb8" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="311" t:y="222" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>latitude</property>
+ <component xmlns="" t:x="675" t:y="394" name="filedb9" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="865" t:y="408" name="name7" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend2</property>
+ <component t:x="729" t:y="59" name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>/components/map</property>
  </component>
- <component t:x="866" t:y="527" name="name10" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend3</property>
+ <component xmlns="" t:x="387" t:y="32" name="user3" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="654" t:y="72" name="get" t:title="get" t:color="green1">
+ <component xmlns="" t:x="265" t:y="625" name="get4" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb2" name="collection"/>
-  <reference target="user2" name="id"/>
- </component>
- <component t:x="170" t:y="126" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text7" name="item" t:clonable="true"/>
-  <reference target="param2" name="item" t:clonable="true"/>
-  <reference target="param" name="item" t:clonable="true"/>
-  <reference target="now" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="page" promote="page"/>
- <component t:x="0" t:y="45" name="page" t:title="when page opens" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="pair13" name="content"/>
- </component>
- <component t:x="127" t:y="415" name="pair13" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name13" name="name"/>
-  <reference target="user3" name="value"/>
+  <reference target="filedb5" name="collection"/>
+  <reference target="param4" name="id"/>
  </component>
- <component t:x="169" t:y="416" name="name13" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>me</property>
+ <component xmlns="" t:x="268" t:y="540" name="get3" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb4" name="collection"/>
+  <reference target="param3" name="id"/>
  </component>
- <component t:x="169" t:y="144" name="filedb" t:title="File database" t:color="green1">
+ <component t:x="471" t:y="20" name="filedb10" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="162" t:y="77" name="user3" t:title="user" t:color="green1">
+ <component t:x="475" t:y="51" name="user5" t:title="user" t:color="green1">
   <t:implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user" t:visible="false"/>
  </component>
- <component t:x="214" t:y="259" name="param2" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <reference target="name3" name="name"/>
-  <property name="query" t:visible="false"/>
+ <component t:x="513" t:y="1" name="get9" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb10" name="collection"/>
+  <reference target="user5" name="id"/>
+ </component>
+ <component t:x="544" t:y="97" name="get10" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb11" name="collection"/>
+  <reference target="param5" name="id"/>
+ </component>
+ <component t:x="578" t:y="98" name="filedb11" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="215" t:y="296" name="param" t:title="?param" t:color="green1">
+ <component t:x="264" t:y="221" name="param10" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name2" name="name"/>
+  <property>latitude</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="217" t:y="231" name="text7" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>green</property>
- </component>
- <component t:x="216" t:y="329" name="now" t:title="now" t:color="orange1">
-  <t:implementation.python script="nuvem/now.py"/>
-  <service name="now"/>
- </component>
- <component t:x="169" t:y="168" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
- </component>
- <component t:x="796" t:y="196" name="user2" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
- </component>
- <component t:x="796" t:y="298" name="param3" t:title="?param" t:color="green1">
+ <component t:x="338" t:y="564" name="param3" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name4" name="name"/>
+  <property>friend2</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="794" t:y="409" name="param4" t:title="?param" t:color="green1">
+ <component t:x="340" t:y="631" name="param4" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name7" name="name"/>
+  <property>friend3</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="797" t:y="516" name="param5" t:title="?param" t:color="green1">
+ <component t:x="698" t:y="120" name="param5" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name10" name="name"/>
+  <property>friend1</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="130" t:y="138" name="put" t:title="put" t:color="green1">
-  <t:implementation.python script="nuvem/put.py"/>
-  <service name="put"/>
-  <reference target="filedb" name="collection"/>
-  <reference target="user" name="id"/>
-  <reference target="list" name="value"/>
- </component>
- <service name="every" promote="every"/>
- <component t:x="493" t:y="13" name="every" t:title="every n millisec" t:color="green1">
-  <t:implementation.python script="nuvem/every.py"/>
-  <service name="every" t:visible="false">
-   <t:binding.http uri="every"/>
-  </service>
-  <reference target="number" name="n"/>
-  <reference target="list2" name="content"/>
+ <component t:x="652" t:y="43" name="property11" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="get9" name="value"/>
+  <property>x</property>
  </component>
- <service name="map" promote="map"/>
- <component t:x="3" t:y="389" name="map" t:title="on {compname} widget" t:color="green1">
-  <t:implementation.python script="nuvem/widget.py"/>
-  <service name="widget" t:visible="false"/>
-  <reference target="googlemap" name="content"/>
+ <component t:x="652" t:y="115" name="property12" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="get10" name="value"/>
+  <property>1</property>
  </component>
- <component t:x="705" t:y="137" name="pair6" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name11" name="name"/>
-  <reference target="get" name="value"/>
+ <component t:x="653" t:y="193" name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="get3" name="value"/>
+  <property>2</property>
  </component>
- <component t:x="866" t:y="334" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend1</property>
+ <component t:x="655" t:y="261" name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="get4" name="value"/>
+  <property>3</property>
  </component>
- <component t:x="677" t:y="178" name="list5" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="pair6" name="item" t:clonable="true"/>
-  <reference target="pair4" name="item" t:clonable="true"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair5" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="785" t:y="175" name="append" t:title="+" t:color="yellow1">
+  <t:implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference target="params" name="first"/>
+  <reference target="call2" name="second"/>
  </component>
- <component t:x="619" t:y="103" name="params" t:title="?params" t:color="green1">
+ <component xmlns="" t:x="846" t:y="183" name="params" t:title="?params" t:color="green1">
   <t:implementation.python script="nuvem/params.py"/>
   <service name="params"/>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="561" t:y="55" name="name5" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>mapimg</property>
+ <component t:x="745" t:y="153" name="url" t:title="url" t:color="green1">
+  <t:implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference target="text2" name="address"/>
+  <reference target="append" name="args"/>
  </component>
- <component t:x="561" t:y="83" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text" name="pattern"/>
-  <reference target="params" name="values"/>
+ <component xmlns="" t:x="812" t:y="270" name="get6" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb7" name="collection"/>
+  <reference target="user4" name="id"/>
  </component>
- <component t:x="792" t:y="284" name="filedb6" t:title="File database" t:color="green1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+ <component t:x="743" t:y="270" name="last" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get6" name="list"/>
  </component>
- <component t:x="653" t:y="212" name="user4" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component xmlns="" t:x="802" t:y="353" name="get5" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb6" name="collection"/>
+  <reference target="param2" name="id"/>
  </component>
- <component t:x="648" t:y="185" name="filedb7" t:title="File database" t:color="green1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+ <component xmlns="" t:x="802" t:y="423" name="get8" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb9" name="collection"/>
+  <reference target="param6" name="id"/>
+ </component>
+ <component xmlns="" t:x="800" t:y="495" name="get7" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb8" name="collection"/>
+  <reference target="param7" name="id"/>
+ </component>
+ <component t:x="734" t:y="347" name="last2" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get5" name="list"/>
+ </component>
+ <component t:x="733" t:y="387" name="last3" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get8" name="list"/>
+ </component>
+ <component t:x="731" t:y="420" name="last4" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get7" name="list"/>
  </component>
- <component t:x="651" t:y="313" name="param6" t:title="?param" t:color="green1">
+ <component t:x="836" t:y="377" name="param2" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name15" name="name"/>
+  <property>friend1</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="897" t:y="309" name="param7" t:title="?param" t:color="green1">
+ <component t:x="836" t:y="457" name="param6" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name18" name="name"/>
+  <property>friend2</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="898" t:y="284" name="filedb8" t:title="File database" t:color="green1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="675" t:y="394" name="filedb9" t:title="File database" t:color="green1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="676" t:y="419" name="param8" t:title="?param" t:color="green1">
+ <component t:x="836" t:y="537" name="param7" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name16" name="name"/>
+  <property>friend3</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="569" t:y="366" name="pair8" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name14" name="name"/>
-  <reference target="first3" name="value"/>
+ <component xmlns="" t:x="258" t:y="167" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <component t:x="574" t:y="415" name="pair9" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name17" name="name"/>
-  <reference target="first4" name="value"/>
+ <component xmlns="" t:x="185" t:y="167" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text7" name="item" t:clonable="true"/>
+  <reference target="param10" name="item" t:clonable="true"/>
+  <reference target="param" name="item" t:clonable="true"/>
+  <reference target="now" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="729" t:y="311" name="name15" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend1</property>
+ <component t:x="193" t:y="855" name="property7" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last3" name="value"/>
+  <property>time2</property>
+ </component>
+ <component t:x="196" t:y="775" name="property8" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last2" name="value"/>
+  <property>time1</property>
+ </component>
+ <component t:x="198" t:y="1012" name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="url" name="value"/>
+  <property>mapimg</property>
  </component>
- <component t:x="730" t:y="417" name="name16" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend2</property>
+ <component t:x="197" t:y="695" name="property9" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last" name="value"/>
+  <property>mytime</property>
+ </component>
+ <component t:x="195" t:y="658" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="user3" name="value"/>
+  <property>me</property>
+ </component>
+ <component t:x="188" t:y="276" name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last4" name="value"/>
+  <property>time3</property>
  </component>
- <component t:x="730" t:y="531" name="name18" t:title="name" t:color="orange1">
+ <component t:x="528" t:y="412" name="name2" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>friend3</property>
+  <property>getlocs</property>
  </component>
- <component t:x="604" t:y="41" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
-  <reference target="pair7" name="item" t:clonable="true"/>
-  <reference target="pair3" name="item" t:clonable="true"/>
-  <reference target="pair8" name="item" t:clonable="true"/>
-  <reference target="pair9" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="447" t:y="411" name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name2" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="652" t:y="141" name="pair7" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name12" name="name"/>
-  <reference target="first" name="value"/>
+ <component t:x="225" t:y="61" name="call" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="652" t:y="241" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name6" name="name"/>
-  <reference target="first2" name="value"/>
+ <component xmlns="" t:x="181" t:y="63" name="googlemap" t:title="google map" t:color="red1">
+  <t:implementation.python script="nuvem/gmap.py"/>
+  <service name="googlemap"/>
+  <reference target="call" name="locations"/>
+  <reference name="s" t:visible="false">
+   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  </reference>
  </component>
- <component t:x="692" t:y="141" name="name12" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>myloc</property>
+ <service name="map" promote="map"/>
+ <component t:x="129" t:y="599" name="map" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="googlemap" name="content"/>
  </component>
- <component t:x="692" t:y="241" name="name6" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend1loc</property>
+ <component xmlns="" t:x="732" t:y="111" name="put" t:title="put" t:color="red1">
+  <t:implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference target="filedb" name="collection"/>
+  <reference target="user" name="id"/>
+  <reference target="list" name="value"/>
  </component>
- <component t:x="692" t:y="349" name="name14" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend2loc</property>
+ <service name="geolocation" promote="geolocation"/>
+ <component t:x="545" t:y="103" name="geolocation" t:title="location" t:color="green1">
+  <t:implementation.python script="nuvem/geolocation.py"/>
+  <service name="geolocation" t:visible="false">
+   <t:binding.http uri="geolocation"/>
+  </service>
+  <reference target="put" name="content"/>
  </component>
- <component t:x="692" t:y="457" name="name17" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend3loc</property>
+ <component t:x="751" t:y="357" name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property11" name="item" t:clonable="true"/>
+  <reference target="property12" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="272" t:y="489" name="name8" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>1</property>
+ <service name="getlocs" promote="getlocs"/>
+ <component t:x="551" t:y="334" name="getlocs" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list3" name="content"/>
  </component>
- <component t:x="272" t:y="597" name="name" t:title="name" t:color="orange1">
+ <component t:x="290" t:y="5" name="name3" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>2</property>
+  <property>nearme</property>
  </component>
- <component t:x="272" t:y="705" name="name9" t:title="name" t:color="orange1">
+ <component t:x="358" t:y="62" name="name" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>3</property>
+  <property>getlocs</property>
  </component>
- <component t:x="272" t:y="389" name="name11" t:title="name" t:color="orange1">
+ <component t:x="832" t:y="35" name="name4" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>X</property>
+  <property>nearme</property>
  </component>
- <component t:x="66" t:y="389" name="googlemap" t:title="google map" t:color="red1">
-  <t:implementation.python script="nuvem/gmap.py"/>
-  <service name="googlemap"/>
-  <reference target="list5" name="locations"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
-  </reference>
+ <service name="appstart2" promote="appstart2"/>
+ <component t:x="130" t:y="12" name="appstart2" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="call4" name="content"/>
  </component>
- <component t:x="763" t:y="168" name="reverse" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="get6" name="list"/>
+ <component t:x="196" t:y="8" name="call4" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name3" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="965" t:y="221" name="get6" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb7" name="collection"/>
-  <reference target="user4" name="id"/>
+ <component xmlns="" t:x="734" t:y="11" name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>5000</property>
  </component>
- <component t:x="765" t:y="279" name="reverse2" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="get5" name="list"/>
+ <component t:x="729" t:y="42" name="call3" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name4" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="912" t:y="228" name="get5" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb6" name="collection"/>
-  <reference target="param6" name="id"/>
+ <service name="every" promote="every"/>
+ <component t:x="543" t:y="8" name="every" t:title="timer" t:color="green1">
+  <t:implementation.python script="nuvem/every.py"/>
+  <service name="every" t:visible="false">
+   <t:binding.http uri="every"/>
+  </service>
+  <reference target="number" name="n"/>
+  <reference target="call3" name="content"/>
  </component>
- <component t:x="914" t:y="403" name="get7" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb8" name="collection"/>
-  <reference target="param7" name="id"/>
+ <component xmlns="" t:x="514" t:y="128" name="user4" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="767" t:y="526" name="reverse3" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="get7" name="list"/>
+ <component xmlns="" t:x="190" t:y="81" name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="property6" name="item" t:clonable="true"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="693" t:y="165" name="first" t:title="first item" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="reverse" name="list"/>
- </component>
- <component t:x="697" t:y="283" name="first2" t:title="first item" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="reverse2" name="list"/>
- </component>
- <component t:x="698" t:y="407" name="first3" t:title="first item" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="reverse4" name="list"/>
- </component>
- <component t:x="694" t:y="526" name="first4" t:title="first item" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="reverse3" name="list"/>
- </component>
- <component t:x="768" t:y="410" name="reverse4" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="get8" name="list"/>
+ <service name="nearme" promote="nearme"/>
+ <component t:x="128" t:y="70" name="nearme" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list2" name="content"/>
  </component>
- <component t:x="832" t:y="412" name="get8" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb9" name="collection"/>
-  <reference target="param8" name="id"/>
+ <component t:x="863" t:y="102" name="filedb" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="749" t:y="69" name="text" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>/components/map?friend1={friend1}&amp;friend2={friend2}&amp;friend3={friend3}</property>
+ <component t:x="691" t:y="215" name="param" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>longitude</property>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="652" t:y="41" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name5" name="name"/>
-  <reference target="format" name="value"/>
+ <component t:x="691" t:y="243" name="now" t:title="now" t:color="orange1">
+  <t:implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+  <reference target="text" name="format"/>
  </component>
- <component t:x="604" t:y="13" name="number" t:title="number" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>5000</property>
+ <component t:x="736" t:y="243" name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>%a %b %d, %I:%M %p</property>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.html b/sca-cpp/trunk/modules/edit/apps/nearme/app.html
index 32dd393d69..364a46a1c8 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.html
@@ -18,46 +18,37 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="mapimg" class="img" style="position: absolute; top: 268px; left: 2px; ">
-  <IMG src="https://nearme.sca-store.com:8453/components/map"/>
- </SPAN>
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0pt; left: 0px; ">
   <H2>Nearme</H2>
  </SPAN>
- <SPAN id="friend3" class="entry" style="position: absolute; top: 224px; left: 1px; ">
-  <INPUT type="text" value="field" size="20"/>
- </SPAN>
- <SPAN id="friend3loc" class="text" style="position: absolute; top: 228px; left: 174px; ">
-  <SPAN>last seen...</SPAN>
+ <SPAN id="me" class="h2" style="position: absolute; top: 0px; left: 101px; ">
+  <H2>me</H2>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 205px; left: 4px; ">
-  <SPAN>Friend 3:</SPAN>
+ <SPAN style="position: absolute; top: 81px; left: 2px; " class="entry" id="friend2">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
  </SPAN>
- <SPAN id="friend2" class="entry" style="position: absolute; top: 173px; left: 2px; ">
-  <INPUT type="text" value="field" size="20"/>
+ <SPAN style="position: absolute; top: 108px; left: 2px; " class="entry" id="friend3">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 152px; left: 4px; ">
-  <SPAN>Friend 2:</SPAN>
+ <SPAN style="position: absolute; top: 135px; left: 2px; " class="img" id="mapimg">
+  <IMG src="https://sca-store.com:8453/public/img.png"/>
  </SPAN>
- <SPAN id="friend2loc" class="text" style="position: absolute; top: 178px; left: 173px; ">
+ <SPAN style="position: absolute; top: 54px; left: 182px; " class="text" id="time1">
   <SPAN>last seen...</SPAN>
  </SPAN>
- <SPAN id="friend1" class="entry" style="position: absolute; top: 122px; left: 2px; ">
-  <INPUT type="text" value="field" size="20"/>
- </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 99px; left: 5px; ">
-  <SPAN>Friend 1:</SPAN>
- </SPAN>
- <SPAN id="friend1loc" class="text" style="position: absolute; top: 126px; left: 173px; ">
+ <SPAN style="position: absolute; top: 81px; left: 182px; " class="text" id="time2">
   <SPAN>last seen...</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 71px; left: 4px; ">
-  <SPAN>Last seen:</SPAN>
+ <SPAN style="position: absolute; top: 108px; left: 182px; " class="text" id="time3">
+  <SPAN>last seen...</SPAN>
  </SPAN>
- <SPAN id="myloc" class="text" style="position: absolute; top: 69px; left: 173px; ">
+ <SPAN style="position: absolute; top: 0px; left: 182px; " class="text" id="mytime">
   <SPAN>updating...</SPAN>
  </SPAN>
- <SPAN id="me" class="section" style="position: absolute; top: 33px; left: 1px; ">
-  <SPAN>me</SPAN>
+ <SPAN style="position: absolute; top: 54px; left: 2px; " class="entry" id="friend1">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
+  <SPAN>My friends</SPAN>
  </SPAN>
 </DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
new file mode 100644
index 0000000000..2031da70f5
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
@@ -0,0 +1,138 @@
+<?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" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://ourphotos" name="ourphotos">
+ <component t:x="191" t:y="433" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>61049883@N06</property>
+ </component>
+ <component t:x="820" t:y="140" name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
+ </component>
+ <component t:x="190" t:y="69" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="valueof2" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="430" t:y="52" name="name5" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>image</property>
+ </component>
+ <component t:x="524" t:y="108" name="valueof2" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>image</property>
+ </component>
+ <component t:x="659" t:y="141" name="shuffle" t:title="shuffle" t:color="yellow1">
+  <t:implementation.python script="nuvem/shuffle_.py"/>
+  <service name="shuffle"/>
+  <reference target="append" name="list"/>
+ </component>
+ <component t:x="565" t:y="373" name="append" t:title="+" t:color="yellow1">
+  <t:implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference target="values" name="first"/>
+  <reference target="values2" name="second"/>
+ </component>
+ <component t:x="438" t:y="31" name="foreach2" t:title="foreach" t:color="yellow1">
+  <t:implementation.python script="nuvem/map_.py"/>
+  <service name="foreach"/>
+  <reference target="name5" name="item"/>
+  <reference target="format" name="transform"/>
+  <reference target="shuffle" name="list"/>
+ </component>
+ <component t:x="501" t:y="59" name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text2" name="pattern"/>
+  <reference target="list" name="values"/>
+ </component>
+ <component t:x="318" t:y="26" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="foreach2" name="value"/>
+  <property>images</property>
+ </component>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="193" t:y="37" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="property" name="content"/>
+ </component>
+ <component t:x="553" t:y="52" name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>&lt;img src=&quot;{0}&quot; width=&quot;320&quot;/&gt;</property>
+ </component>
+ <component t:x="586" t:y="148" name="name3" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>src</property>
+ </component>
+ <component t:x="590" t:y="175" name="picalbum" t:title="picasa album" t:color="blue1">
+  <t:implementation.python script="nuvem/picalbum.py"/>
+  <service name="picalbum"/>
+  <reference target="text5" name="id"/>
+  <reference name="pic" t:visible="false">
+   <t:binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
+  </reference>
+ </component>
+ <component t:x="605" t:y="240" name="name4" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>m</property>
+ </component>
+ <component t:x="606" t:y="265" name="flkalbum" t:title="flicker album" t:color="blue1">
+  <t:implementation.python script="nuvem/flkalbum.py"/>
+  <service name="flkalbum"/>
+  <reference target="text7" name="id"/>
+  <reference name="flk" t:visible="false">
+   <t:binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
+  </reference>
+ </component>
+ <component t:x="497" t:y="147" name="values" t:title="values" t:color="yellow1">
+  <t:implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference target="search" name="list"/>
+ </component>
+ <component t:x="486" t:y="228" name="values2" t:title="values" t:color="yellow1">
+  <t:implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference target="search2" name="list"/>
+ </component>
+ <component t:x="542" t:y="223" name="search2" t:title="search" t:color="yellow1">
+  <t:implementation.python script="nuvem/search.py"/>
+  <service name="search"/>
+  <reference target="name4" name="path"/>
+  <reference target="flkalbum" name="list"/>
+ </component>
+ <component t:x="540" t:y="144" name="search" t:title="search" t:color="yellow1">
+  <t:implementation.python script="nuvem/search.py"/>
+  <service name="search"/>
+  <reference target="name3" name="path"/>
+  <reference target="picalbum" name="list"/>
+ </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html
new file mode 100644
index 0000000000..5b2645db8b
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html
@@ -0,0 +1,36 @@
+<?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="h2" class="h2" style="position: absolute; top: 9px; left: 2px; ">
+  <H2>Our Photos</H2>
+ </SPAN>
+ <SPAN id="images" class="list" style="position: absolute; top: 45px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>list</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
new file mode 100644
index 0000000000..8cec2914ba
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
@@ -0,0 +1,577 @@
+<?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" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://shoppingcart" name="shoppingcart">
+ <service name="appstart" promote="appstart"/>
+ <component t:x="14" t:y="26" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="list4" name="content"/>
+ </component>
+ <service name="addToCart" promote="addToCart"/>
+ <component t:x="427" t:y="412" name="addToCart" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list6" name="content"/>
+ </component>
+ <service name="emptyCart" promote="emptyCart"/>
+ <component t:x="10" t:y="560" name="emptyCart" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list5" name="content"/>
+ </component>
+ <service name="checkout" promote="checkout"/>
+ <component t:x="12" t:y="758" name="checkout" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list3" name="content"/>
+ </component>
+ <component t:x="372" t:y="285" name="filedb" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
+ </component>
+ <component t:x="374" t:y="311" name="user" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
+ </component>
+ <component t:x="861" t:y="26" name="get" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb" name="collection"/>
+  <reference target="user" name="id"/>
+ </component>
+ <service name="getcart" promote="getcart"/>
+ <component t:x="558" t:y="148" name="getcart" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="get" name="content"/>
+ </component>
+ <component t:x="827" t:y="16" name="name5" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>getcart</property>
+ </component>
+ <service name="total" promote="total"/>
+ <component t:x="427" t:y="294" name="total" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="property2" name="content"/>
+ </component>
+ <component t:x="748" t:y="243" name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="call11" name="value"/>
+  <property>message</property>
+ </component>
+ <component t:x="229" t:y="11" name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text2" name="value"/>
+  <property>message</property>
+ </component>
+ <service name="catalog" promote="catalog"/>
+ <component t:x="405" t:y="22" name="catalog" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list" name="content"/>
+ </component>
+ <component t:x="672" t:y="8" name="list5" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property11" name="item" t:clonable="true"/>
+  <reference target="call7" name="item" t:clonable="true"/>
+  <reference target="call16" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="689" t:y="166" name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property12" name="item" t:clonable="true"/>
+  <reference target="call3" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="144" t:y="179" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="147" t:y="7" name="list4" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference target="call5" name="item" t:clonable="true"/>
+  <reference target="call13" name="item" t:clonable="true"/>
+  <reference target="call14" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="543" t:y="250" name="name11" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>total</property>
+ </component>
+ <component t:x="297" t:y="183" name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>2.99</property>
+ </component>
+ <component t:x="219" t:y="179" name="property8" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number" name="value"/>
+  <property>Mango</property>
+ </component>
+ <component t:x="224" t:y="218" name="property9" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number2" name="value"/>
+  <property>Passion</property>
+ </component>
+ <component t:x="336" t:y="215" name="number2" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3.55</property>
+ </component>
+ <component t:x="314" t:y="250" name="number4" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>1.55</property>
+ </component>
+ <service name="cataloghtml" promote="cataloghtml"/>
+ <component t:x="12" t:y="221" name="cataloghtml" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="property" name="content"/>
+ </component>
+ <component t:x="219" t:y="207" name="format2" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text5" name="pattern"/>
+  <reference target="valueof" name="values"/>
+ </component>
+ <component t:x="310" t:y="275" name="name2" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>catalog</property>
+ </component>
+ <component t:x="218" t:y="272" name="call9" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name2" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="222" t:y="180" name="name" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>fruit</property>
+ </component>
+ <service name="carthtml" promote="carthtml"/>
+ <component t:x="12" t:y="388" name="carthtml" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="property6" name="content"/>
+ </component>
+ <component t:x="421" t:y="43" name="name8" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>cataloghtml</property>
+ </component>
+ <component t:x="215" t:y="425" name="name3" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>fruit</property>
+ </component>
+ <component t:x="216" t:y="457" name="format3" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text6" name="pattern"/>
+  <reference target="valueof2" name="values"/>
+ </component>
+ <component t:x="294" t:y="246" name="valueof" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>fruit</property>
+ </component>
+ <component t:x="272" t:y="478" name="valueof2" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>fruit</property>
+ </component>
+ <component t:x="307" t:y="518" name="name12" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>getcart</property>
+ </component>
+ <component t:x="256" t:y="161" name="foreach" t:title="foreach" t:color="yellow1">
+  <t:implementation.python script="nuvem/map_.py"/>
+  <service name="foreach"/>
+  <reference target="name" name="item"/>
+  <reference target="format2" name="transform"/>
+  <reference target="call9" name="list"/>
+ </component>
+ <component t:x="200" t:y="56" name="call5" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name8" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="297" t:y="590" name="name9" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>carthtml</property>
+ </component>
+ <component t:x="313" t:y="794" name="name6" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>emptyCart</property>
+ </component>
+ <component t:x="567" t:y="822" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Your order has been processed. Your total: ${1}</property>
+ </component>
+ <component t:x="296" t:y="588" name="valueof3" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>sum</property>
+ </component>
+ <component t:x="528" t:y="96" name="name14" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>getcart</property>
+ </component>
+ <component t:x="336" t:y="386" name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>${1} - {0}</property>
+ </component>
+ <component t:x="556" t:y="340" name="filedb3" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
+ </component>
+ <component t:x="555" t:y="366" name="user3" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
+ </component>
+ <component t:x="859" t:y="410" name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name5" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="859" t:y="499" name="name10" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>total</property>
+ </component>
+ <component t:x="857" t:y="464" name="name15" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>carthtml</property>
+ </component>
+ <component t:x="121" t:y="358" name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="foreach2" name="value"/>
+  <property>cart</property>
+ </component>
+ <component t:x="773" t:y="510" name="call6" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name10" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="848" t:y="289" name="put" t:title="put" t:color="red1">
+  <t:implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference target="filedb3" name="collection"/>
+  <reference target="user3" name="id"/>
+  <reference target="append" name="value"/>
+ </component>
+ <component t:x="769" t:y="291" name="property7" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="put" name="value"/>
+  <property>putresult</property>
+ </component>
+ <component t:x="749" t:y="105" name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number4" name="value"/>
+  <property>Kiwi</property>
+ </component>
+ <component t:x="814" t:y="592" name="property11" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="delete2" name="value"/>
+  <property>delresult</property>
+ </component>
+ <component t:x="299" t:y="617" name="valueof4" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>price</property>
+ </component>
+ <component t:x="98" t:y="526" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="round" name="value"/>
+  <property>total</property>
+ </component>
+ <component t:x="570" t:y="917" name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text4" name="pattern"/>
+  <reference target="call8" name="values"/>
+ </component>
+ <service name="order" promote="order"/>
+ <component t:x="426" t:y="727" name="order" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="format" name="content"/>
+ </component>
+ <component t:x="328" t:y="797" name="call11" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name16" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="1016" t:y="150" name="name16" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>order</property>
+ </component>
+ <component t:x="201" t:y="114" name="call13" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name17" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="283" t:y="114" name="name17" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>carthtml</property>
+ </component>
+ <component t:x="197" t:y="153" name="call14" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name19" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="289" t:y="151" name="name19" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>total</property>
+ </component>
+ <component t:x="742" t:y="944" name="name13" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>order</property>
+ </component>
+ <component t:x="680" t:y="1038" name="call8" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name11" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="378" t:y="263" name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>&lt;span id=&quot;fruit&quot; class=&quot;checkbox&quot;&gt;&lt;input type=&quot;checkbox&quot; value=&quot;{0}&quot;/&gt;${1} - {0}&lt;/span&gt;</property>
+ </component>
+ <component t:x="467" t:y="374" name="name20" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>catalog</property>
+ </component>
+ <component t:x="143" t:y="235" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="foreach" name="value"/>
+  <property>catalog</property>
+ </component>
+ <component t:x="258" t:y="734" name="param" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>fruit</property>
+  <property name="query" t:visible="false"/>
+ </component>
+ <component t:x="257" t:y="757" name="call15" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name20" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="391" t:y="635" name="append" t:title="+" t:color="yellow1">
+  <t:implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference target="call2" name="first"/>
+  <reference target="lookup" name="second"/>
+ </component>
+ <component t:x="455" t:y="671" name="lookup" t:title="lookup" t:color="yellow1">
+  <t:implementation.python script="nuvem/lookup.py"/>
+  <service name="lookup"/>
+  <reference target="param" name="name"/>
+  <reference target="call15" name="list"/>
+ </component>
+ <component t:x="281" t:y="497" name="call10" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name12" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="216" t:y="405" name="foreach2" t:title="foreach" t:color="yellow1">
+  <t:implementation.python script="nuvem/map_.py"/>
+  <service name="foreach"/>
+  <reference target="name3" name="item"/>
+  <reference target="format3" name="transform"/>
+  <reference target="call10" name="list"/>
+ </component>
+ <component t:x="854" t:y="834" name="call7" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name9" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="853" t:y="866" name="call16" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name21" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="464" t:y="189" name="name21" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>total</property>
+ </component>
+ <component t:x="214" t:y="767" name="call4" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name15" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="139" t:y="579" name="list6" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="call4" name="item" t:clonable="true"/>
+  <reference target="call6" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="320" t:y="42" name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Welcome to my online store</property>
+ </component>
+ <component t:x="667" t:y="375" name="round" t:title="round" t:color="magenta1">
+  <t:implementation.python script="nuvem/round_.py"/>
+  <service name="round"/>
+  <reference target="number3" name="n"/>
+  <reference target="sum" name="x"/>
+ </component>
+ <component t:x="722" t:y="375" name="number3" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>2</property>
+ </component>
+ <component t:x="866" t:y="771" name="filedb2" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
+ </component>
+ <component t:x="816" t:y="767" name="delete2" t:title="delete" t:color="red1">
+  <t:implementation.python script="nuvem/delete.py"/>
+  <service name="delete"/>
+  <reference target="filedb2" name="collection"/>
+  <reference target="user2" name="id"/>
+ </component>
+ <component t:x="865" t:y="798" name="user2" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
+ </component>
+ <component t:x="714" t:y="492" name="call" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name14" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="263" t:y="879" name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.2@gmail.com</property>
+ </component>
+ <component t:x="269" t:y="908" name="call12" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name13" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="635" t:y="345" name="values" t:title="values" t:color="yellow1">
+  <t:implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference target="call" name="list"/>
+ </component>
+ <component t:x="590" t:y="348" name="sum" t:title="sum" t:color="magenta1">
+  <t:implementation.python script="nuvem/sum_.py"/>
+  <service name="sum"/>
+  <reference target="values" name="l"/>
+ </component>
+ <component t:x="131" t:y="839" name="property12" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="sendgtalk" name="value"/>
+  <property>sendresult</property>
+ </component>
+ <component t:x="131" t:y="958" name="call3" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name6" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="217" t:y="841" name="sendgtalk" t:title="gtalk" t:color="blue1">
+  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+  <service name="sendgtalk"/>
+  <reference target="text" name="jid"/>
+  <reference target="text7" name="pass"/>
+  <reference target="text3" name="to"/>
+  <reference target="call12" name="msg"/>
+ </component>
+ <component t:x="266" t:y="802" name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.1@gmail.com</property>
+ </component>
+ <component t:x="266" t:y="830" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmpp4sca</property>
+ </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html
new file mode 100644
index 0000000000..4a7bc1557b
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html
@@ -0,0 +1,72 @@
+<?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="message" class="text" style="position: absolute; top: 36px; left: 2px; ">
+  <SPAN>Welcome</SPAN>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 189px; width: 100%; left: 2px; ">
+  <SPAN>Your Cart:</SPAN>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 72px; width: 100%; left: 2px; ">
+  <SPAN>Catalog</SPAN>
+ </SPAN>
+ <SPAN id="catalog" class="list" style="position: absolute; top: 99px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>list</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="cart" class="list" style="position: absolute; top: 216px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>list</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Shopping Cart</H2>
+ </SPAN>
+ <SPAN id="addToCart" class="button" style="position: absolute; top: 72px; left: 146px; ">
+  <INPUT type="button" value="Add to cart"/>
+ </SPAN>
+ <SPAN id="checkout" class="button" style="position: absolute; top: 189px; left: 146px; ">
+  <INPUT type="button" value="Check out"/>
+ </SPAN>
+ <SPAN id="emptyCart" class="button" style="position: absolute; top: 189px; left: 245px; ">
+  <INPUT type="button" value="Empty"/>
+ </SPAN>
+ <SPAN id="text" class="text" style="position: absolute; top: 189px; left: 74px; ">
+  <SPAN>$</SPAN>
+ </SPAN>
+ <SPAN id="total" class="text" style="position: absolute; top: 189px; left: 83px; ">
+  <SPAN>0</SPAN>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/slice/app.composite b/sca-cpp/trunk/modules/edit/apps/slice/app.composite
new file mode 100644
index 0000000000..009b31b3b6
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/slice/app.composite
@@ -0,0 +1,40 @@
+<?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" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://slice" name="slice">
+ <component t:x="271" t:y="21" name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
+ </component>
+ <component t:x="246" t:y="25" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number" name="value"/>
+  <property>slice</property>
+ </component>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="129" t:y="23" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="property" name="content"/>
+ </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.composite b/sca-cpp/trunk/modules/edit/apps/test/app.composite
index 7b5df3c630..37abe589ad 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite
@@ -18,27 +18,28 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://test" name="test">
- <service name="every" promote="every"/>
- <component t:x="42" t:y="30" name="every" t:title="every n milliseconds" t:color="green1">
-  <t:implementation.python script="nuvem/every.py"/>
-  <service name="every" t:visible="false">
-   <t:binding.http uri="every"/>
-  </service>
-  <reference name="n"/>
-  <reference name="content"/>
+ <service name="text3" promote="text3"/>
+ <component t:x="48" t:y="35" name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Hello World</property>
  </component>
- <service name="pair" promote="pair"/>
- <component t:x="207" t:y="48" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference name="name"/>
-  <reference name="value"/>
+ <service name="fbprofile" promote="fbprofile"/>
+ <component t:x="404" t:y="163" name="fbprofile" t:title="facebook profile" t:color="blue1">
+  <t:implementation.python script="nuvem/fbprofile.py"/>
+  <service name="fbprofile"/>
+  <reference name="id"/>
+  <reference name="fb" t:visible="false">
+   <t:binding.http uri="https://graph.facebook.com"/>
+  </reference>
  </component>
- <service name="itemnb" promote="itemnb"/>
- <component t:x="104" t:y="95" name="itemnb" t:title="item number" t:color="yellow1">
-  <t:implementation.python script="nuvem/itemnb.py"/>
-  <service name="itemnb"/>
-  <reference name="index"/>
-  <reference name="list"/>
+ <service name="twprofile" promote="twprofile"/>
+ <component t:x="402" t:y="216" name="twprofile" t:title="twitter profile" t:color="blue1">
+  <t:implementation.python script="nuvem/twprofile.py"/>
+  <service name="twprofile"/>
+  <reference name="id"/>
+  <reference name="tw" t:visible="false">
+   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
+  </reference>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
index 48530ae93f..1a764eb20e 100644
--- a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
@@ -18,12 +18,7 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testdb" name="testdb">
- <component t:x="405" t:y="143" name="text3" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>testkey</property>
- </component>
- <component t:x="177" t:y="36" name="text" t:title="text" t:color="orange1">
+ <component t:x="177" t:y="36" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
@@ -34,19 +29,19 @@
   <reference target="text" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="103" t:y="91" name="text2" t:title="text" t:color="orange1">
+ <component t:x="103" t:y="91" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testvalue</property>
  </component>
- <component t:x="105" t:y="8" name="filedb" t:title="File database" t:color="green1">
+ <component t:x="105" t:y="8" name="filedb" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
  <service name="put" promote="put"/>
- <component t:x="59" t:y="63" name="put" t:title="put" t:color="green1">
+ <component t:x="72" t:y="38" name="put" t:title="put" t:color="red1">
   <t:implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb" name="collection"/>
@@ -60,26 +55,26 @@
   <reference name="item" t:clonable="true"/>
  </component>
  <service name="get" promote="get"/>
- <component t:x="300" t:y="61" name="get" t:title="get" t:color="green1">
+ <component t:x="263" t:y="42" name="get" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb3" name="collection"/>
   <reference target="list2" name="id"/>
  </component>
- <component t:x="311" t:y="155" name="filedb3" t:title="File database" t:color="green1">
+ <component t:x="311" t:y="155" name="filedb3" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
  <service name="delete" promote="delete"/>
- <component t:x="58" t:y="221" name="delete" t:title="delete" t:color="green1">
+ <component t:x="457" t:y="44" name="delete" t:title="delete" t:color="red1">
   <t:implementation.python script="nuvem/delete.py"/>
   <service name="delete"/>
   <reference target="filedb2" name="collection"/>
   <reference target="list3" name="id"/>
  </component>
- <component t:x="113" t:y="223" name="filedb2" t:title="File database" t:color="green1">
+ <component t:x="113" t:y="223" name="filedb2" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
@@ -91,7 +86,12 @@
   <reference target="text4" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="187" t:y="249" name="text4" t:title="text" t:color="orange1">
+ <component t:x="187" t:y="249" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>testkey</property>
+ </component>
+ <component t:x="342" t:y="70" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.html b/sca-cpp/trunk/modules/edit/apps/testdb/app.html
new file mode 100644
index 0000000000..734ec8f687
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.html
@@ -0,0 +1,24 @@
+<?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="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test db components</H1>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
index bbf0a52851..04c6eea787 100644
--- a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
@@ -18,177 +18,154 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testevents" name="testevents">
- <service name="page" promote="page"/>
- <component t:x="43" t:y="10" name="page" t:title="when page opens" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="pair" name="content"/>
- </component>
- <service name="testbutton1" promote="testbutton1"/>
- <component t:x="42" t:y="127" name="testbutton1" t:title="on {compname} widget" t:color="green1">
-  <t:implementation.python script="nuvem/widget.py"/>
-  <service name="widget" t:visible="false"/>
-  <reference target="pair5" name="content"/>
- </component>
- <component t:x="167" t:y="12" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="text" name="value"/>
- </component>
- <component t:x="311" t:y="76" name="text" t:title="text" t:color="orange1">
+ <component t:x="888" t:y="14" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>page opened</property>
- </component>
- <component t:x="293" t:y="48" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>status</property>
+  <property>cancel button clicked</property>
  </component>
- <component t:x="245" t:y="133" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>status</property>
+ <component t:x="844" t:y="132" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>timer fired</property>
  </component>
- <service name="testbutton2" promote="testbutton2"/>
- <component t:x="409" t:y="9" name="testbutton2" t:title="on {compname} widget" t:color="green1">
-  <t:implementation.python script="nuvem/widget.py"/>
-  <service name="widget" t:visible="false"/>
-  <reference target="pair3" name="content"/>
- </component>
- <component t:x="591" t:y="130" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
-  <reference target="text3" name="value"/>
+ <component t:x="359" t:y="75" name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>page opens</property>
  </component>
- <component t:x="654" t:y="125" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
+ <component t:x="228" t:y="197" name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text2" name="value"/>
   <property>status</property>
  </component>
- <component t:x="269" t:y="132" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="text2" name="value"/>
+ <component t:x="371" t:y="408" name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>ok button clicked</property>
  </component>
- <component t:x="319" t:y="204" name="name5" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
+ <component t:x="229" t:y="156" name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="param" name="value"/>
   <property>testtext</property>
  </component>
- <component t:x="251" t:y="116" name="name6" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>data</property>
+ <component t:x="619" t:y="371" name="params2" t:title="?params" t:color="green1">
+  <t:implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="245" t:y="167" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
-  <reference target="pair4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="307" t:y="147" name="param" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>testfield</property>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="190" t:y="127" name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name6" name="name"/>
-  <reference target="list" name="value"/>
+ <service name="every3" promote="every3"/>
+ <component t:x="62" t:y="91" name="every3" t:title="every" t:color="green1">
+  <t:implementation.python script="nuvem/every.py"/>
+  <service name="every" t:visible="false">
+   <t:binding.http uri="every"/>
+  </service>
+  <reference target="number" name="n"/>
+  <reference target="property2" name="content"/>
  </component>
- <component t:x="321" t:y="256" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name5" name="name"/>
-  <reference target="param" name="value"/>
+ <component t:x="601" t:y="122" name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3000</property>
  </component>
- <component t:x="373" t:y="207" name="text2" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>ok button clicked</property>
+ <component t:x="602" t:y="148" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text4" name="value"/>
+  <property>status</property>
  </component>
- <component t:x="871" t:y="58" name="text3" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>cancel button clicked</property>
+ <component t:x="598" t:y="227" name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="params2" name="value"/>
+  <property>location</property>
  </component>
- <service name="location" promote="location"/>
- <component t:x="603" t:y="295" name="location" t:title="on location change" t:color="green1">
-  <t:implementation.python script="nuvem/location.py"/>
-  <service name="location" t:visible="false">
-   <t:binding.http uri="location"/>
+ <service name="geolocation" promote="geolocation"/>
+ <component t:x="61" t:y="178" name="geolocation" t:title="location" t:color="green1">
+  <t:implementation.python script="nuvem/geolocation.py"/>
+  <service name="geolocation" t:visible="false">
+   <t:binding.http uri="geolocation"/>
   </service>
-  <reference target="pair6" name="content"/>
+  <reference target="property6" name="content"/>
  </component>
- <component t:x="756" t:y="287" name="pair6" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name7" name="name"/>
-  <reference target="params2" name="value"/>
+ <component t:x="159" t:y="42" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text" name="value"/>
+  <property>status</property>
  </component>
- <component t:x="808" t:y="288" name="name7" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>data</property>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="63" t:y="31" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="property3" name="content"/>
  </component>
- <component t:x="806" t:y="331" name="params2" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
-  <service name="params"/>
-  <property name="query" t:visible="false"/>
+ <component t:x="172" t:y="141" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="783" t:y="255" name="pair8" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name9" name="name"/>
-  <reference target="text4" name="value"/>
+ <service name="testbutton1" promote="testbutton1"/>
+ <component t:x="364" t:y="102" name="testbutton1" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list" name="content"/>
  </component>
- <component t:x="758" t:y="243" name="text4" t:title="text" t:color="orange1">
+ <service name="testbutton2" promote="testbutton2"/>
+ <component t:x="362" t:y="35" name="testbutton2" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="prop2" name="content"/>
+ </component>
+ <component t:x="602" t:y="52" name="prop2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text3" name="value"/>
+  <property>status</property>
+ </component>
+ <component t:x="455" t:y="315" name="abc" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>timer fired</property>
+  <property>abc</property>
  </component>
- <component t:x="674" t:y="126" name="number" t:title="number" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>3000</property>
+ <service name="compabc" promote="compabc"/>
+ <component t:x="236" t:y="248" name="compabc" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="abc" name="content"/>
  </component>
- <component t:x="675" t:y="146" name="pair7" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name8" name="name"/>
-  <reference target="pair8" name="value"/>
+ <service name="compxyz" promote="compxyz"/>
+ <component t:x="236" t:y="299" name="compxyz" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference name="content" target="text12"/>
  </component>
- <service name="every" promote="every"/>
- <component t:x="601" t:y="103" name="every" t:title="every n milliseconds" t:color="green1">
-  <t:implementation.python script="nuvem/every.py"/>
-  <service name="every" t:visible="false">
-   <t:binding.http uri="every"/>
-  </service>
-  <reference target="number" name="n"/>
-  <reference target="pair7" name="content"/>
- </component>
- <component t:x="733" t:y="164" name="name8" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>data</property>
+ <component name="text12" t:x="428" t:y="366" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xyz</property>
  </component>
- <component t:x="788" t:y="204" name="name9" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>status</property>
+ <service name="call2" promote="call2"/>
+ <component t:x="69" t:y="248" name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="360" t:y="250" name="name4" t:title="name" t:color="orange1">
+ <component t:x="184" t:y="316" name="name" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>testfield</property>
- </component>
- <component t:x="301" t:y="247" name="param" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <reference target="name4" name="name"/>
-  <property name="query" t:visible="false"/>
+  <property>compxyz</property>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.html b/sca-cpp/trunk/modules/edit/apps/testevents/app.html
index 2ad817bec9..94ffd7a609 100644
--- a/sca-cpp/trunk/modules/edit/apps/testevents/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.html
@@ -18,37 +18,40 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="testfield" class="entry" style="position: absolute; top: 12px; left: 0px; ">
-  <INPUT type="text" value="enter a val" size="10"/>
+ <SPAN id="testbutton1" class="button" style="position: absolute; top: 207px; left: 2px; ">
+  <INPUT type="button" value="OK"/>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 55px; left: 4px; ">
-  <SPAN>Status:</SPAN>
+ <SPAN id="testbutton2" class="button" style="position: absolute; top: 207px; left: 47px; ">
+  <INPUT type="button" value="Cancel"/>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 88px; left: 4px; ">
-  <SPAN>Field value:</SPAN>
+ <SPAN id="text" class="text" style="position: absolute; top: 171px; left: 11px; ">
+  <SPAN>Latitude:</SPAN>
  </SPAN>
- <SPAN id="testtext" class="text" style="position: absolute; top: 89px; left: 84px; ">
+ <SPAN id="latitude" class="text" style="position: absolute; top: 171px; left: 92px; ">
   <SPAN>text</SPAN>
  </SPAN>
- <SPAN id="status" class="text" style="position: absolute; top: 56px; left: 83px; ">
+ <SPAN id="longitude" class="text" style="position: absolute; top: 144px; left: 92px; ">
   <SPAN>text</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 115px; left: 4px; ">
+ <SPAN id="text" class="text" style="position: absolute; top: 144px; left: 11px; ">
   <SPAN>Longitude:</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 138px; left: 5px; ">
-  <SPAN>Latitude:</SPAN>
+ <SPAN id="text" class="text" style="position: absolute; top: 117px; left: 11px; ">
+  <SPAN>Field value:</SPAN>
  </SPAN>
- <SPAN id="testbutton1" class="button" style="position: absolute; top: 173px; left: 0px; ">
-  <INPUT type="button" value="OK"/>
+ <SPAN id="testtext" class="text" style="position: absolute; top: 117px; left: 92px; ">
+  <SPAN>text</SPAN>
  </SPAN>
- <SPAN id="testbutton2" class="button" style="position: absolute; top: 172px; left: 64px; ">
-  <INPUT type="button" value="Cancel"/>
+ <SPAN id="text" class="text" style="position: absolute; top: 90px; left: 11px; ">
+  <SPAN>Status:</SPAN>
  </SPAN>
- <SPAN id="longitude" class="text" style="position: absolute; top: 114px; left: 83px; ">
+ <SPAN id="status" class="text" style="position: absolute; top: 90px; left: 92px; ">
   <SPAN>text</SPAN>
  </SPAN>
- <SPAN id="latitude" class="text" style="position: absolute; top: 137px; left: 83px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="testfield" class="entry" style="position: absolute; top: 54px; left: 11px; ">
+  <INPUT type="text" value="enter a val" size="10" autocapitalize="off"/>
+ </SPAN>
+ <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test events</H1>
  </SPAN>
 </DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
index 983e814513..d403fcb32a 100644
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
@@ -19,69 +19,112 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testhttp" name="testhttp">
  <service name="get" promote="get"/>
- <component t:x="25" t:y="25" name="get" t:title="http get" t:color="green1">
+ <component t:x="25" t:y="25" name="get" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text" name="url"/>
  </component>
  <service name="get2" promote="get2"/>
- <component t:x="24" t:y="91" name="get2" t:title="http get" t:color="green1">
+ <component t:x="24" t:y="83" name="get2" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text2" name="url"/>
  </component>
  <service name="get3" promote="get3"/>
- <component t:x="23" t:y="175" name="get3" t:title="http get" t:color="green1">
+ <component t:x="23" t:y="146" name="get3" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="87" t:y="175" name="text3" t:title="text" t:color="orange1">
+ <component t:x="87" t:y="175" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdXMLclient.php?whichClient=NDFDgen&amp;lat=38.99&amp;lon=-77.01&amp;listLatLon=&amp;lat1=&amp;lon1=&amp;lat2=&amp;lon2=&amp;resolutionSub=&amp;listLat1=&amp;listLon1=&amp;listLat2=&amp;listLon2=&amp;resolutionList=&amp;endPoint1Lat=&amp;endPoint1Lon=&amp;endPoint2Lat=&amp;endPoint2Lon=&amp;listEndPoint1Lat=&amp;listEndPoint1Lon=&amp;listEndPoint2Lat=&amp;listEndPoint2Lon=&amp;zipCodeList=&amp;listZipCodeList=&amp;centerPointLat=&amp;centerPointLon=&amp;distanceLat=&amp;distanceLon=&amp;resolutionSquare=&amp;listCenterPointLat=&amp;listCenterPointLon=&amp;listDistanceLat=&amp;listDistanceLon=&amp;listResolutionSquare=&amp;citiesLevel=&amp;listCitiesLevel=&amp;sector=&amp;gmlListLatLon=&amp;featureType=&amp;requestedTime=&amp;startTime=&amp;endTime=&amp;compType=&amp;propertyName=&amp;product=time-series&amp;begin=2004-01-01T00%3A00%3A00&amp;end=2015-03-10T00%3A00%3A00&amp;maxt=maxt&amp;Submit=Submit</property>
  </component>
- <component t:x="88" t:y="91" name="text2" t:title="text" t:color="orange1">
+ <component t:x="88" t:y="91" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&amp;destination=Concord,MA&amp;waypoints=Charlestown,MA|Lexington,MA&amp;sensor=false</property>
  </component>
  <service name="get4" promote="get4"/>
- <component t:x="26" t:y="267" name="get4" t:title="http get" t:color="green1">
+ <component t:x="25" t:y="210" name="get4" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text4" name="url"/>
  </component>
- <component t:x="90" t:y="267" name="text4" t:title="text" t:color="orange1">
+ <component t:x="90" t:y="267" name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://feedproxy.google.com/TechCrunch</property>
  </component>
- <component t:x="93" t:y="25" name="text" t:title="text" t:color="orange1">
+ <component t:x="93" t:y="25" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://www.google.com</property>
  </component>
  <service name="get5" promote="get5"/>
- <component t:x="26" t:y="335" name="get5" t:title="http get" t:color="green1">
+ <component t:x="26" t:y="274" name="get5" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
- <component t:x="95" t:y="331" name="text5" t:title="text" t:color="orange1">
+ <component t:x="95" t:y="331" name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cnn.com</property>
  </component>
  <service name="get6" promote="get6"/>
- <component t:x="25" t:y="396" name="get6" t:title="http get" t:color="green1">
+ <component t:x="26" t:y="335" name="get6" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text6" name="url"/>
  </component>
- <component t:x="95" t:y="395" name="text6" t:title="text" t:color="orange1">
+ <component t:x="95" t:y="395" name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>https://chart.googleapis.com/chart?cht=p3&amp;chs=250x100&amp;chd=t:60,40&amp;chl=Hello|World</property>
  </component>
+ <service name="parse" promote="parse"/>
+ <component t:x="529" t:y="192" name="parse" t:title="parse" t:color="magenta1">
+  <t:implementation.python script="nuvem/parse.py"/>
+  <service name="parse"/>
+  <reference target="text8" name="regexp"/>
+  <reference target="join" name="string"/>
+ </component>
+ <component t:x="832" t:y="249" name="rest" t:title="rest" t:color="yellow1">
+  <t:implementation.python script="nuvem/rest.py"/>
+  <service name="rest"/>
+  <reference target="get7" name="list"/>
+ </component>
+ <component t:x="868" t:y="311" name="get7" t:title="get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="text7" name="url"/>
+ </component>
+ <component t:x="795" t:y="269" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>cnn.com</property>
+ </component>
+ <component t:x="553" t:y="292" name="first" t:title="first" t:color="yellow1">
+  <t:implementation.python script="nuvem/first.py"/>
+  <service name="first"/>
+  <reference target="rest" name="list"/>
+ </component>
+ <component t:x="812" t:y="334" name="text9" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property name="property"/>
+ </component>
+ <component t:x="617" t:y="226" name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>(CNN)</property>
+ </component>
+ <component t:x="617" t:y="254" name="join" t:title="join" t:color="magenta1">
+  <t:implementation.python script="nuvem/join.py"/>
+  <service name="join"/>
+  <reference target="text9" name="separator"/>
+  <reference target="first" name="list"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.html b/sca-cpp/trunk/modules/edit/apps/testhttp/app.html
index 544287aa6d..2faf6fa886 100644
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.html
@@ -18,14 +18,10 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="iframe" class="iframe" style="position: absolute; top: 39px; left: 67px; ">
-  <A href="https://testhttp.sca-store.com:8453/components/get6">
-   <SPAN class="fakeframe">
-    <SPAN>frame ...</SPAN>
-   </SPAN>
-  </A>
+ <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+  <H1>Test HTTP components</H1>
  </SPAN>
- <SPAN id="iframe" class="iframe" style="position: absolute; top: 214px; left: 69px; ">
+ <SPAN id="iframe" class="iframe" style="position: absolute; top: 234px; left: 11px; ">
   <A href="https://testhttp.sca-store.com:8453/components/get5">
    <SPAN class="fakeframe">
     <SPAN>frame ...</SPAN>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
index f8b354f3e1..a5ab623b3c 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
@@ -19,7 +19,7 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testlogic" name="testlogic">
  <service name="if" promote="if"/>
- <component t:x="34" t:y="24" name="if" t:title="if" t:color="magenta1">
+ <component t:x="22" t:y="45" name="if" t:title="if" t:color="magenta1">
   <t:implementation.python script="nuvem/if_.py"/>
   <service name="if"/>
   <reference target="greater" name="condition"/>
@@ -32,92 +32,119 @@
   <reference target="number2" name="value1"/>
   <reference target="number" name="value2"/>
  </component>
- <component t:x="118" t:y="66" name="number" t:title="number" t:color="orange1">
+ <component t:x="118" t:y="66" name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component t:x="78" t:y="118" name="text" t:title="text" t:color="orange1">
+ <component t:x="78" t:y="118" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>greater than 5</property>
  </component>
- <component t:x="76" t:y="162" name="text2" t:title="text" t:color="orange1">
+ <component t:x="76" t:y="162" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>not greater than 5</property>
  </component>
- <component t:x="88" t:y="25" name="number2" t:title="number" t:color="orange1">
+ <component t:x="88" t:y="25" name="number2" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3</property>
  </component>
  <service name="eval" promote="eval"/>
- <component t:x="287" t:y="37" name="eval" t:title="py expr" t:color="magenta1">
+ <component t:x="235" t:y="46" name="eval" t:title="expr" t:color="magenta1">
   <t:implementation.python script="nuvem/eval_.py"/>
   <service name="eval"/>
   <reference target="text3" name="py"/>
   <reference name="ref"/>
  </component>
  <service name="eval2" promote="eval2"/>
- <component t:x="287" t:y="130" name="eval2" t:title="py expr" t:color="magenta1">
+ <component t:x="454" t:y="46" name="eval2" t:title="expr" t:color="magenta1">
   <t:implementation.python script="nuvem/eval_.py"/>
   <service name="eval"/>
   <reference target="text4" name="py"/>
   <reference target="number3" name="ref"/>
  </component>
- <component t:x="350" t:y="160" name="number3" t:title="number" t:color="orange1">
+ <component t:x="350" t:y="160" name="number3" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
  <service name="exec" promote="exec"/>
- <component t:x="289" t:y="365" name="exec" t:title="py script" t:color="magenta1">
+ <component t:x="234" t:y="233" name="exec" t:title="script" t:color="magenta1">
   <t:implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference target="get" name="py"/>
   <reference target="number4" name="ref"/>
  </component>
- <component t:x="357" t:y="289" name="number4" t:title="number" t:color="orange1">
+ <component t:x="357" t:y="289" name="number4" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component t:x="358" t:y="267" name="get" t:title="http get" t:color="green1">
+ <component t:x="358" t:y="267" name="get" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
  <service name="exec2" promote="exec2"/>
- <component t:x="287" t:y="245" name="exec2" t:title="py script" t:color="magenta1">
+ <component t:x="236" t:y="146" name="exec2" t:title="script" t:color="magenta1">
   <t:implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference target="text6" name="py"/>
   <reference target="number5" name="ref"/>
  </component>
- <component t:x="350" t:y="37" name="text3" t:title="text" t:color="orange1">
+ <component t:x="350" t:y="37" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>3.14116 * 5 * 5</property>
  </component>
- <component t:x="350" t:y="130" name="text4" t:title="text" t:color="orange1">
+ <component t:x="350" t:y="130" name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
- <component t:x="359" t:y="286" name="number5" t:title="number" t:color="orange1">
+ <component t:x="359" t:y="286" name="number5" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component t:x="357" t:y="245" name="text6" t:title="text" t:color="orange1">
+ <component t:x="357" t:y="245" name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>val = 3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
- <component t:x="423" t:y="365" name="text5" t:title="text" t:color="orange1">
+ <component t:x="423" t:y="365" name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://people.apache.org/~jsdelfino/tuscany/test/surface.py</property>
  </component>
+ <service name="random" promote="random"/>
+ <component t:x="43" t:y="208" name="random" t:title="rand" t:color="magenta1">
+  <t:implementation.python script="nuvem/random_.py"/>
+  <service name="random"/>
+ </component>
+ <service name="sin" promote="sin"/>
+ <component t:x="44" t:y="258" name="sin" t:title="sin" t:color="magenta1">
+  <t:implementation.python script="nuvem/sin_.py"/>
+  <service name="sin"/>
+  <reference target="number6" name="x"/>
+ </component>
+ <component t:x="70" t:y="258" name="number6" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0.5</property>
+ </component>
+ <service name="cos" promote="cos"/>
+ <component t:x="40" t:y="316" name="cos" t:title="cos" t:color="magenta1">
+  <t:implementation.python script="nuvem/cos_.py"/>
+  <service name="cos"/>
+  <reference target="number7" name="x"/>
+ </component>
+ <component t:x="81" t:y="316" name="number7" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0.5</property>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html b/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
index 5c7c7219bb..c2dc3a21c2 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
@@ -17,4 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test logic components</H2>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
index 3170a1a726..dc6a42753c 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
@@ -19,7 +19,7 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testsearch" name="testsearch">
  <service name="googlesearch" promote="googlesearch"/>
- <component t:x="72" t:y="31" name="googlesearch" t:title="google search" t:color="red1">
+ <component t:x="91" t:y="20" name="googlesearch" t:title="google" t:color="red1">
   <t:implementation.python script="nuvem/gsearch.py"/>
   <service name="googlesearch"/>
   <reference target="text" name="query"/>
@@ -27,13 +27,8 @@
    <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
   </reference>
  </component>
- <component t:x="173" t:y="31" name="text" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>apache+tuscany</property>
- </component>
  <service name="weather" promote="weather"/>
- <component t:x="76" t:y="95" name="weather" t:title="weather" t:color="red1">
+ <component t:x="92" t:y="70" name="weather" t:title="weather" t:color="red1">
   <t:implementation.python script="nuvem/gweather.py"/>
   <service name="weather"/>
   <reference target="number" name="zip"/>
@@ -41,13 +36,13 @@
    <t:binding.http uri="http://www.google.com/ig/api"/>
   </reference>
  </component>
- <component t:x="141" t:y="95" name="number" t:title="number" t:color="orange1">
+ <component t:x="141" t:y="95" name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>94070</property>
  </component>
  <service name="weather2" promote="weather2"/>
- <component t:x="76" t:y="162" name="weather2" t:title="weather" t:color="red1">
+ <component t:x="333" t:y="73" name="weather2" t:title="weather" t:color="red1">
   <t:implementation.python script="nuvem/gweather.py"/>
   <service name="weather"/>
   <reference target="text2" name="zip"/>
@@ -55,24 +50,24 @@
    <t:binding.http uri="http://www.google.com/ig/api"/>
   </reference>
  </component>
- <component t:x="141" t:y="162" name="text2" t:title="text" t:color="orange1">
+ <component t:x="141" t:y="162" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>94070</property>
  </component>
  <service name="get" promote="get"/>
- <component t:x="77" t:y="234" name="get" t:title="http get" t:color="green1">
+ <component t:x="43" t:y="348" name="get" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="141" t:y="234" name="text3" t:title="text" t:color="orange1">
+ <component t:x="141" t:y="234" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://maps.google.com/maps/api/staticmap?center=Brooklyn+Bridge,New+York,NY&amp;zoom=14&amp;size=512x512&amp;maptype=roadmap%20&amp;markers=color:blue|label:S|40.702147,-74.015794&amp;markers=color:green|label:G|40.711614,-74.012318%20&amp;markers=color:red|color:red|label:C|40.718217,-73.998284&amp;sensor=false</property>
  </component>
  <service name="googlemap" promote="googlemap"/>
- <component t:x="77" t:y="307" name="googlemap" t:title="google map" t:color="red1">
+ <component t:x="492" t:y="143" name="googlemap" t:title="google map" t:color="red1">
   <t:implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list2" name="locations"/>
@@ -81,7 +76,7 @@
   </reference>
  </component>
  <service name="googlemap2" promote="googlemap2"/>
- <component t:x="79" t:y="530" name="googlemap2" t:title="google map" t:color="red1">
+ <component t:x="90" t:y="144" name="googlemap2" t:title="google map" t:color="red1">
   <t:implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list3" name="locations"/>
@@ -89,105 +84,123 @@
    <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component t:x="218" t:y="529" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="pair4" name="value"/>
- </component>
- <component t:x="256" t:y="530" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>A</property>
+ <component t:x="300" t:y="391" name="number3" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>-122.260526</property>
  </component>
- <component t:x="219" t:y="596" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
-  <reference target="pair5" name="value"/>
+ <component t:x="303" t:y="659" name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <component t:x="254" t:y="594" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>B</property>
+ <component t:x="300" t:y="335" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <component t:x="300" t:y="391" name="number3" t:title="number" t:color="orange1">
+ <component t:x="300" t:y="363" name="number2" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>-122.260526</property>
+  <property>37.507156</property>
+ </component>
+ <component t:x="164" t:y="307" name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="202" t:y="308" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="list" name="value"/>
+  <property>A</property>
+ </component>
+ <component t:x="640" t:y="423" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text4" name="item" t:clonable="true"/>
+  <reference target="number2" name="item" t:clonable="true"/>
+  <reference target="number3" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="260" t:y="553" name="pair4" t:title="pair" t:color="yellow1">
+ <component t:x="208" t:y="532" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="pair4" name="value"/>
+  <property>A</property>
+ </component>
+ <component t:x="512" t:y="485" name="pair4" t:title="pair" t:color="yellow1">
   <t:implementation.python script="nuvem/pair.py"/>
   <service name="pair"/>
   <reference target="text7" name="name"/>
   <reference target="text5" name="value"/>
  </component>
- <component t:x="294" t:y="558" name="text7" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>yellow</property>
+ <component t:x="208" t:y="604" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="pair5" name="value"/>
+  <property>B</property>
  </component>
- <component t:x="254" t:y="658" name="pair5" t:title="pair" t:color="yellow1">
+ <component t:x="527" t:y="579" name="pair5" t:title="pair" t:color="yellow1">
   <t:implementation.python script="nuvem/pair.py"/>
   <service name="pair"/>
   <reference target="text8" name="name"/>
   <reference target="text6" name="value"/>
  </component>
- <component t:x="303" t:y="659" name="text8" t:title="text" t:color="orange1">
+ <component t:x="315" t:y="212" name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>green</property>
+  <property>yellow</property>
  </component>
- <component t:x="294" t:y="586" name="text5" t:title="text" t:color="orange1">
+ <component t:x="315" t:y="240" name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>San+Francisco,+CA</property>
+  <property>San Francisco, CA</property>
  </component>
- <component t:x="294" t:y="686" name="text6" t:title="text" t:color="orange1">
+ <component t:x="315" t:y="312" name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>San+Carlos,+CA</property>
+  <property>San Carlos, CA</property>
  </component>
- <component t:x="166" t:y="530" name="list3" t:title="list" t:color="yellow1">
+ <component t:x="161" t:y="212" name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
-  <reference target="pair3" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="252" t:y="307" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>A</property>
+ <service name="yahoosearch" promote="yahoosearch"/>
+ <component t:x="333" t:y="22" name="yahoosearch" t:title="yahoo" t:color="red1">
+  <t:implementation.python script="nuvem/ysearch.py"/>
+  <service name="yahoosearch"/>
+  <reference target="text9" name="query"/>
+  <reference name="s" t:visible="false">
+   <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
+  </reference>
  </component>
- <component t:x="300" t:y="335" name="text4" t:title="text" t:color="orange1">
+ <component t:x="682" t:y="231" name="text9" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>green</property>
+  <property>apache tuscany</property>
  </component>
- <component t:x="212" t:y="307" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="list" name="value"/>
- </component>
- <component t:x="252" t:y="335" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text4" name="item" t:clonable="true"/>
-  <reference target="number2" name="item" t:clonable="true"/>
-  <reference target="number3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="173" t:y="31" name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>apache tuscany</property>
  </component>
- <component t:x="300" t:y="363" name="number2" t:title="number" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>37.507156</property>
+ <component t:x="774" t:y="54" name="text10" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>apache tuscany</property>
  </component>
- <component t:x="164" t:y="307" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <service name="bingsearch" promote="bingsearch"/>
+ <component t:x="569" t:y="22" name="bingsearch" t:title="bing" t:color="red1">
+  <t:implementation.python script="nuvem/bsearch.py"/>
+  <service name="bingsearch"/>
+  <reference target="text10" name="query"/>
+  <reference name="s" t:visible="false">
+   <t:binding.http uri="http://www.bing.com/search"/>
+  </reference>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.html b/sca-cpp/trunk/modules/edit/apps/testsearch/app.html
new file mode 100644
index 0000000000..3760a04794
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.html
@@ -0,0 +1,24 @@
+<?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="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test search components</H1>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
index 4da0708d11..26642deccb 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
@@ -18,33 +18,7 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testsocial" name="testsocial">
- <service name="page" promote="page"/>
- <component t:x="68" t:y="4" name="page" t:title="when page opened" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="me360" name="content"/>
- </component>
- <component t:x="262" t:y="152" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="twprofile" name="value"/>
- </component>
- <component t:x="311" t:y="148" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>twprofile</property>
- </component>
- <component t:x="128" t:y="12" name="me360" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
-  <reference target="list3" name="value"/>
- </component>
- <service name="twtimeline" promote="twtimeline"/>
- <component t:x="366" t:y="233" name="twtimeline" t:title="twitter timeline" t:color="blue1">
+ <component t:x="485" t:y="164" name="twtimeline" t:title="twitter timeline" t:color="blue1">
   <t:implementation.python script="nuvem/twtimeline.py"/>
   <service name="twtimeline"/>
   <reference target="text2" name="id"/>
@@ -52,13 +26,7 @@
    <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
   </reference>
  </component>
- <component t:x="256" t:y="367" name="text5" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <service name="twfriends" promote="twfriends"/>
- <component t:x="367" t:y="288" name="twfriends" t:title="twitter friends" t:color="blue1">
+ <component t:x="477" t:y="201" name="twfriends" t:title="twitter friends" t:color="blue1">
   <t:implementation.python script="nuvem/twfriends.py"/>
   <service name="twfriends"/>
   <reference target="text4" name="id"/>
@@ -66,8 +34,7 @@
    <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
   </reference>
  </component>
- <service name="twfollowers" promote="twfollowers"/>
- <component t:x="369" t:y="344" name="twfollowers" t:title="twitter followers" t:color="blue1">
+ <component t:x="488" t:y="254" name="twfollowers" t:title="twitter followers" t:color="blue1">
   <t:implementation.python script="nuvem/twfollowers.py"/>
   <service name="twfollowers"/>
   <reference target="text5" name="id"/>
@@ -75,27 +42,27 @@
    <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
   </reference>
  </component>
- <component t:x="337" t:y="15" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>me360</property>
- </component>
- <component t:x="589" t:y="71" name="text" t:title="text" t:color="orange1">
+ <component t:x="589" t:y="71" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>100001053301307</property>
  </component>
- <component t:x="252" t:y="308" name="text4" t:title="text" t:color="orange1">
+ <component t:x="252" t:y="308" name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="745" t:y="149" name="text2" t:title="text" t:color="orange1">
+ <component t:x="745" t:y="149" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="376" t:y="164" name="twprofile" t:title="twitter profile" t:color="blue1">
+ <component t:x="493" t:y="132" name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
+ </component>
+ <component t:x="334" t:y="462" name="twprofile" t:title="twitter profile" t:color="blue1">
   <t:implementation.python script="nuvem/twprofile.py"/>
   <service name="twprofile"/>
   <reference target="text3" name="id"/>
@@ -103,35 +70,110 @@
    <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
   </reference>
  </component>
- <component t:x="493" t:y="132" name="text3" t:title="text" t:color="orange1">
+ <component t:x="626" t:y="77" name="fbprofile" t:title="facebook profile" t:color="blue1">
+  <t:implementation.python script="nuvem/fbprofile.py"/>
+  <service name="fbprofile"/>
+  <reference target="text" name="id"/>
+  <reference name="fb" t:visible="false">
+   <t:binding.http uri="https://graph.facebook.com"/>
+  </reference>
+ </component>
+ <component t:x="662" t:y="220" name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="284" t:y="32" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="204" t:y="35" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="list3" name="content"/>
+ </component>
+ <component t:x="393" t:y="35" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
   <reference target="fbprofile" name="value"/>
+  <property>name</property>
  </component>
- <component t:x="236" t:y="32" name="list3" t:title="list" t:color="yellow1">
+ <component t:x="393" t:y="79" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twprofile" name="value"/>
+  <property>twitprofile</property>
+ </component>
+ <component t:x="393" t:y="123" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twtimeline" name="value"/>
+  <property>twittimeline</property>
+ </component>
+ <component t:x="393" t:y="167" name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twfriends" name="value"/>
+  <property>twitfriends</property>
+ </component>
+ <component t:x="393" t:y="211" name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twfollowers" name="value"/>
+  <property>twitfollowers</property>
+ </component>
+ <component t:x="318" t:y="35" name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="324" t:y="32" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>fbprofile</property>
+ <component t:x="460" t:y="358" name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.2@gmail.com</property>
  </component>
- <component t:x="324" t:y="60" name="fbprofile" t:title="facebook profile" t:color="blue1">
-  <t:implementation.python script="nuvem/fbprofile.py"/>
-  <service name="fbprofile"/>
-  <reference target="text" name="id"/>
-  <reference name="fb" t:visible="false">
-   <t:binding.http uri="https://graph.facebook.com"/>
-  </reference>
+ <component t:x="582" t:y="431" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Hello, the time is {0}</property>
+ </component>
+ <component t:x="623" t:y="452" name="now" t:title="now" t:color="orange1">
+  <t:implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+ </component>
+ <component t:x="575" t:y="447" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="now" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="461" t:y="380" name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text7" name="pattern"/>
+  <reference target="list" name="values"/>
+ </component>
+ <service name="sendgtalk" promote="sendgtalk"/>
+ <component t:x="410" t:y="318" name="sendgtalk" t:title="gtalk" t:color="blue1">
+  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+  <service name="sendgtalk"/>
+  <reference target="text8" name="jid"/>
+  <reference target="text9" name="pass"/>
+  <reference target="text6" name="to"/>
+  <reference target="format" name="msg"/>
+ </component>
+ <component t:x="460" t:y="318" name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.1@gmail.com</property>
+ </component>
+ <component t:x="460" t:y="346" name="text9" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmpp4sca</property>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html b/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
index bd02e095b0..9630d36d0f 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
@@ -18,41 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="twprofile" class="table" style="position: absolute; top: 314px; left: 3px; ">
-  <TABLE class="datatable">
-   <TBODY>
-    <TR>
-     <TD>name</TD>
-     <TD>value</TD>
-    </TR>
-    <TR>
-     <TD>name</TD>
-     <TD>value</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="h1" class="h1" style="position: absolute; top: 6px; left: 0px; ">
-  <H1>My social profiles</H1>
- </SPAN>
- <SPAN id="fbsection" class="section" style="position: absolute; top: 51px; left: 3px; ">
-  <SPAN>Facebook profile</SPAN>
- </SPAN>
- <SPAN id="fbprofile" class="table" style="position: absolute; top: 88px; left: 3px; ">
-  <TABLE class="datatable">
-   <TBODY>
-    <TR>
-     <TD>name</TD>
-     <TD>value</TD>
-    </TR>
-    <TR>
-     <TD>name</TD>
-     <TD>value</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 281px; left: 0px; ">
-  <SPAN>Twitter profile</SPAN>
+ <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test social components</H1>
  </SPAN>
 </DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
index 9a9b41a939..56cde3999c 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
@@ -26,21 +26,21 @@
   <reference target="text9" name="string"/>
  </component>
  <service name="split" promote="split"/>
- <component t:x="36" t:y="152" name="split" t:title="split" t:color="magenta1">
+ <component t:x="34" t:y="140" name="split" t:title="split" t:color="magenta1">
   <t:implementation.python script="nuvem/split.py"/>
   <service name="split"/>
   <reference target="text11" name="separator"/>
   <reference target="text12" name="string"/>
  </component>
  <service name="join" promote="join"/>
- <component t:x="488" t:y="25" name="join" t:title="join" t:color="magenta1">
+ <component t:x="420" t:y="25" name="join" t:title="join" t:color="magenta1">
   <t:implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text6" name="separator"/>
   <reference target="list2" name="list"/>
  </component>
  <service name="replace" promote="replace"/>
- <component t:x="220" t:y="31" name="replace" t:title="replace" t:color="magenta1">
+ <component t:x="204" t:y="27" name="replace" t:title="replace" t:color="magenta1">
   <t:implementation.python script="nuvem/replace.py"/>
   <service name="replace"/>
   <reference target="text4" name="from"/>
@@ -48,63 +48,63 @@
   <reference target="text3" name="string"/>
  </component>
  <service name="lowercase" promote="lowercase"/>
- <component t:x="34" t:y="317" name="lowercase" t:title="lowercase" t:color="magenta1">
+ <component t:x="34" t:y="297" name="lowercase" t:title="lower" t:color="magenta1">
   <t:implementation.python script="nuvem/lowercase.py"/>
   <service name="lowercase"/>
   <reference target="text2" name="string"/>
  </component>
  <service name="uppercase" promote="uppercase"/>
- <component t:x="34" t:y="253" name="uppercase" t:title="uppercase" t:color="magenta1">
+ <component t:x="35" t:y="236" name="uppercase" t:title="upper" t:color="magenta1">
   <t:implementation.python script="nuvem/uppercase.py"/>
   <service name="uppercase"/>
   <reference target="text" name="string"/>
  </component>
- <component t:x="391" t:y="223" name="text" t:title="text" t:color="orange1">
+ <component t:x="391" t:y="223" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component t:x="391" t:y="150" name="text2" t:title="text" t:color="orange1">
+ <component t:x="391" t:y="150" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>ABC</property>
  </component>
- <component t:x="376" t:y="81" name="text3" t:title="text" t:color="orange1">
+ <component t:x="376" t:y="81" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcxdefxghi</property>
  </component>
- <component t:x="377" t:y="20" name="text4" t:title="text" t:color="orange1">
+ <component t:x="377" t:y="20" name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component t:x="376" t:y="63" name="text5" t:title="text" t:color="orange1">
+ <component t:x="376" t:y="63" name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>y</property>
  </component>
- <component t:x="107" t:y="56" name="text9" t:title="text" t:color="orange1">
+ <component t:x="107" t:y="56" name="text9" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcdef</property>
  </component>
- <component t:x="107" t:y="14" name="text10" t:title="text" t:color="orange1">
+ <component t:x="107" t:y="14" name="text10" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cd</property>
  </component>
- <component t:x="587" t:y="20" name="text6" t:title="text" t:color="orange1">
+ <component t:x="587" t:y="20" name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component t:x="85" t:y="156" name="text11" t:title="text" t:color="orange1">
+ <component t:x="85" t:y="156" name="text11" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component t:x="89" t:y="193" name="text12" t:title="text" t:color="orange1">
+ <component t:x="89" t:y="193" name="text12" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcxdefxghi</property>
@@ -116,31 +116,31 @@
   <reference target="text8" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="662" t:y="61" name="text7" t:title="text" t:color="orange1">
+ <component t:x="662" t:y="61" name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component t:x="655" t:y="98" name="text8" t:title="text" t:color="orange1">
+ <component t:x="655" t:y="98" name="text8" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>def</property>
  </component>
  <service name="format" promote="format"/>
- <component t:x="229" t:y="174" name="format" t:title="format" t:color="magenta1">
+ <component t:x="220" t:y="170" name="format" t:title="format" t:color="magenta1">
   <t:implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text13" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
  <service name="format2" promote="format2"/>
- <component t:x="492" t:y="189" name="format2" t:title="format" t:color="magenta1">
+ <component t:x="444" t:y="164" name="format2" t:title="format" t:color="magenta1">
   <t:implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text14" name="pattern"/>
   <reference target="list3" name="values"/>
  </component>
- <component t:x="365" t:y="194" name="text13" t:title="text" t:color="orange1">
+ <component t:x="365" t:y="194" name="text13" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>The {0} brown {1}</property>
@@ -152,17 +152,17 @@
   <reference target="text16" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="444" t:y="236" name="text15" t:title="text" t:color="orange1">
+ <component t:x="444" t:y="236" name="text15" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>quick</property>
  </component>
- <component t:x="438" t:y="274" name="text16" t:title="text" t:color="orange1">
+ <component t:x="438" t:y="274" name="text16" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>fox</property>
  </component>
- <component t:x="599" t:y="198" name="text14" t:title="text" t:color="orange1">
+ <component t:x="599" t:y="198" name="text14" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>The {a} brown {b}</property>
@@ -170,57 +170,47 @@
  <component t:x="603" t:y="239" name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="675" t:y="243" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="text17" name="value"/>
- </component>
- <component t:x="673" t:y="287" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="text18" name="value"/>
- </component>
- <component t:x="727" t:y="238" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>a</property>
- </component>
- <component t:x="727" t:y="326" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>b</property>
- </component>
- <component t:x="727" t:y="278" name="text17" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>quick</property>
- </component>
- <component t:x="727" t:y="366" name="text18" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>fox</property>
- </component>
  <service name="parse" promote="parse"/>
- <component t:x="35" t:y="378" name="parse" t:title="parse" t:color="magenta1">
+ <component t:x="218" t:y="325" name="parse" t:title="parse" t:color="magenta1">
   <t:implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference target="text19" name="regexp"/>
   <reference target="text20" name="string"/>
  </component>
- <component t:x="89" t:y="428" name="text20" t:title="text" t:color="orange1">
+ <component t:x="89" t:y="428" name="text20" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>city San Francisco state CA</property>
  </component>
- <component t:x="89" t:y="388" name="text19" t:title="text" t:color="orange1">
+ <component t:x="89" t:y="388" name="text19" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>city (.*) state (.*)</property>
  </component>
+ <component t:x="589" t:y="215" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text17" name="value"/>
+  <property>a</property>
+ </component>
+ <component t:x="840" t:y="241" name="text17" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>quick</property>
+ </component>
+ <component t:x="586" t:y="254" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text18" name="value"/>
+  <property>b</property>
+ </component>
+ <component t:x="837" t:y="299" name="text18" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>fox</property>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.html b/sca-cpp/trunk/modules/edit/apps/testtext/app.html
index 5c7c7219bb..99f719ef40 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.html
@@ -17,4 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test text processing components</H2>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
index e1998e1f46..6cda648ac1 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
@@ -19,39 +19,104 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testurl" name="testurl">
  <service name="host" promote="host"/>
- <component t:x="29" t:y="14" name="host" t:title="host" t:color="green1">
+ <component t:x="40" t:y="30" name="host" t:title="host" t:color="green1">
   <t:implementation.python script="nuvem/host.py"/>
   <service name="host"/>
   <property name="host"/>
  </component>
  <service name="path" promote="path"/>
- <component t:x="29" t:y="80" name="path" t:title="path" t:color="green1">
+ <component t:x="39" t:y="81" name="path" t:title="path" t:color="green1">
   <t:implementation.python script="nuvem/path.py"/>
   <service name="path"/>
   <property name="path"/>
  </component>
  <service name="params" promote="params"/>
- <component t:x="28" t:y="141" name="params" t:title="?params" t:color="green1">
+ <component t:x="41" t:y="133" name="params" t:title="?params" t:color="green1">
   <t:implementation.python script="nuvem/params.py"/>
   <service name="params"/>
   <property name="params"/>
  </component>
  <service name="user" promote="user"/>
- <component t:x="25" t:y="205" name="user" t:title="user" t:color="green1">
+ <component t:x="37" t:y="198" name="user" t:title="user" t:color="green1">
   <t:implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user"/>
  </component>
  <service name="realm" promote="realm"/>
- <component t:x="22" t:y="265" name="realm" t:title="realm" t:color="green1">
+ <component t:x="35" t:y="254" name="realm" t:title="realm" t:color="green1">
   <t:implementation.python script="nuvem/realm.py"/>
   <service name="realm"/>
   <property name="realm"/>
  </component>
  <service name="email" promote="email"/>
- <component t:x="26" t:y="328" name="email" t:title="email" t:color="green1">
+ <component t:x="35" t:y="316" name="email" t:title="email" t:color="green1">
   <t:implementation.python script="nuvem/email.py"/>
   <service name="email"/>
   <property name="email"/>
  </component>
+ <service name="url" promote="url"/>
+ <component t:x="162" t:y="36" name="url" t:title="url" t:color="green1">
+  <t:implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference target="text" name="address"/>
+  <reference target="list" name="args"/>
+ </component>
+ <component t:x="240" t:y="27" name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://sca-store.com/</property>
+ </component>
+ <component t:x="242" t:y="58" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text2" name="item" t:clonable="true"/>
+  <reference target="text3" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="280" t:y="61" name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test</property>
+ </component>
+ <component t:x="282" t:y="90" name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>path</property>
+ </component>
+ <component t:x="277" t:y="108" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text4" name="value"/>
+  <property>parmx</property>
+ </component>
+ <component t:x="276" t:y="169" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text5" name="value"/>
+  <property>parmy</property>
+ </component>
+ <component t:x="271" t:y="224" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number" name="value"/>
+  <property>parmn</property>
+ </component>
+ <component t:x="385" t:y="228" name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>123</property>
+ </component>
+ <component t:x="386" t:y="169" name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>yy</property>
+ </component>
+ <component t:x="386" t:y="110" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xx</property>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/app.html
index 5c7c7219bb..9641f58ba5 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.html
@@ -17,4 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test url components</H2>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
index 953363a750..8de688216a 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
@@ -19,157 +19,104 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testvalues" name="testvalues">
  <service name="name" promote="name"/>
- <component t:x="8" t:y="91" name="name" t:title="name" t:color="orange1">
+ <component t:x="36" t:y="152" name="name" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>abc</property>
  </component>
  <service name="true" promote="true"/>
- <component t:x="11" t:y="152" name="true" t:title="true" t:color="orange1">
+ <component t:x="34" t:y="204" name="true" t:title="true" t:color="orange1">
   <t:implementation.python script="nuvem/true_.py"/>
   <service name="true"/>
  </component>
  <service name="false" promote="false"/>
- <component t:x="6" t:y="205" name="false" t:title="false" t:color="orange1">
+ <component t:x="35" t:y="254" name="false" t:title="false" t:color="orange1">
   <t:implementation.python script="nuvem/false_.py"/>
   <service name="false"/>
  </component>
- <service name="find" promote="find"/>
- <component t:x="740" t:y="32" name="find" t:title="find by name" t:color="yellow1">
-  <t:implementation.python script="nuvem/find.py"/>
-  <service name="find"/>
+ <service name="lookup" promote="lookup"/>
+ <component t:x="128" t:y="399" name="lookup" t:title="lookup" t:color="yellow1">
+  <t:implementation.python script="nuvem/lookup.py"/>
+  <service name="lookup"/>
   <reference target="name3" name="name"/>
-  <reference target="list2" name="pair"/>
+  <reference target="list2" name="list"/>
  </component>
- <component t:x="283" t:y="351" name="name3" t:title="name" t:color="orange1">
+ <component t:x="283" t:y="351" name="name3" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>d</property>
  </component>
- <component t:x="420" t:y="390" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>a</property>
- </component>
- <component t:x="421" t:y="436" name="text3" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>abc</property>
- </component>
- <component t:x="495" t:y="486" name="name5" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>d</property>
- </component>
- <component t:x="787" t:y="217" name="text4" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>def</property>
- </component>
  <component t:x="433" t:y="37" name="range" t:title="range" t:color="yellow1">
   <t:implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
   <reference target="number4" name="first"/>
   <reference target="number5" name="last"/>
  </component>
- <component t:x="378" t:y="48" name="number4" t:title="number" t:color="orange1">
+ <component t:x="378" t:y="48" name="number4" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component t:x="378" t:y="90" name="number5" t:title="number" t:color="orange1">
+ <component t:x="378" t:y="90" name="number5" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
  <service name="first" promote="first"/>
- <component t:x="212" t:y="49" name="first" t:title="first item" t:color="yellow1">
+ <component t:x="179" t:y="34" name="first" t:title="first" t:color="yellow1">
   <t:implementation.python script="nuvem/first.py"/>
   <service name="first"/>
   <reference target="list7" name="list"/>
  </component>
  <service name="rest" promote="rest"/>
- <component t:x="475" t:y="41" name="rest" t:title="rest of list" t:color="yellow1">
+ <component t:x="362" t:y="35" name="rest" t:title="rest" t:color="yellow1">
   <t:implementation.python script="nuvem/rest.py"/>
   <service name="rest"/>
   <reference target="list" name="list"/>
  </component>
  <service name="empty" promote="empty"/>
- <component t:x="5" t:y="320" name="empty" t:title="empty list" t:color="yellow1">
+ <component t:x="29" t:y="362" name="empty" t:title="empty" t:color="yellow1">
   <t:implementation.python script="nuvem/empty.py"/>
   <service name="empty"/>
  </component>
  <service name="itemnb" promote="itemnb"/>
- <component t:x="121" t:y="178" name="itemnb" t:title="item number" t:color="yellow1">
+ <component t:x="123" t:y="147" name="itemnb" t:title="item #" t:color="yellow1">
   <t:implementation.python script="nuvem/itemnb.py"/>
   <service name="itemnb"/>
   <reference target="number8" name="index"/>
   <reference target="foreach" name="list"/>
  </component>
- <component t:x="208" t:y="187" name="number8" t:title="number" t:color="orange1">
+ <component t:x="208" t:y="187" name="number8" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3</property>
  </component>
- <component t:x="225" t:y="293" name="name2" t:title="name" t:color="orange1">
+ <component t:x="225" t:y="293" name="name2" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>nb</property>
  </component>
- <service name="reduce" promote="reduce"/>
- <component t:x="486" t:y="191" name="reduce" t:title="reduce" t:color="yellow1">
-  <t:implementation.python script="nuvem/reduce_.py"/>
-  <service name="reduce"/>
-  <reference target="name6" name="item"/>
-  <reference target="name7" name="accum"/>
-  <reference target="add" name="transform"/>
-  <reference target="range2" name="list"/>
- </component>
- <component t:x="449" t:y="259" name="name6" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>sum</property>
- </component>
- <component t:x="442" t:y="299" name="name7" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>i</property>
- </component>
- <component t:x="444" t:y="341" name="add" t:title="+" t:color="magenta1">
-  <t:implementation.python script="nuvem/add.py"/>
-  <service name="add">
-   <documentation>+</documentation>
-  </service>
-  <reference target="valueof2" name="value1"/>
-  <reference target="valueof3" name="value2"/>
- </component>
- <component t:x="444" t:y="437" name="range2" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
-  <service name="range"/>
-  <reference target="number9" name="first"/>
-  <reference target="number10" name="last"/>
- </component>
- <component t:x="498" t:y="437" name="number9" t:title="number" t:color="orange1">
+ <component t:x="498" t:y="437" name="number9" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component t:x="547" t:y="403" name="number10" t:title="number" t:color="orange1">
+ <component t:x="547" t:y="403" name="number10" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <component t:x="226" t:y="373" name="number6" t:title="number" t:color="orange1">
+ <component t:x="226" t:y="373" name="number6" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>2</property>
  </component>
- <component t:x="533" t:y="265" name="valueof2" t:title="value of" t:color="orange1">
+ <component t:x="533" t:y="265" name="valueof2" t:title="valueof" t:color="orange1">
   <t:implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>sum</property>
  </component>
- <component t:x="533" t:y="307" name="valueof3" t:title="value of" t:color="orange1">
+ <component t:x="533" t:y="307" name="valueof3" t:title="valueof" t:color="orange1">
   <t:implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>i</property>
@@ -182,7 +129,7 @@
   <reference target="valueof" name="value1"/>
   <reference target="number6" name="value2"/>
  </component>
- <component t:x="280" t:y="264" name="valueof" t:title="value of" t:color="orange1">
+ <component t:x="280" t:y="264" name="valueof" t:title="valueof" t:color="orange1">
   <t:implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>nb</property>
@@ -194,80 +141,312 @@
   <reference target="number3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="241" t:y="11" name="number2" t:title="number" t:color="orange1">
+ <component t:x="241" t:y="11" name="number2" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>123</property>
  </component>
- <component t:x="241" t:y="48" name="number3" t:title="number" t:color="orange1">
+ <component t:x="241" t:y="48" name="number3" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>456</property>
  </component>
  <service name="nothing" promote="nothing"/>
- <component t:x="7" t:y="260" name="nothing" t:title="nothing" t:color="orange1">
+ <component t:x="33" t:y="304" name="nothing" t:title="nothing" t:color="orange1">
   <t:implementation.python script="nuvem/nothing.py"/>
   <service name="nothing"/>
  </component>
- <component t:x="488" t:y="11" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="number" name="item" t:clonable="true"/>
-  <reference target="number7" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="558" t:y="6" name="number" t:title="number" t:color="orange1">
+ <component t:x="558" t:y="6" name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>12</property>
  </component>
- <component t:x="559" t:y="46" name="number7" t:title="number" t:color="orange1">
+ <component t:x="559" t:y="46" name="number7" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>34</property>
  </component>
- <component t:x="902" t:y="56" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name4" name="name"/>
+ <component t:x="252" t:y="352" name="reverse" t:title="reverse" t:color="yellow1">
+  <t:implementation.python script="nuvem/reverse.py"/>
+  <service name="reverse"/>
+  <reference target="range" name="list"/>
+ </component>
+ <component t:x="189" t:y="224" name="foreach" t:title="foreach" t:color="yellow1">
+  <t: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>
+ <component t:x="834" t:y="61" name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="833" t:y="32" name="name8" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>a.b</property>
+ </component>
+ <service name="search" promote="search"/>
+ <component t:x="734" t:y="33" name="search" t:title="search" t:color="yellow1">
+  <t:implementation.python script="nuvem/search.py"/>
+  <service name="search"/>
+  <reference target="name8" name="path"/>
+  <reference target="list3" name="list"/>
+ </component>
+ <component t:x="264" t:y="429" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
   <reference target="text3" name="value"/>
+  <property>a</property>
+ </component>
+ <component t:x="470" t:y="441" name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>abc</property>
  </component>
- <component t:x="896" t:y="137" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name5" name="name"/>
+ <component t:x="267" t:y="460" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
   <reference target="text4" name="value"/>
+  <property>d</property>
+ </component>
+ <component t:x="480" t:y="517" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>def</property>
+ </component>
+ <component t:x="935" t:y="92" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text5" name="value"/>
+  <property>ccc</property>
+ </component>
+ <component t:x="1255" t:y="126" name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>ccc</property>
+ </component>
+ <component t:x="938" t:y="127" name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text2" name="value"/>
+  <property>b</property>
+ </component>
+ <component t:x="1229" t:y="179" name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>bbb</property>
+ </component>
+ <component t:x="1037" t:y="559" name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>CCC</property>
+ </component>
+ <component t:x="1177" t:y="476" name="number11" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>123</property>
+ </component>
+ <component t:x="1230" t:y="253" name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>BBB</property>
+ </component>
+ <component t:x="1018" t:y="256" name="property7" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text6" name="value"/>
+  <property>b</property>
+ </component>
+ <component t:x="1020" t:y="286" name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number11" name="value"/>
+  <property>c</property>
+ </component>
+ <component t:x="941" t:y="334" name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text8" name="value"/>
+  <property>c</property>
+ </component>
+ <component t:x="941" t:y="227" name="property8" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="list4" name="value"/>
+  <property>a</property>
  </component>
- <component t:x="823" t:y="49" name="list2" t:title="list" t:color="yellow1">
+ <component t:x="1166" t:y="182" name="list4" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
-  <reference target="pair3" name="item" t:clonable="true"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="property6" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="252" t:y="352" name="reverse" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="range" name="list"/>
+ <component t:x="844" t:y="516" name="list5" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <service name="page" promote="page"/>
- <component t:x="0" t:y="26" name="page" t:title="when page opened" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="text" name="content"/>
+ <component t:x="972" t:y="531" name="list6" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="860" t:y="171" name="property9" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="list5" name="value"/>
+  <property>x</property>
+ </component>
+ <component t:x="542" t:y="28" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="number" name="item" t:clonable="true"/>
+  <reference target="number7" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <service name="list8" promote="list8"/>
+ <component t:x="550" t:y="351" name="list8" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property11" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="627" t:y="410" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>hello</property>
+ </component>
+ <component t:x="529" t:y="410" name="property11" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text7" name="value"/>
+  <property>entry</property>
+ </component>
+ <service name="list9" promote="list9"/>
+ <component t:x="408" t:y="458" name="list9" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property12" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="876" t:y="414" name="list10" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property13" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="128" t:y="26" name="text" t:title="text" t:color="orange1">
+ <component t:x="1013" t:y="414" name="text9" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>abc</property>
+ </component>
+ <component t:x="776" t:y="416" name="property12" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="list10" name="value"/>
+  <property>entry</property>
+ </component>
+ <component t:x="911" t:y="416" name="property13" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text9" name="value"/>
+  <property>test</property>
+ </component>
+ <service name="shuffle" promote="shuffle"/>
+ <component t:x="350" t:y="373" name="shuffle" t:title="shuffle" t:color="yellow1">
+  <t:implementation.python script="nuvem/shuffle_.py"/>
+  <service name="shuffle"/>
+  <reference target="range3" name="list"/>
+ </component>
+ <component t:x="565" t:y="389" name="number12" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
+ </component>
+ <component t:x="560" t:y="417" name="number13" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>10</property>
+ </component>
+ <component t:x="508" t:y="389" name="range3" t:title="range" t:color="yellow1">
+  <t:implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference target="number12" name="first"/>
+  <reference target="number13" name="last"/>
+ </component>
+ <component t:x="150" t:y="18" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xyz</property>
  </component>
- <component t:x="189" t:y="224" name="foreach" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name2" name="item"/>
-  <reference target="multiply" name="transform"/>
-  <reference target="reverse" name="list"/>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="42" t:y="35" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="text" name="content"/>
+ </component>
+ <component t:x="207" t:y="427" name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <service name="reduce2" promote="reduce2"/>
+ <component t:x="525" t:y="84" name="reduce2" t:title="reduce" t:color="yellow1">
+  <t:implementation.python script="nuvem/reduce_.py"/>
+  <service name="reduce"/>
+  <reference target="name6" name="item"/>
+  <reference target="name7" name="accum"/>
+  <reference target="add" name="transform"/>
+  <reference target="number14" name="init"/>
+  <reference target="range2" name="list"/>
+ </component>
+ <component t:x="571" t:y="500" name="name7" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>i</property>
+ </component>
+ <component t:x="567" t:y="526" name="add" t:title="+" t:color="magenta1">
+  <t:implementation.python script="nuvem/add.py"/>
+  <service name="add">
+   <documentation>+</documentation>
+  </service>
+  <reference target="valueof2" name="value1"/>
+  <reference target="valueof3" name="value2"/>
+ </component>
+ <component t:x="555" t:y="287" name="range2" t:title="range" t:color="yellow1">
+  <t:implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference target="number9" name="first"/>
+  <reference target="number10" name="last"/>
+ </component>
+ <component t:x="556" t:y="265" name="number14" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
+ </component>
+ <component t:x="552" t:y="146" name="name6" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>sum</property>
+ </component>
+ <component t:x="816" t:y="61" name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="list6" name="value"/>
+  <property>a</property>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html b/sca-cpp/trunk/modules/edit/apps/testvalues/app.html
index 0c832411d7..9ac6e55434 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.html
@@ -18,7 +18,10 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="value" class="h2" style="position: absolute; top: 17px; left: 4px; ">
-  <H2>Header2</H2>
+ <SPAN id="value" class="text" style="position: absolute; top: 63px; left: 2px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
+  <H2>Test values and lists</H2>
  </SPAN>
 </DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
index 479cfa67e4..27e93dc15f 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
@@ -18,192 +18,131 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testwidgets" name="testwidgets">
- <service name="page" promote="page"/>
- <component t:x="208" t:y="0" name="page" t:title="when page opens" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="pair8" name="content"/>
- </component>
- <component t:x="516" t:y="121" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="text" name="value"/>
- </component>
- <component t:x="571" t:y="121" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testh1</property>
+ <component t:x="708" t:y="619" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text9" name="value"/>
+  <property>testpath2</property>
  </component>
- <component t:x="571" t:y="161" name="text" t:title="text" t:color="orange1">
+ <component t:x="905" t:y="615" name="text9" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>test header 1</property>
+  <property>test path</property>
  </component>
- <component t:x="506" t:y="176" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testentry</property>
+ <component t:x="413" t:y="315" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="property" name="value"/>
+  <property>testpath1</property>
  </component>
- <component t:x="506" t:y="216" name="text3" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test entry field</property>
+ <component t:x="411" t:y="281" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text6" name="value"/>
+  <property>testimg</property>
  </component>
- <component t:x="458" t:y="392" name="text5" t:title="text" t:color="orange1">
+ <component t:x="927" t:y="304" name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>test checkbox</property>
+  <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property>
  </component>
- <component t:x="459" t:y="263" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testbutton</property>
+ <component t:x="410" t:y="247" name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text8" name="value"/>
+  <property>testtext</property>
  </component>
- <component t:x="458" t:y="302" name="text2" t:title="text" t:color="orange1">
+ <component t:x="790" t:y="441" name="text8" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>test button</property>
+  <property>test text</property>
  </component>
- <component t:x="458" t:y="352" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
+ <component t:x="411" t:y="210" name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text4" name="value"/>
   <property>testlink</property>
  </component>
- <component t:x="464" t:y="444" name="name5" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testimg</property>
+ <component t:x="842" t:y="340" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://tuscany.apache.org</property>
  </component>
- <component t:x="458" t:y="480" name="text6" t:title="text" t:color="orange1">
+ <component t:x="413" t:y="177" name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text5" name="value"/>
+  <property>testcheckbox</property>
+ </component>
+ <component t:x="790" t:y="336" name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property>
+  <property>test checkbox</property>
  </component>
- <component t:x="405" t:y="268" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
+ <component t:x="411" t:y="136" name="property7" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
   <reference target="text3" name="value"/>
+  <property>testentry</property>
  </component>
- <component t:x="407" t:y="355" name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name7" name="name"/>
-  <reference target="text5" name="value"/>
+ <component t:x="588" t:y="314" name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test entry field</property>
  </component>
- <component t:x="409" t:y="178" name="pair6" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
+ <component t:x="401" t:y="102" name="property8" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
   <reference target="text2" name="value"/>
+  <property>testbutton</property>
  </component>
- <component t:x="407" t:y="445" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name4" name="name"/>
-  <reference target="text4" name="value"/>
+ <component t:x="775" t:y="212" name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test button</property>
  </component>
- <component t:x="461" t:y="87" name="name6" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
+ <component t:x="411" t:y="66" name="property9" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text7" name="value"/>
   <property>testsection</property>
  </component>
- <component t:x="458" t:y="128" name="text7" t:title="text" t:color="orange1">
+ <component t:x="780" t:y="147" name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test section</property>
  </component>
- <component t:x="458" t:y="352" name="name7" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testcheckbox</property>
- </component>
- <component t:x="385" t:y="0" name="name8" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>test</property>
- </component>
- <component t:x="460" t:y="660" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name5" name="name"/>
-  <reference target="text6" name="value"/>
- </component>
- <component t:x="460" t:y="569" name="pair9" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name9" name="name"/>
-  <reference target="text8" name="value"/>
- </component>
- <component t:x="102" t:y="92" name="name9" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testtext</property>
+ <component t:x="406" t:y="28" name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text" name="value"/>
+  <property>testh1</property>
  </component>
- <component t:x="105" t:y="132" name="text8" t:title="text" t:color="orange1">
+ <component t:x="748" t:y="92" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>test text</property>
- </component>
- <component t:x="458" t:y="128" name="pair7" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name6" name="name"/>
-  <reference target="text7" name="value"/>
- </component>
- <component t:x="330" t:y="0" name="pair8" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name8" name="name"/>
-  <reference target="list" name="value"/>
+  <property>test header 1</property>
  </component>
- <component t:x="385" t:y="40" name="list" t:title="list" t:color="yellow1">
+ <component t:x="308" t:y="37" name="list" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair7" name="item" t:clonable="true"/>
-  <reference target="pair6" name="item" t:clonable="true"/>
-  <reference target="pair3" name="item" t:clonable="true"/>
-  <reference target="pair5" name="item" t:clonable="true"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
-  <reference target="pair9" name="item" t:clonable="true"/>
-  <reference target="pair4" name="item" t:clonable="true"/>
-  <reference target="pair10" name="item" t:clonable="true"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="property6" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="513" t:y="520" name="text4" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://tuscany.apache.org</property>
- </component>
- <component t:x="515" t:y="541" name="name10" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testpath1</property>
- </component>
- <component t:x="512" t:y="568" name="pair11" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name11" name="name"/>
-  <reference target="text9" name="value"/>
- </component>
- <component t:x="571" t:y="567" name="name11" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testpath2</property>
- </component>
- <component t:x="567" t:y="596" name="text9" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test path</property>
- </component>
- <component t:x="457" t:y="540" name="pair10" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name10" name="name"/>
-  <reference target="pair11" name="value"/>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="208" t:y="18" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="list" name="content"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html
index ee20dcef38..ce561f3a98 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html
@@ -18,15 +18,9 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="testh1" class="h1" style="position: absolute; top: 6px; left: 9px; ">
-  <H1>Header1</H1>
- </SPAN>
  <SPAN id="testbutton" class="button" style="position: absolute; top: 97px; left: 9px; ">
   <INPUT type="button" value="button"/>
  </SPAN>
- <SPAN id="testentry" class="entry" style="position: absolute; top: 135px; left: 15px; ">
-  <INPUT type="text" value="field" size="5"/>
- </SPAN>
  <SPAN id="testsection" class="section" style="position: absolute; top: 52px; left: 10px; ">
   <SPAN>section</SPAN>
  </SPAN>
@@ -42,20 +36,26 @@
    <SPAN>link</SPAN>
   </A>
  </SPAN>
- <SPAN id="testlink3" class="link" style="position: absolute; top: 142px; left: 256px; ">
+ <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 282px; left: 17px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; ">
+  <H1>Header1</H1>
+ </SPAN>
+ <SPAN id="testlink3" class="link" style="position: absolute; top: 225px; left: 263px; ">
   <A href="http://www.apache.org">
    <SPAN> Apache</SPAN>
   </A>
  </SPAN>
- <SPAN id="testlink2" class="link" style="position: absolute; top: 105px; left: 256px; ">
+ <SPAN id="testlink2" class="link" style="position: absolute; top: 189px; left: 263px; ">
   <A href="http://www.apache.org/">
    <SPAN>http://www.apache.org/</SPAN>
   </A>
  </SPAN>
- <SPAN id="testimg" class="img" style="position: absolute; top: 12px; left: 252px; ">
+ <SPAN id="testimg" class="img" style="position: absolute; top: 90px; left: 263px; ">
   <IMG src="/public/img.png"/>
  </SPAN>
- <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 282px; left: 17px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; ">
+  <INPUT type="text" value="field" size="20" autocapitalize="off"/>
  </SPAN>
 </DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
index 133b214b92..1fc61a4f22 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
@@ -18,148 +18,113 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testwidgets2" name="testwidgets2">
- <component t:x="77" t:y="95" name="text" t:title="text" t:color="orange1">
+ <component t:x="449" t:y="389" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>test value</property>
- </component>
- <component t:x="74" t:y="10" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testlist1</property>
+  <property>http://www.apache.org/</property>
  </component>
- <service name="page" promote="page"/>
- <component t:x="109" t:y="0" name="page" t:title="when page opens" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="list" name="content"/>
+ <component t:x="735" t:y="335" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Apache</property>
  </component>
- <component t:x="305" t:y="202" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="text" name="value"/>
+ <component t:x="645" t:y="457" name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.cnn.com</property>
  </component>
- <component t:x="355" t:y="129" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testlist2</property>
+ <component t:x="271" t:y="276" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text5" name="value"/>
+  <property>testframe</property>
  </component>
- <component t:x="355" t:y="177" name="list2" t:title="list" t:color="yellow1">
+ <component t:x="631" t:y="388" name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair3" name="item" t:clonable="true"/>
-  <reference target="pair4" name="item" t:clonable="true"/>
+  <reference target="text3" name="item" t:clonable="true"/>
+  <reference target="text4" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="435" t:y="165" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
-  <reference target="number" name="value"/>
- </component>
- <component t:x="486" t:y="167" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>a</property>
- </component>
- <component t:x="493" t:y="201" name="number" t:title="number" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>1</property>
- </component>
- <component t:x="435" t:y="256" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name4" name="name"/>
-  <reference target="number2" name="value"/>
- </component>
- <component t:x="488" t:y="288" name="number2" t:title="number" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>2</property>
- </component>
- <component t:x="303" t:y="126" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="list2" name="value"/>
- </component>
- <component t:x="482" t:y="251" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>b</property>
- </component>
- <component t:x="230" t:y="38" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
-  <reference target="pair5" name="item" t:clonable="true"/>
-  <reference target="pair6" name="item" t:clonable="true"/>
-  <reference target="pair7" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="272" t:y="183" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="list3" name="value"/>
+  <property>testlink</property>
  </component>
- <component t:x="312" t:y="294" name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name5" name="name"/>
+ <component t:x="270" t:y="147" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
   <reference target="text2" name="value"/>
- </component>
- <component t:x="377" t:y="292" name="name5" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
   <property>testhtml</property>
  </component>
- <component t:x="370" t:y="322" name="text2" t:title="text" t:color="orange1">
+ <component t:x="695" t:y="243" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>&lt;b&gt;test bold text&lt;/b&gt;</property>
  </component>
- <component t:x="315" t:y="362" name="pair6" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name6" name="name"/>
-  <reference target="list3" name="value"/>
- </component>
- <component t:x="371" t:y="362" name="name6" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testlink</property>
+ <component t:x="271" t:y="0" name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text" name="value"/>
+  <property>testlist1</property>
  </component>
- <component t:x="449" t:y="389" name="text3" t:title="text" t:color="orange1">
+ <component t:x="677" t:y="49" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>http://www.apache.org/</property>
+  <property>test value</property>
  </component>
- <component t:x="369" t:y="387" name="list3" t:title="list" t:color="yellow1">
+ <component t:x="271" t:y="34" name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="list4" name="value"/>
+  <property>testlist2</property>
+ </component>
+ <component t:x="672" t:y="111" name="list4" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text3" name="item" t:clonable="true"/>
-  <reference target="text4" name="item" t:clonable="true"/>
+  <reference target="property6" name="item" t:clonable="true"/>
+  <reference target="property7" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="735" t:y="335" name="text4" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Apache</property>
+ <component t:x="709" t:y="109" name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number3" name="value"/>
+  <property>a</property>
  </component>
- <component t:x="319" t:y="478" name="pair7" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name7" name="name"/>
-  <reference target="text5" name="value"/>
+ <component t:x="780" t:y="107" name="number3" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>1</property>
  </component>
- <component t:x="370" t:y="440" name="name7" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testframe</property>
+ <component t:x="781" t:y="137" name="number4" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>2</property>
  </component>
- <component t:x="379" t:y="471" name="text5" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.cnn.com</property>
+ <component t:x="710" t:y="142" name="property7" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number4" name="value"/>
+  <property>b</property>
+ </component>
+ <component t:x="326" t:y="32" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="212" t:y="33" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="list" name="content"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
index 4e246df55e..b20cf24c02 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
@@ -18,66 +18,69 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="testtable1" class="table" style="position: absolute; top: 19px; left: 121px; ">
-  <TABLE class="datatable">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
+  <H2>Test widget components</H2>
+ </SPAN>
+ <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; left: 20px; ">
+  <TABLE class="datatable" style="width: 200px;">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="testlist" class="list" style="position: absolute; top: 20px; left: 15px; ">
-  <SELECT>
-   <OPTION>list</OPTION>
-  </SELECT>
- </SPAN>
- <SPAN id="testtable2" class="table" style="position: absolute; top: 115px; left: 122px; ">
-  <TABLE class="datatable">
+ <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; left: 20px; ">
+  <TABLE class="datatable" style="width: 200px;">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 124px; ">
-  <TABLE class="datatable">
+ <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 20px; ">
+  <TABLE class="datatable" style="width: 200px;">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="testhtml" class="text" style="position: absolute; top: 18px; left: 297px; ">
+ <SPAN id="testhtml" class="text" style="position: absolute; top: 234px; left: 20px; ">
   <SPAN>text</SPAN>
  </SPAN>
- <SPAN id="testlink" class="link" style="position: absolute; top: 90px; left: 302px; ">
+ <SPAN id="testlink" class="link" style="position: absolute; top: 270px; left: 20px; ">
   <A href="/">
    <SPAN>link</SPAN>
   </A>
  </SPAN>
- <SPAN id="testframe" class="iframe" style="position: absolute; top: 142px; left: 301px; ">
+ <SPAN id="testframe" class="iframe" style="position: absolute; top: 306px; left: 20px; ">
   <A href="/public/iframe.html">
    <SPAN class="fakeframe">
     <SPAN>frame ...</SPAN>
    </SPAN>
   </A>
  </SPAN>
+ <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; ">
+  <SELECT>
+   <OPTION>select</OPTION>
+  </SELECT>
+ </SPAN>
 </DIV>
diff --git a/sca-cpp/trunk/modules/edit/dashboards/jane@localhost b/sca-cpp/trunk/modules/edit/dashboards/jane@localhost
index f78bc0b38e..402b4260e4 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/jane@localhost
+++ b/sca-cpp/trunk/modules/edit/dashboards/jane@localhost
@@ -1 +1 @@
-((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 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 "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme")) (entry (title "An app that returns somebody's Buzz profile") (id "buzzprofile")))
+((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 "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 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")))
diff --git a/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com b/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com
index f78bc0b38e..402b4260e4 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com
+++ b/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com
@@ -1 +1 @@
-((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 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 "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme")) (entry (title "An app that returns somebody's Buzz profile") (id "buzzprofile")))
+((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 "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 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")))
diff --git a/sca-cpp/trunk/modules/edit/dashboards/joe@localhost b/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
index f78bc0b38e..402b4260e4 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
+++ b/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
@@ -1 +1 @@
-((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 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 "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme")) (entry (title "An app that returns somebody's Buzz profile") (id "buzzprofile")))
+((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 "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 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")))
diff --git a/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com b/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com
index f78bc0b38e..402b4260e4 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com
+++ b/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com
@@ -1 +1 @@
-((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 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 "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme")) (entry (title "An app that returns somebody's Buzz profile") (id "buzzprofile")))
+((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 "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 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")))
diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
new file mode 100644
index 0000000000..fbc27c0bfe
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
@@ -0,0 +1,78 @@
+<?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"
+  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
+  targetNamespace="http://control"
+  name="palette">
+        
+    <service name="appstart" promote="appstart"/>
+    <service name="appstop" promote="appstop"/>
+    <service name="service" promote="service"/>
+    <service name="every" promote="every"/>
+    <service name="geolocation" promote="geolocation"/>
+    <service name="call" promote="call"/>
+
+    <component name="appstart" t:title="start" t:color="green1">
+        <t:implementation.python script="nuvem/appstart.py"/>
+        <service name="appstart" t:visible="false">
+            <t:binding.http uri="appstart"/>
+        </service>
+        <reference name="content"/>
+    </component>
+    
+    <component name="appstop" t:title="stop" t:color="green1">
+        <t:implementation.python script="nuvem/appstop.py"/>
+        <service name="appstop" t:visible="false">
+            <t:binding.http uri="appstop"/>
+        </service>
+        <reference name="content"/>
+    </component>
+    
+    <component name="service" t:title="{compname}" t:color="green1">
+        <t:implementation.python script="nuvem/service.py"/>
+        <service name="service" t:visible="false"/>
+        <reference name="content"/>
+    </component>
+    
+    <component name="every" t:title="timer" t:color="green1">
+        <t:implementation.python script="nuvem/every.py"/>
+        <service name="every" t:visible="false">
+            <t:binding.http uri="every"/>
+        </service>
+        <reference name="n"/>
+        <reference name="content"/>
+    </component>
+    
+    <component name="geolocation" t:title="location" t:color="green1">
+        <t:implementation.python script="nuvem/geolocation.py"/>
+        <service name="geolocation" t:visible="false">
+            <t:binding.http uri="geolocation"/>
+        </service>
+        <reference name="content"/>
+    </component>
+    
+    <component name="call" t:title="call" t:color="green1">
+        <t:implementation.python script="nuvem/call.py"/>
+        <service name="call"/>
+        <reference name="name"/>
+        <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+    </component>
+    
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
index 2b37912ed4..f9dab736f8 100644
--- a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
@@ -30,35 +30,35 @@
     <service name="put" promote="put"/>
     <service name="delete" promote="delete"/>
 
-    <component name="filedb" t:title="File database" t:color="green1">
+    <component name="filedb" t:title="file" t:color="red1">
         <t:implementation.python script="nuvem/filedb.py"/>
         <service name="filedb"/>
         <reference name="db" target="AppDataFileCache" t:visible="false"/>
         <property name="host" t:visible="false"/>
     </component>
     
-    <component name="nosqldb" t:title="Indexed database" t:color="green1">
+    <component name="nosqldb" t:title="index **" t:color="red1">
         <t:implementation.python script="nuvem/nosqldb.py"/>
         <service name="nosqldb"/>
         <reference name="db" target="AppDataNoSQLCache" t:visible="false"/>
         <property name="host" t:visible="false"/>
     </component>
     
-    <component name="sqldb" t:title="SQL database" t:color="green1">
+    <component name="sqldb" t:title="sql **" t:color="red1">
         <t:implementation.python script="nuvem/sqldb.py"/>
         <service name="sqldb"/>
         <reference name="db" target="AppDataSQLCache" t:visible="false"/>
         <property name="host" t:visible="false"/>
     </component>
     
-    <component name="get" t:title="get" t:color="green1">
+    <component name="get" t:title="get" t:color="red1">
         <t:implementation.python script="nuvem/get.py"/>
         <service name="get"/>
         <reference name="collection"/>
         <reference name="id"/>
     </component>
     
-    <component name="post" t:title="post" t:color="green1">
+    <component name="post" t:title="post" t:color="red1">
         <t:implementation.python script="nuvem/post.py"/>
         <service name="post"/>
         <reference name="collection"/>
@@ -66,7 +66,7 @@
         <reference name="value"/>
     </component>
     
-    <component name="put" t:title="put" t:color="green1">
+    <component name="put" t:title="put" t:color="red1">
         <t:implementation.python script="nuvem/put.py"/>
         <service name="put"/>
         <reference name="collection"/>
@@ -74,7 +74,7 @@
         <reference name="value"/>
     </component>
     
-    <component name="delete" t:title="delete" t:color="green1">
+    <component name="delete" t:title="delete" t:color="red1">
         <t:implementation.python script="nuvem/delete.py"/>
         <service name="delete"/>
         <reference name="collection"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite b/sca-cpp/trunk/modules/edit/palettes/event/palette.composite
deleted file mode 100644
index 51675139aa..0000000000
--- a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://event"
-  name="palette">
-        
-    <service name="page" promote="page"/>
-    <service name="widget" promote="widget"/>
-    <service name="every" promote="every"/>
-    <service name="location" promote="location"/>
-
-    <component name="page" t:title="when page opens" t:color="green1">
-        <t:implementation.python script="nuvem/page.py"/>
-        <service name="page" t:visible="false">
-            <t:binding.http uri="page"/>
-        </service>
-        <reference name="content"/>
-    </component>
-    
-    <component name="widget" t:title="on {compname} widget" t:color="green1">
-        <t:implementation.python script="nuvem/widget.py"/>
-        <service name="widget" t:visible="false"/>
-        <reference name="content"/>
-    </component>
-    
-    <component name="every" t:title="every n millisec" t:color="green1">
-        <t:implementation.python script="nuvem/every.py"/>
-        <service name="every" t:visible="false">
-            <t:binding.http uri="every"/>
-        </service>
-        <reference name="n"/>
-        <reference name="content"/>
-    </component>
-    
-    <component name="location" t:title="on location change" t:color="green1">
-        <t:implementation.python script="nuvem/location.py"/>
-        <service name="location" t:visible="false">
-            <t:binding.http uri="location"/>
-        </service>
-        <reference name="content"/>
-    </component>
-    
-</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
index fc6ba48a55..317cf338ed 100644
--- a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
@@ -28,6 +28,7 @@
     <service name="param" promote="param"/>
     <service name="user" promote="user"/>
     <service name="email" promote="email"/>
+    <service name="url" promote="url"/>
     <service name="get" promote="get"/>
     <service name="post" promote="post"/>
     <service name="put" promote="put"/>
@@ -54,7 +55,7 @@
     <component name="param" t:title="?param" t:color="green1">
         <t:implementation.python script="nuvem/param.py"/>
         <service name="param"/>
-        <reference name="name"/>
+        <property name="name">x</property>
         <property name="query" t:visible="false"></property>
     </component>
     
@@ -70,27 +71,34 @@
         <property name="email" t:visible="false"></property>
     </component>
     
-    <component name="get" t:title="http get" t:color="green1">
+    <component name="url" t:title="url" t:color="green1">
+        <t:implementation.python script="nuvem/url.py"/>
+        <service name="url"/>
+        <reference name="address"/>
+        <reference name="args"/>
+    </component>
+    
+    <component name="get" t:title="get" t:color="green1">
         <implementation.cpp path="lib/http" library="libhttpget"/>
         <service name="get"/>
         <reference name="url"/>
     </component>
     
-    <component name="post" t:title="http post **" t:color="green1">
+    <component name="post" t:title="post **" t:color="green1">
         <implementation.cpp path="lib/http" library="libhttppost"/>
         <service name="post"/>
         <reference name="url"/>
         <reference name="content"/>
     </component>
     
-    <component name="put" t:title="http put **" t:color="green1">
+    <component name="put" t:title="put **" t:color="green1">
         <implementation.cpp path="lib/http" library="libhttpput"/>
         <service name="put"/>
         <reference name="url"/>
         <reference name="content"/>
     </component>
     
-    <component name="delete" t:title="http delete **" t:color="green1">
+    <component name="delete" t:title="delete" t:color="green1">
         <implementation.cpp path="lib/http" library="libhttpdelete"/>
         <service name="delete"/>
         <reference name="url"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/list/palette.composite b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
index 36cde72a17..2272a107c7 100644
--- a/sca-cpp/trunk/modules/edit/palettes/list/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
@@ -19,17 +19,23 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://list"
+  targetNamespace="http://lists"
   name="palette">
         
     <service name="pair" promote="pair"/>
     <service name="list" promote="list"/>
     <service name="first" promote="first"/>
     <service name="rest" promote="rest"/>
+    <service name="second" promote="second"/>
+    <service name="last" promote="last"/>
     <service name="empty" promote="empty"/>
+    <service name="insert" promote="insert"/>
     <service name="append" promote="append"/>
     <service name="itemnb" promote="itemnb"/>
-    <service name="find" promote="find"/>
+    <service name="lookup" promote="lookup"/>
+    <service name="search" promote="search"/>
+    <service name="names" promote="names"/>
+    <service name="values" promote="values"/>
     <service name="range" promote="range"/>
 
     <component name="pair" t:title="pair" t:color="yellow1">
@@ -45,42 +51,80 @@
         <reference name="item" t:clonable="true"/>
     </component>
     
-    <component name="first" t:title="first item" t:color="yellow1">
+    <component name="first" t:title="first" t:color="yellow1">
         <t:implementation.python script="nuvem/first.py"/>
         <service name="first"/>
         <reference name="list"/>
     </component>
     
-    <component name="rest" t:title="rest of list" t:color="yellow1">
+    <component name="rest" t:title="rest" t:color="yellow1">
         <t:implementation.python script="nuvem/rest.py"/>
         <service name="rest"/>
         <reference name="list"/>
     </component>
     
-    <component name="empty" t:title="empty list" t:color="yellow1">
+    <component name="second" t:title="second" t:color="yellow1">
+        <t:implementation.python script="nuvem/second.py"/>
+        <service name="second"/>
+        <reference name="list"/>
+    </component>
+    
+    <component name="last" t:title="last" t:color="yellow1">
+        <t:implementation.python script="nuvem/last.py"/>
+        <service name="last"/>
+        <reference name="list"/>
+    </component>
+    
+    <component name="empty" t:title="empty" t:color="yellow1">
         <t:implementation.python script="nuvem/empty.py"/>
         <service name="empty"/>
     </component>
     
-    <component name="append" t:title="append" t:color="yellow1">
+    <component name="insert" t:title="insert" t:color="yellow1">
+        <t:implementation.python script="nuvem/insert.py"/>
+        <service name="insert"/>
+        <reference name="value"/>
+        <reference name="list"/>
+    </component>
+    
+    <component name="append" t:title="+" t:color="yellow1">
         <t:implementation.python script="nuvem/append.py"/>
         <service name="append"/>
         <reference name="first"/>
         <reference name="second"/>
     </component>
     
-    <component name="itemnb" t:title="item number" t:color="yellow1">
+    <component name="itemnb" t:title="item #" t:color="yellow1">
         <t:implementation.python script="nuvem/itemnb.py"/>
         <service name="itemnb"/>
         <reference name="index"/>
         <reference name="list"/>
     </component>
     
-    <component name="find" t:title="find by name" t:color="yellow1">
-        <t:implementation.python script="nuvem/find.py"/>
-        <service name="find"/>
+    <component name="lookup" t:title="lookup" t:color="yellow1">
+        <t:implementation.python script="nuvem/lookup.py"/>
+        <service name="lookup"/>
         <reference name="name"/>
-        <reference name="assoc"/>
+        <reference name="list"/>
+    </component>
+    
+    <component name="search" t:title="search" t:color="yellow1">
+        <t:implementation.python script="nuvem/search.py"/>
+        <service name="search"/>
+        <reference name="path"/>
+        <reference name="list"/>
+    </component>
+    
+    <component name="names" t:title="names" t:color="yellow1">
+        <t:implementation.python script="nuvem/names.py"/>
+        <service name="names"/>
+        <reference name="list"/>
+    </component>
+    
+    <component name="values" t:title="values" t:color="yellow1">
+        <t:implementation.python script="nuvem/values.py"/>
+        <service name="values"/>
+        <reference name="list"/>
     </component>
     
     <component name="range" t:title="range" t:color="yellow1">
diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
index d3c99d74c4..f835d8df03 100644
--- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
@@ -27,8 +27,15 @@
     <service name="add" promote="add"/>
     <service name="subtract" promote="subtract"/>
     <service name="distance" promote="distance"/>
+    <service name="random" promote="random"/>
+    <service name="sin" promote="sin"/>
+    <service name="cos" promote="cos"/>
+    <service name="round" promote="round"/>
+    <service name="sum" promote="sum"/>
+    <service name="min" promote="min"/>
+    <service name="max" promote="max"/>
 
-    <component name="multiply" t:title="multiply" t:color="magenta1">
+    <component name="multiply" t:title="*" t:color="magenta1">
         <t:implementation.python script="nuvem/multiply.py"/>
         <service name="multiply">
             <documentation>*</documentation>
@@ -37,7 +44,7 @@
         <reference name="value2"/>
     </component>
     
-    <component name="divide" t:title="divide" t:color="magenta1">
+    <component name="divide" t:title="/" t:color="magenta1">
         <t:implementation.python script="nuvem/divide.py"/>
         <service name="divide">
             <documentation>/</documentation>
@@ -46,7 +53,7 @@
         <reference name="value2"/>
     </component>
     
-    <component name="add" t:title="add" t:color="magenta1">
+    <component name="add" t:title="+" t:color="magenta1">
         <t:implementation.python script="nuvem/add.py"/>
         <service name="add">
             <documentation>+</documentation>
@@ -55,7 +62,7 @@
         <reference name="value2"/>
     </component>
     
-    <component name="subtract" t:title="subtract" t:color="magenta1">
+    <component name="subtract" t:title="-" t:color="magenta1">
         <t:implementation.python script="nuvem/subtract.py"/>
         <service name="subtract">
             <documentation>-</documentation>
@@ -71,4 +78,46 @@
         <reference name="location2"/>
     </component>
     
+    <component name="random" t:title="rand" t:color="magenta1">
+        <t:implementation.python script="nuvem/random_.py"/>
+        <service name="random"/>
+    </component>
+    
+    <component name="sin" t:title="sin" t:color="magenta1">
+        <t:implementation.python script="nuvem/sin_.py"/>
+        <service name="sin"/>
+        <reference name="x"/>
+    </component>
+    
+    <component name="cos" t:title="cos" t:color="magenta1">
+        <t:implementation.python script="nuvem/cos_.py"/>
+        <service name="cos"/>
+        <reference name="x"/>
+    </component>
+    
+    <component name="round" t:title="round" t:color="magenta1">
+        <t:implementation.python script="nuvem/round_.py"/>
+        <service name="round"/>
+        <reference name="n"/>
+        <reference name="x"/>
+    </component>
+    
+    <component name="sum" t:title="sum" t:color="magenta1">
+        <t:implementation.python script="nuvem/sum_.py"/>
+        <service name="sum"/>
+        <reference name="l"/>
+    </component>
+    
+    <component name="min" t:title="min" t:color="magenta1">
+        <t:implementation.python script="nuvem/min_.py"/>
+        <service name="min"/>
+        <reference name="l"/>
+    </component>
+    
+    <component name="max" t:title="max" t:color="magenta1">
+        <t:implementation.python script="nuvem/max_.py"/>
+        <service name="max"/>
+        <reference name="l"/>
+    </component>
+    
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
index d6b8ebcaaf..2cabac1a26 100644
--- a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
@@ -25,14 +25,14 @@
     <service name="eval" promote="eval"/>
     <service name="exec" promote="exec"/>
 
-    <component name="eval" t:title="py expr" t:color="magenta1">
+    <component name="eval" t:title="expr" t:color="magenta1">
         <t:implementation.python script="nuvem/eval_.py"/>
         <service name="eval"/>
         <reference name="py"/>
         <reference name="ref"/>
     </component>
     
-    <component name="exec" t:title="py script" t:color="magenta1">
+    <component name="exec" t:title="script" t:color="magenta1">
         <t: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 d6e4a0fa1e..04cc674962 100644
--- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
@@ -26,10 +26,11 @@
     <service name="yahoosearch" promote="yahoosearch"/>
     <service name="bingsearch" promote="bingsearch"/>
     <service name="googlemap" promote="googlemap"/>
+    <service name="googleimages" promote="googleimages"/>
     <service name="weather" promote="weather"/>
     <service name="traffic" promote="traffic"/>
 
-    <component name="googlesearch" t:title="google search" t:color="red1">
+    <component name="googlesearch" t:title="google" t:color="red1">
         <t:implementation.python script="nuvem/gsearch.py"/>
         <service name="googlesearch"/>
         <reference name="query"/>
@@ -38,16 +39,22 @@
         </reference>
     </component>
     
-    <component name="yahoosearch" t:title="yahoo search **" t:color="red1">
-        <t:implementation.python script="nuvem/yahoosearch.py"/>
+    <component name="yahoosearch" t:title="yahoo" t:color="red1">
+        <t:implementation.python script="nuvem/ysearch.py"/>
         <service name="yahoosearch"/>
         <reference name="query"/>
+        <reference name="s" t:visible="false">
+            <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
+        </reference>
     </component>
     
-    <component name="bingsearch" t:title="bing search **" t:color="red1">
-        <t:implementation.python script="nuvem/bingsearch.py"/>
+    <component name="bingsearch" t:title="bing" t:color="red1">
+        <t:implementation.python script="nuvem/bsearch.py"/>
         <service name="bingsearch"/>
         <reference name="query"/>
+        <reference name="s" t:visible="false">
+            <t:binding.http uri="http://www.bing.com/search"/>
+        </reference>
     </component>
     
     <component name="googlemap" t:title="google map" t:color="red1">
@@ -59,6 +66,15 @@
         </reference>
     </component>
     
+    <component name="googleimages" t:title="google images" t:color="red1">
+        <t:implementation.python script="nuvem/gimages.py"/>
+        <service name="googleimages"/>
+        <reference name="query"/>
+        <reference name="s" t:visible="false">
+            <t:binding.http uri="https://ajax.googleapis.com/ajax/services/search/images"/>
+        </reference>
+    </component>
+    
     <component name="weather" t:title="weather" t:color="red1">
         <t:implementation.python script="nuvem/gweather.py"/>
         <service name="weather"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
index fdd174afb0..fea8fba4e1 100644
--- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
@@ -30,6 +30,9 @@
     <service name="twfriends" promote="twfriends"/>
     <service name="twfollowers" promote="twfollowers"/>
     <service name="twtimeline" promote="twtimeline"/>
+    <service name="bzprofile" promote="bzprofile"/>
+    <service name="picalbum" promote="picalbum"/>
+    <service name="flkalbum" promote="flkalbum"/>
 
     <component name="fbprofile" t:title="facebook profile" t:color="blue1">
         <t:implementation.python script="nuvem/fbprofile.py"/>
@@ -103,4 +106,31 @@
         </reference>
     </component>
     
+    <component name="bzprofile" t:title="buzz profile" t:color="blue1">
+        <t:implementation.python script="nuvem/bzprofile.py"/>
+        <service name="bzprofile"/>
+        <reference name="id"/>
+        <reference name="bz" t:visible="false">
+            <t:binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
+        </reference>
+    </component>
+    
+    <component name="picalbum" t:title="picasa album" t:color="blue1">
+        <t:implementation.python script="nuvem/picalbum.py"/>
+        <service name="picalbum"/>
+        <reference name="id"/>
+        <reference name="pic" t:visible="false">
+            <t:binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
+        </reference>
+    </component>
+    
+    <component name="flkalbum" t:title="flicker album" t:color="blue1">
+        <t:implementation.python script="nuvem/flkalbum.py"/>
+        <service name="flkalbum"/>
+        <reference name="id"/>
+        <reference name="flk" t:visible="false">
+            <t:binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
+        </reference>
+    </component>
+    
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
index ad65ffdc1d..050316acb1 100644
--- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
@@ -22,37 +22,40 @@
   targetNamespace="http://talk"
   name="palette">
         
-    <service name="call" promote="call"/>
-    <service name="smssend" promote="smssend"/>
-    <service name="gtalksend" promote="gtalksend"/>
-    <service name="gtalkreceive" promote="gtalkreceive"/>
+    <service name="voicecall" promote="voicecall"/>
+    <service name="sendsms" promote="sendsms"/>
+    <service name="sendgtalk" promote="sendgtalk"/>
+    <service name="sendemail" promote="sendemail"/>
 
-    <component name="call" t:title="place call **" t:color="blue1">
-        <t:implementation.python script="nuvem/call.py"/>
-        <service name="call"/>
+    <component name="voicecall" t:title="voice **" t:color="blue1">
+        <t:implementation.python script="nuvem/voicecall.py"/>
+        <service name="voicecall"/>
         <reference name="to"/>
     </component>
     
-    <component name="smssend" t:title="send sms **" t:color="blue1">
-        <t:implementation.python script="nuvem/smssend.py"/>
-        <service name="smssend"/>
+    <component name="sendsms" t:title="sms **" t:color="blue1">
+        <t:implementation.python script="nuvem/sendsms.py"/>
+        <service name="sendsms"/>
         <reference name="user"/>
         <reference name="to"/>
         <reference name="msg"/>
     </component>
     
-    <component name="gtalksend" t:title="send gtalk **" t:color="blue1">
-        <t:implementation.python script="nuvem/gtalksend.py"/>
-        <service name="gtalksend"/>
+    <component name="sendgtalk" t:title="gtalk" t:color="blue1">
+        <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+        <service name="sendgtalk"/>
         <reference name="jid"/>
+        <reference name="pass"/>
         <reference name="to"/>
         <reference name="msg"/>
     </component>
     
-    <component name="gtalkreceive" t:title="gtalk received **" t:color="blue1">
-        <t:implementation.python script="nuvem/gtalkreceive.py"/>
-        <service name="gtalkreceive"/>
-        <reference name="jid"/>
+    <component name="sendemail" t:title="email **" t:color="blue1">
+        <t:implementation.python script="nuvem/sendemail.py"/>
+        <service name="sendemail"/>
+        <reference name="from"/>
+        <reference name="to"/>
+        <reference name="msg"/>
     </component>
     
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
index bef3a84a1b..a8844b172e 100644
--- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
@@ -60,13 +60,13 @@
         <reference name="string"/>
     </component>
     
-    <component name="lowercase" t:title="lowercase" t:color="magenta1">
+    <component name="lowercase" t:title="lower" t:color="magenta1">
         <t:implementation.python script="nuvem/lowercase.py"/>
         <service name="lowercase"/>
         <reference name="string"/>
     </component>
     
-    <component name="uppercase" t:title="uppercase" t:color="magenta1">
+    <component name="uppercase" t:title="upper" t:color="magenta1">
         <t: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 24db398347..a762a46b2a 100644
--- a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
@@ -26,6 +26,7 @@
     <service name="filter" promote="filter"/>
     <service name="reduce" promote="reduce"/>
     <service name="reverse" promote="reverse"/>
+    <service name="shuffle" promote="shuffle"/>
 
     <component name="foreach" t:title="foreach" t:color="yellow1">
         <t:implementation.python script="nuvem/map_.py"/>
@@ -49,6 +50,7 @@
         <reference name="item"/>
         <reference name="accum"/>
         <reference name="transform"/>
+        <reference name="init"/>
         <reference name="list"/>
     </component>
     
@@ -58,4 +60,10 @@
         <reference name="list"/>
     </component>
     
+    <component name="shuffle" t:title="shuffle" t:color="yellow1">
+        <t:implementation.python script="nuvem/shuffle_.py"/>
+        <service name="shuffle"/>
+        <reference name="list"/>
+    </component>
+    
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/value/palette.composite b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
index 1cd9022493..75c4bca5bb 100644
--- a/sca-cpp/trunk/modules/edit/palettes/value/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
@@ -19,47 +19,50 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
   xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://value"
+  targetNamespace="http://values"
   name="palette">
         
+    <service name="property" promote="property"/>
     <service name="text" promote="text"/>
     <service name="number" promote="number"/>
     <service name="name" promote="name"/>
     <service name="valueof" promote="valueof"/>
-    <service name="nothing" promote="nothing"/>
     <service name="true" promote="true"/>
     <service name="false" promote="false"/>
+    <service name="nothing" promote="nothing"/>
     <service name="now" promote="now"/>
 
-    <component name="text" t:title="text" t:color="orange1">
+    <component name="property" t:title="{propval} :" t:color="orange1">
+        <t:implementation.python script="nuvem/assoc.py"/>
+        <service name="property"/>
+        <reference name="value"/>
+        <property name="property">name</property>
+    </component>
+    
+    <component name="text" t:title=" '{propval}'" t:color="orange1">
         <t:implementation.python script="nuvem/text.py"/>
         <service name="text"/>
-        <property name="property">abc</property>
+        <property name="property">text</property>
     </component>
     
-    <component name="number" t:title="number" t:color="orange1">
+    <component name="number" t:title="#" t:color="orange1">
         <t:implementation.python script="nuvem/number.py"/>
         <service name="number"/>
-        <property name="property">0</property>
+        <property name="property">123</property>
     </component>
     
-    <component name="name" t:title="name" t:color="orange1">
+    <component name="name" t:title="" t:color="orange1">
         <t:implementation.python script="nuvem/name.py"/>
         <service name="name"/>
         <property name="property">name</property>
     </component>
     
-    <component name="valueof" t:title="value of" t:color="orange1">
+    <component name="valueof" t:title="valueof" t:color="orange1">
         <t:implementation.python script="nuvem/valueof.py"/>
         <service name="valueof"/>
         <property name="name">name</property>
     </component>
     
-    <component name="nothing" t:title="nothing" t:color="orange1">
-        <t:implementation.python script="nuvem/nothing.py"/>
-        <service name="nothing"/>
-    </component>
-    
     <component name="true" t:title="true" t:color="orange1">
         <t:implementation.python script="nuvem/true_.py"/>
         <service name="true"/>
@@ -70,9 +73,15 @@
         <service name="false"/>
     </component>
     
+    <component name="nothing" t:title="nothing" t:color="orange1">
+        <t:implementation.python script="nuvem/nothing.py"/>
+        <service name="nothing"/>
+    </component>
+    
     <component name="now" t:title="now" t:color="orange1">
         <t:implementation.python script="nuvem/now.py"/>
         <service name="now"/>
+        <reference name="format"/>
     </component>
     
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/store/featured b/sca-cpp/trunk/modules/edit/store/featured
index df702cae8f..7fd59364cf 100644
--- a/sca-cpp/trunk/modules/edit/store/featured
+++ b/sca-cpp/trunk/modules/edit/store/featured
@@ -1 +1 @@
-((entry (title "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme")))
+((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 "My online store") (id "shoppingcart")) (entry (title "Slice") (id "slice")))
diff --git a/sca-cpp/trunk/modules/edit/store/myapps b/sca-cpp/trunk/modules/edit/store/myapps
new file mode 100644
index 0000000000..7fd59364cf
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/store/myapps
@@ -0,0 +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 "My online store") (id "shoppingcart")) (entry (title "Slice") (id "slice")))
diff --git a/sca-cpp/trunk/modules/edit/store/new b/sca-cpp/trunk/modules/edit/store/new
index df702cae8f..402b4260e4 100644
--- a/sca-cpp/trunk/modules/edit/store/new
+++ b/sca-cpp/trunk/modules/edit/store/new
@@ -1 +1 @@
-((entry (title "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme")))
+((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 "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 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")))
diff --git a/sca-cpp/trunk/modules/edit/store/services b/sca-cpp/trunk/modules/edit/store/services
deleted file mode 100644
index 431193e8e6..0000000000
--- a/sca-cpp/trunk/modules/edit/store/services
+++ /dev/null
@@ -1 +0,0 @@
-((entry (title "An app that returns somebody's Buzz profile") (id "buzzprofile")))
diff --git a/sca-cpp/trunk/modules/edit/store/top b/sca-cpp/trunk/modules/edit/store/top
index df702cae8f..7fd59364cf 100644
--- a/sca-cpp/trunk/modules/edit/store/top
+++ b/sca-cpp/trunk/modules/edit/store/top
@@ -1 +1 @@
-((entry (title "An app that shows my social profiles") (id "me360")) (entry (title "An app that shows friends near me") (id "nearme")))
+((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 "My online store") (id "shoppingcart")) (entry (title "Slice") (id "slice")))
author	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2011-04-17 22:13:58 +0000
committer	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2011-04-17 22:13:58 +0000
commit	7df272063ba2167d797bda383680bfcf648418f8 (patch)
tree	bf69c23fe6d2ea3a07fccb92fa8d9962660b81ad /sca-cpp
parent	7779274ac986c038ab2f444fe04bd21051153294 (diff)