Cleanup and organize sample components, apps and html pages.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1126306 13f79535-47bb-0310-9956-ffa450edef68

49 files changed, 2731 insertions, 2769 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.composite b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
index 234c8cd61a..f7991a117d 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
@@ -17,111 +17,94 @@
  * 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" name="app" targetNamespace="http://app">
- <service name="buzz" promote="buzz"/>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component t:x="15" t:y="218" name="buzz" 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 name="bzprofile" t:title="buzz profile" t:color="blue1">
-  <t:implementation.python script="nuvem/bzprofile.py"/>
+ <component name="bzprofile" title="buzz profile" color="blue1">
+  <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 name="bz" visible="false">
+   <binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
   </reference>
  </component>
- <component name="fbprofile" t:title="facebook profile" t:color="blue1">
-  <t:implementation.python script="nuvem/fbprofile.py"/>
+ <component name="fbprofile" title="facebook profile" color="blue1">
+  <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 name="fb" visible="false">
+   <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text3" name="pattern"/>
-  <reference target="list" name="values"/>
- </component>
- <component name="get" t:title="get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="format" name="url"/>
- </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text5" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="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 name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="fbprofile" name="value"/>
   <property>fbprofile</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="twprofile" name="value"/>
   <property>twitprofile</property>
  </component>
- <component name="property3" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="bzprofile" name="value"/>
   <property>buzzprofile</property>
  </component>
- <component t:x="15" t:y="32" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text5" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component x="15" y="32" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="list2" name="content"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>100001053301307</property>
+  <property>jsdelfino</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="twprofile" t:title="twitter profile" t:color="blue1">
-  <t:implementation.python script="nuvem/twprofile.py"/>
+ <component name="twprofile" title="twitter profile" color="blue1">
+  <implementation.python script="nuvem/twprofile.py"/>
   <service name="twprofile"/>
   <reference target="text2" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
+  <reference name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/users/show.json"/>
   </reference>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html
index 84427a8ce9..e57e246328 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html
@@ -18,17 +18,17 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="section" class="section" style="position: absolute; top: 225px; width: 100%; left: 2px; ">
-  <SPAN>Twitter</SPAN>
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Me360</H2>
  </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 1143px; width: 100%; left: 2px; ">
-  <SPAN>Buzz</SPAN>
+ <SPAN id="page:section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
+  <SPAN>Facebook</SPAN>
  </SPAN>
- <SPAN id="buzzprofile" class="table" style="position: absolute; top: 1170px; left: 2px; ">
-  <TABLE class="datatable" style="width: 100%; ">
+ <SPAN id="fbprofile" class="table" style="position: absolute; top: 63px; width: 100%; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%;">
    <TBODY>
     <TR>
-     <TD>table</TD>
+     <TD>=fbprofile</TD>
      <TD>...</TD>
     </TR>
     <TR>
@@ -38,11 +38,14 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="twitprofile" class="table" style="position: absolute; top: 252px; left: 2px; ">
-  <TABLE class="datatable" style="width: 100%; ">
+ <SPAN id="page:section" class="section" style="position: absolute; top: 288px; width: 100%; left: 2px; ">
+  <SPAN>Twitter</SPAN>
+ </SPAN>
+ <SPAN id="twitprofile" class="table" style="position: absolute; top: 324px; width: 100%; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%;">
    <TBODY>
     <TR>
-     <TD>table</TD>
+     <TD>=twitprofile</TD>
      <TD>...</TD>
     </TR>
     <TR>
@@ -52,17 +55,14 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <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 id="page:section" class="section" style="position: absolute; top: 1368px; width: 100%; left: 2px; ">
+  <SPAN>Buzz</SPAN>
  </SPAN>
- <SPAN id="fbprofile" class="table" style="position: absolute; top: 54px; left: 2px; ">
+ <SPAN id="buzzprofile" class="table" style="position: absolute; top: 1404px; width: 100%; left: 2px; ">
   <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>table</TD>
+     <TD>=buzzprofile</TD>
      <TD>...</TD>
     </TR>
     <TR>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
index dbe637538a..f3736451a0 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
@@ -17,428 +17,428 @@
  * 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" name="app" targetNamespace="http://app">
- <service name="geolocation" promote="geolocation"/>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="getlocs" promote="getlocs"/>
+ <service name="location" promote="location"/>
  <service name="map" promote="map"/>
  <service name="nearme" promote="nearme"/>
  <service name="start2" promote="start2"/>
  <service name="timer" promote="timer"/>
- <component name="append" t:title="+" t:color="yellow1">
-  <t:implementation.python script="nuvem/append.py"/>
+ <component name="append" title="+" color="yellow1">
+  <implementation.python script="nuvem/append.py"/>
   <service name="append"/>
   <reference target="params" name="first"/>
   <reference target="call2" name="second"/>
  </component>
- <component name="call" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call2" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name2" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call3" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call3" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name4" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call4" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call4" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name3" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="filedb" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb10" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb10" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb11" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb11" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb4" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component xmlns="" name="filedb4" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb5" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component xmlns="" name="filedb5" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb6" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component xmlns="" name="filedb6" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb7" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component xmlns="" name="filedb7" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb8" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component xmlns="" name="filedb8" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component xmlns="" name="filedb9" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component xmlns="" name="filedb9" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component t:x="389" t:y="111" 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 name="get10" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component name="get10" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb11" name="collection"/>
   <reference target="param5" name="id"/>
  </component>
- <component xmlns="" name="get3" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component xmlns="" name="get3" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb4" name="collection"/>
   <reference target="param3" name="id"/>
  </component>
- <component xmlns="" name="get4" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component xmlns="" name="get4" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb5" name="collection"/>
   <reference target="param4" name="id"/>
  </component>
- <component xmlns="" name="get5" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component xmlns="" name="get5" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb6" name="collection"/>
   <reference target="param2" name="id"/>
  </component>
- <component xmlns="" name="get6" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component xmlns="" name="get6" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb7" name="collection"/>
   <reference target="user4" name="id"/>
  </component>
- <component xmlns="" name="get7" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component xmlns="" name="get7" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb8" name="collection"/>
   <reference target="param7" name="id"/>
  </component>
- <component xmlns="" name="get8" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component xmlns="" name="get8" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb9" name="collection"/>
   <reference target="param6" name="id"/>
  </component>
- <component name="get9" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component name="get9" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb10" name="collection"/>
   <reference target="user5" name="id"/>
  </component>
- <component t:x="394" t:y="352" name="getlocs" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="394" y="352" name="getlocs" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="list3" name="content"/>
  </component>
- <component xmlns="" name="googlemap" t:title="google map" t:color="red1">
-  <t:implementation.python script="nuvem/gmap.py"/>
+ <component xmlns="" name="googlemap" title="google map" color="red1">
+  <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 name="s" visible="false">
+   <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component name="last" t:title="last" t:color="yellow1">
-  <t:implementation.python script="nuvem/last.py"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="user3" name="value"/>
+  <property>me</property>
+ </component>
+ <component name="item10" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="url" name="value"/>
+  <property>mapimg</property>
+ </component>
+ <component name="item11" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="get9" name="value"/>
+  <property>x</property>
+ </component>
+ <component name="item12" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="get10" name="value"/>
+  <property>1</property>
+ </component>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="get3" name="value"/>
+  <property>2</property>
+ </component>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="get4" name="value"/>
+  <property>3</property>
+ </component>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="last4" name="value"/>
+  <property>time3</property>
+ </component>
+ <component name="item7" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="last3" name="value"/>
+  <property>time2</property>
+ </component>
+ <component name="item8" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="last2" name="value"/>
+  <property>time1</property>
+ </component>
+ <component name="item9" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="last" name="value"/>
+  <property>mytime</property>
+ </component>
+ <component name="last" title="last" color="yellow1">
+  <implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get6" name="list"/>
  </component>
- <component name="last2" t:title="last" t:color="yellow1">
-  <t:implementation.python script="nuvem/last.py"/>
+ <component name="last2" title="last" color="yellow1">
+  <implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get5" name="list"/>
  </component>
- <component name="last3" t:title="last" t:color="yellow1">
-  <t:implementation.python script="nuvem/last.py"/>
+ <component name="last3" title="last" color="yellow1">
+  <implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get8" name="list"/>
  </component>
- <component name="last4" t:title="last" t:color="yellow1">
-  <t:implementation.python script="nuvem/last.py"/>
+ <component name="last4" title="last" color="yellow1">
+  <implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get7" name="list"/>
  </component>
- <component xmlns="" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component xmlns="" name="list" title="list" color="yellow1">
+  <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 xmlns="" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+  <reference target="text7" name="item" clonable="true"/>
+  <reference target="param10" name="item" clonable="true"/>
+  <reference target="param" name="item" clonable="true"/>
+  <reference target="now" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component xmlns="" name="list2" title="list" color="yellow1">
+  <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 name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item9" name="item" clonable="true"/>
+  <reference target="item8" name="item" clonable="true"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference target="item6" name="item" clonable="true"/>
+  <reference target="item10" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="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="42" t:y="616" name="map" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+  <reference target="item11" name="item" clonable="true"/>
+  <reference target="item12" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component x="389" y="111" name="location" title="location" color="green1">
+  <implementation.python script="nuvem/location.py"/>
+  <service name="location" visible="false">
+   <binding.http uri="location"/>
+  </service>
+  <reference target="put" name="content"/>
+ </component>
+ <component x="42" y="616" name="map" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="googlemap" name="content"/>
  </component>
- <component name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getlocs</property>
  </component>
- <component name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name2" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getlocs</property>
  </component>
- <component name="name3" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name3" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>nearme</property>
  </component>
- <component name="name4" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name4" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>nearme</property>
  </component>
- <component t:x="39" t:y="80" name="nearme" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="39" y="80" name="nearme" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="list2" name="content"/>
  </component>
- <component name="now" t:title="now" t:color="orange1">
-  <t:implementation.python script="nuvem/now.py"/>
+ <component name="now" title="now" color="orange1">
+  <implementation.python script="nuvem/now.py"/>
   <service name="now"/>
   <reference target="text" name="format"/>
  </component>
- <component xmlns="" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component xmlns="" name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5000</property>
  </component>
- <component name="param" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>longitude</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="param10" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param10" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>latitude</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="param2" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param2" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend1</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="param3" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param3" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend2</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="param4" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param4" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend3</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="param5" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param5" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend1</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="param6" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param6" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend2</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="param7" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param7" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend3</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component xmlns="" name="params" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
+ <component xmlns="" name="params" title="?params" color="green1">
+  <implementation.python script="nuvem/params.py"/>
   <service name="params"/>
-  <property name="query" t:visible="false"/>
- </component>
- <component 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 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 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>
- <component 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 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 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 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 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 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 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>
+  <property name="query" visible="false"/>
  </component>
- <component xmlns="" name="put" t:title="put" t:color="red1">
-  <t:implementation.python script="nuvem/put.py"/>
+ <component xmlns="" name="put" title="put" color="red1">
+  <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="40" t:y="21" name="start2" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="40" y="21" name="start2" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="call4" name="content"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>%a %b %d, %I:%M %p</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>/components/map</property>
  </component>
- <component xmlns="" name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component xmlns="" name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>green</property>
  </component>
- <component t:x="357" t:y="21" name="timer" t:title="timer" t:color="green1">
-  <t:implementation.python script="nuvem/timer.py"/>
-  <service name="timer" t:visible="false">
-   <t:binding.http uri="timer"/>
+ <component x="389" y="13" name="timer" title="timer" color="green1">
+  <implementation.python script="nuvem/timer.py"/>
+  <service name="timer" visible="false">
+   <binding.http uri="timer"/>
   </service>
   <reference target="number" name="n"/>
   <reference target="call3" name="content"/>
  </component>
- <component name="url" t:title="url" t:color="green1">
-  <t:implementation.python script="nuvem/url.py"/>
+ <component name="url" title="url" color="green1">
+  <implementation.python script="nuvem/url.py"/>
   <service name="url"/>
   <reference target="text2" name="address"/>
   <reference target="append" name="args"/>
  </component>
- <component xmlns="" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component xmlns="" name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
- <component xmlns="" name="user3" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component xmlns="" name="user3" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
- <component xmlns="" name="user4" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component xmlns="" name="user4" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
- <component name="user5" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component name="user5" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html
index 1077688b6c..fba4b0464c 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html
@@ -18,37 +18,37 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Nearme</H2>
  </SPAN>
  <SPAN id="me" class="h2" style="position: absolute; top: 0px; left: 101px; ">
-  <H2>me</H2>
+  <H2>=me</H2>
  </SPAN>
  <SPAN style="position: absolute; top: 0px; left: 182px; " class="text" id="mytime">
-  <SPAN>updating...</SPAN>
+  <SPAN>=mytime</SPAN>
  </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
+ <SPAN id="page:section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
   <SPAN>My friends</SPAN>
  </SPAN>
  <SPAN style="position: absolute; top: 54px; left: 2px; " class="entry" id="friend1">
-  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+  <INPUT type="text" size="20" value="=friend1" autocapitalize="off"/>
  </SPAN>
  <SPAN style="position: absolute; top: 54px; left: 182px; " class="text" id="time1">
-  <SPAN>last seen...</SPAN>
+  <SPAN>=time1</SPAN>
  </SPAN>
  <SPAN style="position: absolute; top: 81px; left: 2px; " class="entry" id="friend2">
-  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+  <INPUT type="text" size="20" value="=friend2" autocapitalize="off"/>
  </SPAN>
  <SPAN style="position: absolute; top: 81px; left: 182px; " class="text" id="time2">
-  <SPAN>last seen...</SPAN>
+  <SPAN>=time2</SPAN>
  </SPAN>
  <SPAN style="position: absolute; top: 108px; left: 2px; " class="entry" id="friend3">
-  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+  <INPUT type="text" size="20" value="=friend3" autocapitalize="off"/>
  </SPAN>
  <SPAN style="position: absolute; top: 108px; left: 182px; " class="text" id="time3">
-  <SPAN>last seen...</SPAN>
+  <SPAN>=time3</SPAN>
  </SPAN>
  <SPAN style="position: absolute; top: 135px; left: 2px; " class="img" id="mapimg">
-  <IMG src="https://sca-store.com:8453/public/img.png"/>
+  <IMG src="/public/img.png"/>
  </SPAN>
 </DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/new/app.composite b/sca-cpp/trunk/modules/edit/apps/new/app.composite
new file mode 100644
index 0000000000..253168ff21
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/new/app.composite
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="comment1" promote="comment1"/>
+ <service name="start1" promote="start1"/>
+ <component x="10" y="0" name="comment1" title="{propval}" color="white">
+  <implementation.python script="nuvem/comment.py"/>
+  <service name="comment" visible="false"/>
+  <property>Change this example to do what you want</property>
+ </component>
+ <component name="item1" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="user1" name="value"/>
+  <property>me</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="now1" name="value"/>
+  <property>time</property>
+ </component>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="item1" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="now1" title="now" color="orange1">
+  <implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+  <reference name="format"/>
+ </component>
+ <component x="10" y="40" name="start1" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
+  </service>
+  <reference target="list2" name="content"/>
+ </component>
+ <component name="user1" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/new/app.stats b/sca-cpp/trunk/modules/edit/apps/new/app.stats
new file mode 100644
index 0000000000..513c902468
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/new/app.stats
@@ -0,0 +1 @@
+((entry (title "An empty app template") (id "new")))
diff --git a/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html
new file mode 100644
index 0000000000..de39e20956
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+  <H1>Hello</H1>
+ </SPAN>
+ <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 56px; ">
+  <H1>=me</H1>
+ </SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 36px; left: 2px; ">
+  <SPAN>The time is:</SPAN>
+ </SPAN>
+ <SPAN id="time" class="text" style="position: absolute; top: 36px; left: 74px; ">
+  <SPAN>=time</SPAN>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
index 8d27c3b6c8..13ed9a2248 100644
--- a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
@@ -17,122 +17,122 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component name="append" t:title="+" t:color="yellow1">
-  <t:implementation.python script="nuvem/append.py"/>
+ <component name="append" title="+" color="yellow1">
+  <implementation.python script="nuvem/append.py"/>
   <service name="append"/>
   <reference target="values" name="first"/>
   <reference target="values2" name="second"/>
  </component>
- <component name="flkalbum" t:title="flicker album" t:color="blue1">
-  <t:implementation.python script="nuvem/flkalbum.py"/>
+ <component name="flkalbum" title="flicker album" color="blue1">
+  <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 name="flk" visible="false">
+   <binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
   </reference>
  </component>
- <component name="foreach2" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
+ <component name="foreach2" title="foreach" color="yellow1">
+  <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 name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component name="format" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text2" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="valueof2" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="valueof2" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="name3" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name3" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>src</property>
  </component>
- <component name="name4" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name4" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>m</property>
  </component>
- <component name="name5" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name5" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>image</property>
  </component>
- <component name="picalbum" t:title="picasa album" t:color="blue1">
-  <t:implementation.python script="nuvem/picalbum.py"/>
+ <component name="picalbum" title="picasa album" color="blue1">
+  <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 name="pic" visible="false">
+   <binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
   </reference>
  </component>
- <component name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="foreach2" name="value"/>
   <property>images</property>
  </component>
- <component name="search" t:title="search" t:color="yellow1">
-  <t:implementation.python script="nuvem/search.py"/>
-  <service name="search"/>
+ <component name="select" title="select" color="yellow1">
+  <implementation.python script="nuvem/select.py"/>
+  <service name="select"/>
   <reference target="name3" name="path"/>
   <reference target="picalbum" name="list"/>
  </component>
- <component name="search2" t:title="search" t:color="yellow1">
-  <t:implementation.python script="nuvem/search.py"/>
-  <service name="search"/>
+ <component name="select2" title="select" color="yellow1">
+  <implementation.python script="nuvem/select.py"/>
+  <service name="select"/>
   <reference target="name4" name="path"/>
   <reference target="flkalbum" name="list"/>
  </component>
- <component name="shuffle" t:title="shuffle" t:color="yellow1">
-  <t:implementation.python script="nuvem/shuffle_.py"/>
+ <component name="shuffle" title="shuffle" color="yellow1">
+  <implementation.python script="nuvem/shuffle_.py"/>
   <service name="shuffle"/>
   <reference target="append" name="list"/>
  </component>
- <component t:x="14" t:y="19" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="14" y="19" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
-  <reference target="property" name="content"/>
+  <reference target="item" name="content"/>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>&lt;img src=&quot;{0}&quot; width=&quot;320&quot;/&gt;</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>61049883@N06</property>
  </component>
- <component name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof2" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>image</property>
  </component>
- <component name="values" t:title="values" t:color="yellow1">
-  <t:implementation.python script="nuvem/values.py"/>
+ <component name="values" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
   <service name="values"/>
-  <reference target="search" name="list"/>
+  <reference target="select" name="list"/>
  </component>
- <component name="values2" t:title="values" t:color="yellow1">
-  <t:implementation.python script="nuvem/values.py"/>
+ <component name="values2" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
   <service name="values"/>
-  <reference target="search2" name="list"/>
+  <reference target="select2" name="list"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html
index 489e6fe825..1ddb89fa30 100644
--- a/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html
@@ -18,14 +18,14 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Our Photos</H2>
  </SPAN>
- <SPAN id="images" class="list" style="position: absolute; top: 27px; left: 2px; ">
+ <SPAN id="images" class="list" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
   <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>list</TD>
+     <TD>=images</TD>
     </TR>
     <TR>
      <TD>...</TD>
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
index 919a79f0f0..565bffa371 100644
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
@@ -17,464 +17,497 @@
  * 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" name="app" targetNamespace="http://app">
- <service name="addToCart" promote="addToCart"/>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="Add to cart" promote="Add to cart"/>
+ <service name="Check out" promote="Check out"/>
+ <service name="Empty" promote="Empty"/>
  <service name="carthtml" promote="carthtml"/>
  <service name="catalog" promote="catalog"/>
  <service name="cataloghtml" promote="cataloghtml"/>
- <service name="checkout" promote="checkout"/>
- <service name="emptyCart" promote="emptyCart"/>
  <service name="getcart" promote="getcart"/>
  <service name="order" promote="order"/>
  <service name="start" promote="start"/>
  <service name="total" promote="total"/>
- <component t:x="367" t:y="421" name="addToCart" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="342" y="359" name="Add to cart" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="list6" name="content"/>
  </component>
- <component name="append" t:title="+" t:color="yellow1">
-  <t:implementation.python script="nuvem/append.py"/>
+ <component name="Check out" x="12" y="758" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="list3" name="content"/>
+ </component>
+ <component name="Empty" x="10" y="560" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="list5" name="content"/>
+ </component>
+ <component name="append" title="+" color="yellow1">
+  <implementation.python script="nuvem/append.py"/>
   <service name="append"/>
   <reference target="call2" name="first"/>
   <reference target="lookup" name="second"/>
  </component>
- <component name="call" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name14" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call10" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call10" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name12" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call11" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call11" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name16" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call12" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call12" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name13" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call13" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call13" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name17" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call14" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call14" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name19" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call15" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call15" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name20" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call16" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call16" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name21" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call17" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name4" name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component name="call2" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name5" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call3" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call3" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name6" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call4" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call4" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name15" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call5" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call5" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name8" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call6" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call6" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name10" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call7" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call7" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name9" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call8" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call8" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name11" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component name="call9" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component name="call9" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name2" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component t:x="12" t:y="388" name="carthtml" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="property6" name="content"/>
+ <component x="12" y="388" name="carthtml" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="item6" name="content"/>
  </component>
- <component t:x="354" t:y="28" name="catalog" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="354" y="28" name="catalog" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="list" name="content"/>
  </component>
- <component t:x="12" t:y="221" name="cataloghtml" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="property" name="content"/>
- </component>
- <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 x="12" y="221" name="cataloghtml" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="item" name="content"/>
  </component>
- <component name="delete2" t:title="delete" t:color="red1">
-  <t:implementation.python script="nuvem/delete.py"/>
+ <component name="delete2" title="delete" color="red1">
+  <implementation.python script="nuvem/delete.py"/>
   <service name="delete"/>
   <reference target="filedb2" name="collection"/>
   <reference target="user2" name="id"/>
  </component>
- <component t:x="10" t:y="560" name="emptyCart" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="list5" name="content"/>
+ <component name="equals" title="=" color="magenta1">
+  <implementation.python script="nuvem/equals.py"/>
+  <service name="equals"/>
+  <reference target="call" name="value1"/>
+  <reference target="nothing" name="value2"/>
  </component>
- <component name="filedb" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb2" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb2" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb3" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb3" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="foreach" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
+ <component name="foreach" title="foreach" color="yellow1">
+  <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 name="foreach2" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
+ <component name="foreach2" title="foreach" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
   <service name="foreach"/>
   <reference target="name3" name="item"/>
   <reference target="format3" name="transform"/>
   <reference target="call10" name="list"/>
  </component>
- <component name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component name="format" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text4" name="pattern"/>
   <reference target="call8" name="values"/>
  </component>
- <component name="format2" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component name="format2" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text5" name="pattern"/>
   <reference target="valueof" name="values"/>
  </component>
- <component name="format3" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component name="format3" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text6" name="pattern"/>
   <reference target="valueof2" name="values"/>
  </component>
- <component name="get" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component name="get" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb" name="collection"/>
   <reference target="user" name="id"/>
  </component>
- <component t:x="477" t:y="153" name="getcart" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="477" y="153" name="getcart" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="get" name="content"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="if" title="if" color="magenta1">
+  <implementation.python script="nuvem/if_.py"/>
+  <service name="if"/>
+  <reference target="equals" name="condition"/>
+  <reference target="number5" name="then"/>
+  <reference target="round" name="else"/>
+ </component>
+ <component name="list" title="list" color="yellow1">
+  <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"/>
+  <reference target="item8" name="item" clonable="true"/>
+  <reference target="item9" name="item" clonable="true"/>
+  <reference target="item10" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <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"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item12" name="item" clonable="true"/>
+  <reference target="call3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list4" title="list" color="yellow1">
+  <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 name="list5" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference target="call5" name="item" clonable="true"/>
+  <reference target="call13" name="item" clonable="true"/>
+  <reference target="call14" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="list5" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="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"/>
+  <reference target="item11" name="item" clonable="true"/>
+  <reference target="call7" name="item" clonable="true"/>
+  <reference target="call16" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list6" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list6" title="list" color="yellow1">
+  <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"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference target="call4" name="item" clonable="true"/>
+  <reference target="call6" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="lookup" t:title="lookup" t:color="yellow1">
-  <t:implementation.python script="nuvem/lookup.py"/>
+ <component name="lookup" title="lookup" color="yellow1">
+  <implementation.python script="nuvem/lookup.py"/>
   <service name="lookup"/>
   <reference target="param" name="name"/>
   <reference target="call15" name="list"/>
  </component>
- <component name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>fruit</property>
  </component>
- <component name="name10" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name10" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component name="name11" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name11" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component name="name12" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name12" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component name="name13" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name13" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>order</property>
  </component>
- <component name="name14" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name14" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component name="name15" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name15" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>carthtml</property>
  </component>
- <component name="name16" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name16" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>order</property>
  </component>
- <component name="name17" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name17" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>carthtml</property>
  </component>
- <component name="name19" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name19" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name2" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>catalog</property>
  </component>
- <component name="name20" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name20" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>catalog</property>
  </component>
- <component name="name21" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name21" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component name="name3" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name3" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>fruit</property>
  </component>
- <component name="name5" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name4" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>getcart</property>
+ </component>
+ <component name="name5" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component name="name6" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name6" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>emptyCart</property>
  </component>
- <component name="name8" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name8" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>cataloghtml</property>
  </component>
- <component name="name9" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name9" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>carthtml</property>
  </component>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="nothing" title="nothing" color="orange1">
+  <implementation.python script="nuvem/nothing.py"/>
+  <service name="nothing"/>
+ </component>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>2.99</property>
  </component>
- <component name="number2" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number2" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3.55</property>
  </component>
- <component name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number3" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>2</property>
  </component>
- <component name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>1.55</property>
  </component>
- <component t:x="418" t:y="750" name="order" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component name="number5" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
+ </component>
+ <component x="425" y="832" name="order" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="format" name="content"/>
  </component>
- <component name="param" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>fruit</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="foreach" name="value"/>
   <property>catalog</property>
  </component>
- <component name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item10" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number4" name="value"/>
   <property>Kiwi</property>
  </component>
- <component name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item11" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="delete2" name="value"/>
   <property>delresult</property>
  </component>
- <component name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item12" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="sendgtalk" name="value"/>
   <property>sendresult</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="round" name="value"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="if" name="value"/>
   <property>total</property>
  </component>
- <component name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="call11" name="value"/>
   <property>message</property>
  </component>
- <component name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text2" name="value"/>
   <property>message</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="foreach2" name="value"/>
   <property>cart</property>
  </component>
- <component name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item7" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="put" name="value"/>
   <property>putresult</property>
  </component>
- <component name="property8" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item8" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number" name="value"/>
   <property>Mango</property>
  </component>
- <component name="property9" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item9" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number2" name="value"/>
   <property>Passion</property>
  </component>
- <component name="put" t:title="put" t:color="red1">
-  <t:implementation.python script="nuvem/put.py"/>
+ <component name="put" title="put" color="red1">
+  <implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb3" name="collection"/>
   <reference target="user3" name="id"/>
   <reference target="append" name="value"/>
  </component>
- <component name="round" t:title="round" t:color="magenta1">
-  <t:implementation.python script="nuvem/round_.py"/>
+ <component name="round" title="round" color="magenta1">
+  <implementation.python script="nuvem/round_.py"/>
   <service name="round"/>
   <reference target="number3" name="n"/>
   <reference target="sum" name="x"/>
  </component>
- <component name="sendgtalk" t:title="gtalk" t:color="blue1">
+ <component name="sendgtalk" title="gtalk" color="blue1">
   <implementation.cpp path="lib/chat" library="libchat-sender2"/>
   <service name="sendgtalk"/>
   <reference target="text" name="jid"/>
@@ -482,86 +515,86 @@
   <reference target="text3" name="to"/>
   <reference target="call12" name="msg"/>
  </component>
- <component t:x="13" t:y="15" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="13" y="15" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="list4" name="content"/>
  </component>
- <component name="sum" t:title="sum" t:color="magenta1">
-  <t:implementation.python script="nuvem/sum_.py"/>
+ <component name="sum" title="sum" color="magenta1">
+  <implementation.python script="nuvem/sum_.py"/>
   <service name="sum"/>
   <reference target="values" name="l"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmppsca.1@gmail.com</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>Welcome to my online store</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>xmppsca.2@gmail.com</property>
+  <property>jsdelfino@gmail.com</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>Your order has been processed. Your total: ${1}</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>&lt;span id=&quot;fruit&quot; class=&quot;checkbox&quot;&gt;&lt;input type=&quot;checkbox&quot; value=&quot;{0}&quot;/&gt;${1} - {0}&lt;/span&gt;</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>${1} - {0}</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmpp4sca</property>
  </component>
- <component t:x="387" t:y="296" name="total" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="property2" name="content"/>
+ <component x="760" y="300" name="total" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="item2" name="content"/>
  </component>
- <component name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
- <component name="user2" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component name="user2" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
- <component name="user3" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component name="user3" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
-  <property name="user" t:visible="false"/>
+  <property name="user" visible="false"/>
  </component>
- <component name="valueof" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>fruit</property>
  </component>
- <component name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof2" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>fruit</property>
  </component>
- <component name="values" t:title="values" t:color="yellow1">
-  <t:implementation.python script="nuvem/values.py"/>
+ <component name="values" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
   <service name="values"/>
-  <reference target="call" name="list"/>
+  <reference target="call17" name="list"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html
index 7d32ddd5b7..0464f3e4c4 100644
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html
@@ -18,20 +18,23 @@
  * under the License.    
 -->
 <DIV id="page">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Shopping Cart</H2>
+ </SPAN>
  <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 id="page:section" class="section" style="position: absolute; top: 63px; width: 100%; left: 2px; ">
   <SPAN>Catalog</SPAN>
  </SPAN>
- <SPAN id="catalog" class="list" style="position: absolute; top: 99px; left: 2px; ">
+ <SPAN id="page:button" class="button" style="position: absolute; top: 63px; left: 146px; ">
+  <INPUT type="button" value="Add to cart" class="graybutton"/>
+ </SPAN>
+ <SPAN id="catalog" class="list" style="position: absolute; top: 99px; width: 100%; left: 2px; ">
   <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>list</TD>
+     <TD>=catalog</TD>
     </TR>
     <TR>
      <TD>...</TD>
@@ -39,11 +42,26 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="cart" class="list" style="position: absolute; top: 216px; left: 2px; ">
+ <SPAN id="page:section" class="section" style="position: absolute; top: 180px; width: 100%; left: 2px; ">
+  <SPAN>Your cart:</SPAN>
+ </SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 180px; left: 83px; ">
+  <SPAN>$</SPAN>
+ </SPAN>
+ <SPAN id="total" class="text" style="position: absolute; top: 180px; left: 92px; ">
+  <SPAN>=total</SPAN>
+ </SPAN>
+ <SPAN id="page:button" class="button" style="position: absolute; top: 180px; left: 146px; ">
+  <INPUT type="button" value="Check out" class="graybutton"/>
+ </SPAN>
+ <SPAN id="page:button" class="button" style="position: absolute; top: 180px; left: 245px; ">
+  <INPUT type="button" value="Empty" class="graybutton"/>
+ </SPAN>
+ <SPAN id="cart" class="list" style="position: absolute; top: 216px; width: 100%; left: 2px; ">
   <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>list</TD>
+     <TD>=cart</TD>
     </TR>
     <TR>
      <TD>...</TD>
@@ -51,22 +69,4 @@
    </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" class="graybutton"/>
- </SPAN>
- <SPAN id="checkout" class="button" style="position: absolute; top: 189px; left: 146px; ">
-  <INPUT type="button" value="Check out" class="graybutton"/>
- </SPAN>
- <SPAN id="emptyCart" class="button" style="position: absolute; top: 189px; left: 245px; ">
-  <INPUT type="button" value="Empty" class="graybutton"/>
- </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
index ba16436c3e..847d9c4892 100644
--- a/sca-cpp/trunk/modules/edit/apps/slice/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/slice/app.composite
@@ -17,24 +17,24 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number" name="value"/>
   <property>slice</property>
  </component>
- <component t:x="17" t:y="9" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="17" y="9" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
-  <reference target="property" name="content"/>
+  <reference target="item" 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 7e4828573a..253168ff21 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite
@@ -17,11 +17,48 @@
  * 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" name="app" targetNamespace="http://app">
- <service name="text3" promote="text3"/>
- <component t:x="27" t:y="12" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Hello World</property>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="comment1" promote="comment1"/>
+ <service name="start1" promote="start1"/>
+ <component x="10" y="0" name="comment1" title="{propval}" color="white">
+  <implementation.python script="nuvem/comment.py"/>
+  <service name="comment" visible="false"/>
+  <property>Change this example to do what you want</property>
+ </component>
+ <component name="item1" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="user1" name="value"/>
+  <property>me</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="now1" name="value"/>
+  <property>time</property>
+ </component>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="item1" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="now1" title="now" color="orange1">
+  <implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+  <reference name="format"/>
+ </component>
+ <component x="10" y="40" name="start1" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
+  </service>
+  <reference target="list2" name="content"/>
+ </component>
+ <component name="user1" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
index 5c7c7219bb..de39e20956 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
@@ -17,4 +17,17 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+  <H1>Hello</H1>
+ </SPAN>
+ <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 56px; ">
+  <H1>=me</H1>
+ </SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 36px; left: 2px; ">
+  <SPAN>The time is:</SPAN>
+ </SPAN>
+ <SPAN id="time" class="text" style="position: absolute; top: 36px; left: 74px; ">
+  <SPAN>=time</SPAN>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
index ddad3cd7a1..e635f964bb 100644
--- a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
@@ -17,82 +17,82 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="delete" promote="delete"/>
  <service name="get" promote="get"/>
  <service name="put" promote="put"/>
- <component t:x="176" t:y="11" name="delete" t:title="delete" t:color="red1">
-  <t:implementation.python script="nuvem/delete.py"/>
+ <component x="176" y="11" name="delete" title="delete" color="red1">
+  <implementation.python script="nuvem/delete.py"/>
   <service name="delete"/>
   <reference target="filedb2" name="collection"/>
   <reference target="list3" name="id"/>
  </component>
- <component name="filedb" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb2" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb2" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component name="filedb3" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
+ <component name="filedb3" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
  </component>
- <component t:x="18" t:y="137" name="get" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
+ <component x="18" y="137" name="get" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb3" name="collection"/>
   <reference target="list2" name="id"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text4" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component t:x="13" t:y="1" name="put" t:title="put" t:color="red1">
-  <t:implementation.python script="nuvem/put.py"/>
+ <component x="13" y="1" name="put" title="put" color="red1">
+  <implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb" name="collection"/>
   <reference target="list" name="id"/>
   <reference target="text2" name="value"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testvalue</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
  </component>
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html
index 734ec8f687..856966ff50 100644
--- a/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page: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 ffe17c3cd4..6389622481 100644
--- a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
@@ -17,155 +17,179 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="Cancel" promote="Cancel"/>
+ <service name="OK" promote="OK"/>
+ <service name="call" promote="call"/>
  <service name="call2" promote="call2"/>
+ <service name="call3" promote="call3"/>
  <service name="compabc" promote="compabc"/>
  <service name="compxyz" promote="compxyz"/>
- <service name="geolocation" promote="geolocation"/>
+ <service name="location" promote="location"/>
  <service name="start" promote="start"/>
- <service name="testbutton1" promote="testbutton1"/>
- <service name="testbutton2" promote="testbutton2"/>
  <service name="timer3" promote="timer3"/>
- <component name="abc" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="Cancel" x="223" y="16" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="prop2" name="content"/>
+ </component>
+ <component name="OK" x="228" y="78" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference target="list" name="content"/>
+ </component>
+ <component name="abc" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component t:x="16" t:y="208" name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
+ <component x="223" y="216" name="call" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name2" name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component x="16" y="208" name="call2" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
   <service name="call"/>
   <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component x="222" y="273" name="call3" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="text5" name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
  </component>
- <component t:x="14" t:y="265" name="compabc" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="14" y="265" name="compabc" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="abc" name="content"/>
  </component>
- <component t:x="15" t:y="316" name="compxyz" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
+ <component x="15" y="316" name="compxyz" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
   <reference target="text12" name="content"/>
  </component>
- <component t:x="12" t:y="146" name="geolocation" t:title="location" t:color="green1">
-  <t:implementation.python script="nuvem/geolocation.py"/>
-  <service name="geolocation" t:visible="false">
-   <t:binding.http uri="geolocation"/>
+ <component x="12" y="146" name="location" title="location" color="green1">
+  <implementation.python script="nuvem/location.py"/>
+  <service name="location" visible="false">
+   <binding.http uri="location"/>
   </service>
-  <reference target="property6" name="content"/>
+  <reference target="item6" name="content"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <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"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>compxyz</property>
  </component>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="name2" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>https://testhttp.sca-store.com:8453/components/property</property>
+ </component>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3000</property>
  </component>
- <component name="param" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
+ <component name="param" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>testfield</property>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="params2" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
+ <component name="params2" title="?params" color="green1">
+  <implementation.python script="nuvem/params.py"/>
   <service name="params"/>
-  <property name="query" t:visible="false"/>
+  <property name="query" visible="false"/>
  </component>
- <component name="prop2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="prop2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text3" name="value"/>
   <property>status</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text4" name="value"/>
   <property>status</property>
  </component>
- <component name="property3" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text" name="value"/>
   <property>status</property>
  </component>
- <component name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text2" name="value"/>
   <property>status</property>
  </component>
- <component name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="param" name="value"/>
   <property>testtext</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="params2" name="value"/>
   <property>location</property>
  </component>
- <component t:x="15" t:y="3" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="15" y="3" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
-  <reference target="property3" name="content"/>
- </component>
- <component t:x="228" t:y="78" name="testbutton1" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="list" name="content"/>
+  <reference target="item3" name="content"/>
  </component>
- <component t:x="223" t:y="16" name="testbutton2" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="prop2" name="content"/>
- </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>page opens</property>
  </component>
- <component name="text12" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text12" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xyz</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>ok button clicked</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cancel button clicked</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>timer fired</property>
  </component>
- <component t:x="13" t:y="58" name="timer3" t:title="timer" t:color="green1">
-  <t:implementation.python script="nuvem/timer.py"/>
-  <service name="timer" t:visible="false">
-   <t:binding.http uri="timer"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>https://testhttp.sca-store.com:8453/components/property</property>
+ </component>
+ <component x="13" y="58" name="timer3" title="timer" color="green1">
+  <implementation.python script="nuvem/timer.py"/>
+  <service name="timer" visible="false">
+   <binding.http uri="timer"/>
   </service>
   <reference target="number" name="n"/>
-  <reference target="property2" name="content"/>
+  <reference target="item2" name="content"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html
index 36b07205c7..6698c6faa8 100644
--- a/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html
@@ -18,40 +18,40 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="testbutton1" class="button" style="position: absolute; top: 207px; left: 2px; ">
-  <INPUT type="button" value="OK" class="graybutton"/>
- </SPAN>
- <SPAN id="testbutton2" class="button" style="position: absolute; top: 207px; left: 47px; ">
-  <INPUT type="button" value="Cancel" class="graybutton"/>
- </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 171px; left: 11px; ">
-  <SPAN>Latitude:</SPAN>
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test events</H1>
  </SPAN>
- <SPAN id="latitude" class="text" style="position: absolute; top: 171px; left: 92px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="testfield" class="entry" style="position: absolute; top: 54px; left: 11px; ">
+  <INPUT type="text" value="=testfield" size="10" autocapitalize="off"/>
  </SPAN>
- <SPAN id="longitude" class="text" style="position: absolute; top: 144px; left: 92px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 90px; left: 11px; ">
+  <SPAN>Status:</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 144px; left: 11px; ">
-  <SPAN>Longitude:</SPAN>
+ <SPAN id="status" class="text" style="position: absolute; top: 90px; left: 92px; ">
+  <SPAN>=status</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 117px; left: 11px; ">
+ <SPAN id="page:text" class="text" style="position: absolute; top: 117px; left: 11px; ">
   <SPAN>Field value:</SPAN>
  </SPAN>
  <SPAN id="testtext" class="text" style="position: absolute; top: 117px; left: 92px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=testtext</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 90px; left: 11px; ">
-  <SPAN>Status:</SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 144px; left: 11px; ">
+  <SPAN>Longitude:</SPAN>
  </SPAN>
- <SPAN id="status" class="text" style="position: absolute; top: 90px; left: 92px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="longitude" class="text" style="position: absolute; top: 144px; left: 92px; ">
+  <SPAN>=longitude</SPAN>
  </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 id="page:text" class="text" style="position: absolute; top: 171px; left: 11px; ">
+  <SPAN>Latitude:</SPAN>
  </SPAN>
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
-  <H1>Test events</H1>
+ <SPAN id="latitude" class="text" style="position: absolute; top: 171px; left: 92px; ">
+  <SPAN>=latitude</SPAN>
+ </SPAN>
+ <SPAN id="page:button" class="button" style="position: absolute; top: 207px; left: 2px; ">
+  <INPUT type="button" value="OK" class="graybutton"/>
+ </SPAN>
+ <SPAN id="page:button" class="button" style="position: absolute; top: 207px; left: 47px; ">
+  <INPUT type="button" value="Cancel" class="graybutton"/>
  </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 f9955c5640..a632809760 100644
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
@@ -17,7 +17,8 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="call" promote="call"/>
  <service name="get" promote="get"/>
  <service name="get2" promote="get2"/>
  <service name="get3" promote="get3"/>
@@ -25,106 +26,153 @@
  <service name="get5" promote="get5"/>
  <service name="get6" promote="get6"/>
  <service name="parse" promote="parse"/>
- <component name="first" t:title="first" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
+ <service name="item" promote="property"/>
+ <component x="36" y="287" name="call" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component name="first" title="first" color="yellow1">
+  <implementation.python script="nuvem/first.py"/>
   <service name="first"/>
   <reference target="rest" name="list"/>
  </component>
- <component t:x="20" t:y="8" name="get" t:title="get" t:color="green1">
+ <component x="20" y="8" name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text" name="url"/>
  </component>
- <component t:x="18" t:y="61" name="get2" t:title="get" t:color="green1">
+ <component x="18" y="61" name="get2" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text2" name="url"/>
  </component>
- <component t:x="14" t:y="112" name="get3" t:title="get" t:color="green1">
+ <component x="14" y="112" name="get3" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="17" t:y="166" name="get4" t:title="get" t:color="green1">
+ <component x="19" y="170" name="get4" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text4" name="url"/>
  </component>
- <component t:x="19" t:y="218" name="get5" t:title="get" t:color="green1">
+ <component x="241" y="6" name="get5" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
- <component t:x="19" t:y="271" name="get6" t:title="get" t:color="green1">
+ <component x="16" y="227" name="get6" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text6" name="url"/>
  </component>
- <component name="get7" t:title="get" t:color="green1">
+ <component name="get7" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text7" name="url"/>
  </component>
- <component name="join" t:title="join" t:color="magenta1">
-  <t:implementation.python script="nuvem/join.py"/>
+ <component name="join" title="join" color="magenta1">
+  <implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text9" name="separator"/>
   <reference target="first" name="list"/>
  </component>
- <component t:x="19" t:y="329" name="parse" t:title="parse" t:color="magenta1">
-  <t:implementation.python script="nuvem/parse.py"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="name" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>https://testhttp.sca-store.com:8453/components/property</property>
+ </component>
+ <component name="params" title="?params" color="green1">
+  <implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="query" visible="false"/>
+ </component>
+ <component x="597" y="167" name="parse" title="parse" color="magenta1">
+  <implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference target="text8" name="regexp"/>
   <reference target="join" name="string"/>
  </component>
- <component name="rest" t:title="rest" t:color="yellow1">
-  <t:implementation.python script="nuvem/rest.py"/>
+ <component x="74" y="343" name="property" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="list" name="value"/>
+  <property>test</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="user" name="value"/>
+  <property>user</property>
+ </component>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="params" name="value"/>
+  <property>name</property>
+ </component>
+ <component name="rest" title="rest" color="yellow1">
+  <implementation.python script="nuvem/rest.py"/>
   <service name="rest"/>
   <reference target="get7" name="list"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://www.google.com</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&amp;destination=Concord,MA&amp;waypoints=Charlestown,MA|Lexington,MA&amp;sensor=false</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <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 name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://feedproxy.google.com/TechCrunch</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cnn.com</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <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>
+  <property>https://chart.googleapis.com/chart?cht=p3&amp;chs=250x100&amp;chd=60,40&amp;chl=Hello|World</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cnn.com</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>(CNN)</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property name="property"/>
  </component>
+ <component name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html
index ddbd0ebc48..b0c20ef5e6 100644
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html
@@ -18,11 +18,11 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
   <H1>Test HTTP components</H1>
  </SPAN>
  <SPAN id="iframe" class="iframe" style="position: absolute; top: 234px; left: 11px; ">
-  <A href="https://testhttp.sca-store.com:8453/components/get5">
+  <A href="/public/iframe.html">
    <SPAN class="fakeframe">
     <SPAN>frame ...</SPAN>
    </SPAN>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
index d9b209fe10..86d4ed3365 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
@@ -17,7 +17,7 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="cos" promote="cos"/>
  <service name="eval" promote="eval"/>
  <service name="eval2" promote="eval2"/>
@@ -26,124 +26,124 @@
  <service name="if" promote="if"/>
  <service name="random" promote="random"/>
  <service name="sin" promote="sin"/>
- <component t:x="20" t:y="251" name="cos" t:title="cos" t:color="magenta1">
-  <t:implementation.python script="nuvem/cos_.py"/>
+ <component x="20" y="251" name="cos" title="cos" color="magenta1">
+  <implementation.python script="nuvem/cos_.py"/>
   <service name="cos"/>
   <reference target="number7" name="x"/>
  </component>
- <component t:x="170" t:y="11" name="eval" t:title="expr" t:color="magenta1">
-  <t:implementation.python script="nuvem/eval_.py"/>
+ <component x="170" y="11" name="eval" title="expr" color="magenta1">
+  <implementation.python script="nuvem/eval_.py"/>
   <service name="eval"/>
   <reference target="text3" name="py"/>
   <reference name="ref"/>
  </component>
- <component t:x="180" t:y="85" name="eval2" t:title="expr" t:color="magenta1">
-  <t:implementation.python script="nuvem/eval_.py"/>
+ <component x="180" y="85" name="eval2" title="expr" color="magenta1">
+  <implementation.python script="nuvem/eval_.py"/>
   <service name="eval"/>
   <reference target="text4" name="py"/>
   <reference target="number3" name="ref"/>
  </component>
- <component t:x="156" t:y="267" name="exec" t:title="script" t:color="magenta1">
-  <t:implementation.python script="nuvem/exec_.py"/>
+ <component x="156" y="267" name="exec" title="script" color="magenta1">
+  <implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference target="get" name="py"/>
   <reference target="number4" name="ref"/>
  </component>
- <component t:x="160" t:y="172" name="exec2" t:title="script" t:color="magenta1">
-  <t:implementation.python script="nuvem/exec_.py"/>
+ <component x="160" y="172" name="exec2" title="script" color="magenta1">
+  <implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference target="text6" name="py"/>
   <reference target="number5" name="ref"/>
  </component>
- <component name="get" t:title="get" t:color="green1">
+ <component name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
- <component name="greater" t:title="gt" t:color="magenta1">
-  <t:implementation.python script="nuvem/greater.py"/>
+ <component name="greater" title="gt" color="magenta1">
+  <implementation.python script="nuvem/greater.py"/>
   <service name="greater"/>
   <reference target="number2" name="value1"/>
   <reference target="number" name="value2"/>
  </component>
- <component t:x="19" t:y="9" name="if" t:title="if" t:color="magenta1">
-  <t:implementation.python script="nuvem/if_.py"/>
+ <component x="19" y="9" name="if" title="if" color="magenta1">
+  <implementation.python script="nuvem/if_.py"/>
   <service name="if"/>
   <reference target="greater" name="condition"/>
   <reference target="text" name="then"/>
   <reference target="text2" name="else"/>
  </component>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component name="number2" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number2" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3</property>
  </component>
- <component name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number3" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component name="number5" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number5" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component name="number6" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number6" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0.5</property>
  </component>
- <component name="number7" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number7" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0.5</property>
  </component>
- <component t:x="24" t:y="158" name="random" t:title="rand" t:color="magenta1">
-  <t:implementation.python script="nuvem/random_.py"/>
+ <component x="24" y="158" name="random" title="rand" color="magenta1">
+  <implementation.python script="nuvem/random_.py"/>
   <service name="random"/>
  </component>
- <component t:x="21" t:y="198" name="sin" t:title="sin" t:color="magenta1">
-  <t:implementation.python script="nuvem/sin_.py"/>
+ <component x="21" y="198" name="sin" title="sin" color="magenta1">
+  <implementation.python script="nuvem/sin_.py"/>
   <service name="sin"/>
   <reference target="number6" name="x"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>greater than 5</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>not greater than 5</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>3.14116 * 5 * 5</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://people.apache.org/~jsdelfino/tuscany/test/surface.py</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>val = 3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html
index c2dc3a21c2..4e9efdaa22 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page: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 3846266b74..2448aca193 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
@@ -17,190 +17,224 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="bingsearch" promote="bingsearch"/>
+ <service name="gaddress1" promote="gaddress1"/>
  <service name="get" promote="get"/>
+ <service name="ggeopos1" promote="ggeopos1"/>
  <service name="googlemap" promote="googlemap"/>
  <service name="googlemap2" promote="googlemap2"/>
  <service name="googlesearch" promote="googlesearch"/>
  <service name="weather" promote="weather"/>
  <service name="weather2" promote="weather2"/>
  <service name="yahoosearch" promote="yahoosearch"/>
- <component t:x="336" t:y="48" name="bingsearch" t:title="bing" t:color="red1">
-  <t:implementation.python script="nuvem/bsearch.py"/>
+ <component x="336" y="48" name="bingsearch" title="bing" color="red1">
+  <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 name="s" visible="false">
+   <binding.http uri="http://www.bing.com/search"/>
   </reference>
  </component>
- <component t:x="20" t:y="300" name="get" t:title="get" t:color="green1">
+ <component x="650" y="20" name="gaddress1" title="address" color="red1">
+  <implementation.python script="nuvem/gaddress.py"/>
+  <service name="gaddress"/>
+  <reference target="text1" name="address"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
+  </reference>
+ </component>
+ <component x="20" y="300" name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="347" t:y="106" name="googlemap" t:title="google map" t:color="red1">
-  <t:implementation.python script="nuvem/gmap.py"/>
+ <component x="650" y="80" name="ggeopos1" title="geo position" color="red1">
+  <implementation.python script="nuvem/ggeopos.py"/>
+  <service name="ggeopos"/>
+  <reference target="number1" name="latitude"/>
+  <reference target="number4" name="longitude"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
+  </reference>
+ </component>
+ <component x="347" y="106" name="googlemap" title="google map" color="red1">
+  <implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list2" name="locations"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component t:x="15" t:y="96" name="googlemap2" t:title="google map" t:color="red1">
-  <t:implementation.python script="nuvem/gmap.py"/>
+ <component x="15" y="96" name="googlemap2" title="google map" color="red1">
+  <implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list3" name="locations"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component t:x="18" t:y="0" name="googlesearch" t:title="google" t:color="red1">
-  <t:implementation.python script="nuvem/gsearch.py"/>
+ <component x="18" y="0" name="googlesearch" title="google" color="red1">
+  <implementation.python script="nuvem/gsearch.py"/>
   <service name="googlesearch"/>
   <reference target="text" name="query"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
   </reference>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="list" name="value"/>
+  <property>A</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="pair4" name="value"/>
+  <property>A</property>
+ </component>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="pair5" name="value"/>
+  <property>B</property>
+ </component>
+ <component name="list" title="list" color="yellow1">
+  <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"/>
+  <reference target="text4" name="item" clonable="true"/>
+  <reference target="number2" name="item" clonable="true"/>
+  <reference target="number3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>94070</property>
  </component>
- <component name="number2" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component x="730" y="80" name="number1" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>37.507156</property>
+ </component>
+ <component name="number2" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>37.507156</property>
  </component>
- <component name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number3" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>-122.260526</property>
  </component>
- <component name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
+ <component x="730" y="120" name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>-122.260526</property>
+ </component>
+ <component name="pair4" title="pair" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
   <service name="pair"/>
   <reference target="text7" name="name"/>
   <reference target="text5" name="value"/>
  </component>
- <component name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
+ <component name="pair5" title="pair" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
   <service name="pair"/>
   <reference target="text8" name="name"/>
   <reference target="text6" name="value"/>
  </component>
- <component name="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 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 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 name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>apache tuscany</property>
  </component>
- <component name="text10" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component x="710" y="20" name="text1" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>San Carlos, CA</property>
+ </component>
+ <component name="text10" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>apache tuscany</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>94070</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <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>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>green</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>San Francisco, CA</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>San Carlos, CA</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>yellow</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>green</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>apache tuscany</property>
  </component>
- <component t:x="18" t:y="49" name="weather" t:title="weather" t:color="red1">
-  <t:implementation.python script="nuvem/gweather.py"/>
+ <component x="18" y="49" name="weather" title="weather" color="red1">
+  <implementation.python script="nuvem/gweather.py"/>
   <service name="weather"/>
   <reference target="number" name="zip"/>
-  <reference name="ws" t:visible="false">
-   <t:binding.http uri="http://www.google.com/ig/api"/>
+  <reference name="ws" visible="false">
+   <binding.http uri="http://www.google.com/ig/api"/>
   </reference>
  </component>
- <component t:x="190" t:y="51" name="weather2" t:title="weather" t:color="red1">
-  <t:implementation.python script="nuvem/gweather.py"/>
+ <component x="190" y="51" name="weather2" title="weather" color="red1">
+  <implementation.python script="nuvem/gweather.py"/>
   <service name="weather"/>
   <reference target="text2" name="zip"/>
-  <reference name="ws" t:visible="false">
-   <t:binding.http uri="http://www.google.com/ig/api"/>
+  <reference name="ws" visible="false">
+   <binding.http uri="http://www.google.com/ig/api"/>
   </reference>
  </component>
- <component t:x="204" t:y="5" name="yahoosearch" t:title="yahoo" t:color="red1">
-  <t:implementation.python script="nuvem/ysearch.py"/>
+ <component x="204" y="5" name="yahoosearch" title="yahoo" color="red1">
+  <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 name="s" visible="false">
+   <binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
   </reference>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html
index 3760a04794..ca5462f07a 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page: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 ad7c983098..b331349b20 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
@@ -17,74 +17,74 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="sendgtalk" promote="sendgtalk"/>
  <service name="start" promote="start"/>
- <component name="fbprofile" t:title="facebook profile" t:color="blue1">
-  <t:implementation.python script="nuvem/fbprofile.py"/>
+ <component name="fbprofile" title="facebook profile" color="blue1">
+  <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 name="fb" visible="false">
+   <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component name="format" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text7" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="now" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="now" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <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 name="now" t:title="now" t:color="orange1">
-  <t:implementation.python script="nuvem/now.py"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="now" title="now" color="orange1">
+  <implementation.python script="nuvem/now.py"/>
   <service name="now"/>
  </component>
- <component name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="twprofile" name="value"/>
   <property>twitprofile</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="fbprofile" name="value"/>
   <property>name</property>
  </component>
- <component name="property3" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="twtimeline" name="value"/>
   <property>twittimeline</property>
  </component>
- <component name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="twfriends" name="value"/>
   <property>twitfriends</property>
  </component>
- <component name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="twfollowers" name="value"/>
   <property>twitfollowers</property>
  </component>
- <component t:x="34" t:y="286" name="sendgtalk" t:title="gtalk" t:color="blue1">
+ <component x="34" y="286" name="sendgtalk" title="gtalk" color="blue1">
   <implementation.cpp path="lib/chat" library="libchat-sender2"/>
   <service name="sendgtalk"/>
   <reference target="text8" name="jid"/>
@@ -92,88 +92,88 @@
   <reference target="text6" name="to"/>
   <reference target="format" name="msg"/>
  </component>
- <component t:x="33" t:y="12" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="33" y="12" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="list3" name="content"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>100001053301307</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmppsca.2@gmail.com</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>Hello, the time is {0}</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmppsca.1@gmail.com</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmpp4sca</property>
  </component>
- <component name="twfollowers" t:title="twitter followers" t:color="blue1">
-  <t:implementation.python script="nuvem/twfollowers.py"/>
+ <component name="twfollowers" title="twitter followers" color="blue1">
+  <implementation.python script="nuvem/twfollowers.py"/>
   <service name="twfollowers"/>
   <reference target="text5" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
+  <reference name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
   </reference>
  </component>
- <component name="twfriends" t:title="twitter friends" t:color="blue1">
-  <t:implementation.python script="nuvem/twfriends.py"/>
+ <component name="twfriends" title="twitter friends" color="blue1">
+  <implementation.python script="nuvem/twfriends.py"/>
   <service name="twfriends"/>
   <reference target="text4" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
+  <reference name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
   </reference>
  </component>
- <component name="twprofile" t:title="twitter profile" t:color="blue1">
-  <t:implementation.python script="nuvem/twprofile.py"/>
+ <component name="twprofile" title="twitter profile" color="blue1">
+  <implementation.python script="nuvem/twprofile.py"/>
   <service name="twprofile"/>
   <reference target="text3" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
+  <reference name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/users/show.json"/>
   </reference>
  </component>
- <component name="twtimeline" t:title="twitter timeline" t:color="blue1">
-  <t:implementation.python script="nuvem/twtimeline.py"/>
+ <component name="twtimeline" title="twitter timeline" color="blue1">
+  <implementation.python script="nuvem/twtimeline.py"/>
   <service name="twtimeline"/>
   <reference target="text2" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
+  <reference name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
   </reference>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html
index 9630d36d0f..5fe616ca16 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page: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 22436f5019..54771ecec8 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
@@ -17,7 +17,7 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="contains" promote="contains"/>
  <service name="format" promote="format"/>
  <service name="format2" promote="format2"/>
@@ -27,189 +27,189 @@
  <service name="replace" promote="replace"/>
  <service name="split" promote="split"/>
  <service name="uppercase" promote="uppercase"/>
- <component t:x="19" t:y="7" name="contains" t:title="contains" t:color="magenta1">
-  <t:implementation.python script="nuvem/contains.py"/>
+ <component x="19" y="7" name="contains" title="contains" color="magenta1">
+  <implementation.python script="nuvem/contains.py"/>
   <service name="contains"/>
   <reference target="text10" name="search"/>
   <reference target="text9" name="string"/>
  </component>
- <component t:x="176" t:y="115" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component x="176" y="115" name="format" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text13" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <component t:x="369" t:y="141" name="format2" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component x="369" y="141" name="format2" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text14" name="pattern"/>
   <reference target="list3" name="values"/>
  </component>
- <component t:x="361" t:y="8" name="join" t:title="join" t:color="magenta1">
-  <t:implementation.python script="nuvem/join.py"/>
+ <component x="361" y="8" name="join" title="join" color="magenta1">
+  <implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text6" name="separator"/>
   <reference target="list2" name="list"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text15" name="item" t:clonable="true"/>
-  <reference target="text16" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text15" name="item" clonable="true"/>
+  <reference target="text16" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text7" name="item" t:clonable="true"/>
-  <reference target="text8" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text7" name="item" clonable="true"/>
+  <reference target="text8" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <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"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component t:x="20" t:y="226" name="lowercase" t:title="lower" t:color="magenta1">
-  <t:implementation.python script="nuvem/lowercase.py"/>
+ <component x="20" y="226" name="lowercase" title="lower" color="magenta1">
+  <implementation.python script="nuvem/lowercase.py"/>
   <service name="lowercase"/>
   <reference target="text2" name="string"/>
  </component>
- <component t:x="142" t:y="252" name="parse" t:title="parse" t:color="magenta1">
-  <t:implementation.python script="nuvem/parse.py"/>
+ <component x="142" y="252" name="parse" title="parse" color="magenta1">
+  <implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference target="text19" name="regexp"/>
   <reference target="text20" name="string"/>
  </component>
- <component name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text17" name="value"/>
   <property>a</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text18" name="value"/>
   <property>b</property>
  </component>
- <component t:x="175" t:y="6" name="replace" t:title="replace" t:color="magenta1">
-  <t:implementation.python script="nuvem/replace.py"/>
+ <component x="175" y="6" name="replace" title="replace" color="magenta1">
+  <implementation.python script="nuvem/replace.py"/>
   <service name="replace"/>
   <reference target="text4" name="from"/>
   <reference target="text5" name="to"/>
   <reference target="text3" name="string"/>
  </component>
- <component t:x="23" t:y="89" name="split" t:title="split" t:color="magenta1">
-  <t:implementation.python script="nuvem/split.py"/>
+ <component x="23" y="89" name="split" title="split" color="magenta1">
+  <implementation.python script="nuvem/split.py"/>
   <service name="split"/>
   <reference target="text11" name="separator"/>
   <reference target="text12" name="string"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component name="text10" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text10" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cd</property>
  </component>
- <component name="text11" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text11" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component name="text12" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text12" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcxdefxghi</property>
  </component>
- <component name="text13" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text13" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>The {0} brown {1}</property>
  </component>
- <component name="text14" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text14" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>The {a} brown {b}</property>
  </component>
- <component name="text15" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text15" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>quick</property>
  </component>
- <component name="text16" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text16" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>fox</property>
  </component>
- <component name="text17" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text17" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>quick</property>
  </component>
- <component name="text18" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text18" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>fox</property>
  </component>
- <component name="text19" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text19" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>city (.*) state (.*)</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>ABC</property>
  </component>
- <component name="text20" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text20" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>city San Francisco state CA</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcxdefxghi</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>y</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>def</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcdef</property>
  </component>
- <component t:x="20" t:y="172" name="uppercase" t:title="upper" t:color="magenta1">
-  <t:implementation.python script="nuvem/uppercase.py"/>
+ <component x="20" y="172" name="uppercase" title="upper" color="magenta1">
+  <implementation.python script="nuvem/uppercase.py"/>
   <service name="uppercase"/>
   <reference target="text" name="string"/>
  </component>
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html
index 99f719ef40..1c7612d0e0 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page: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 2bb49a9e81..68f9e36675 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
@@ -17,105 +17,129 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="email" promote="email"/>
  <service name="host" promote="host"/>
+ <service name="keychain1" promote="keychain1"/>
+ <service name="keychain2" promote="keychain2"/>
  <service name="params" promote="params"/>
  <service name="path" promote="path"/>
  <service name="realm" promote="realm"/>
  <service name="url" promote="url"/>
  <service name="user" promote="user"/>
- <component t:x="17" t:y="223" name="email" t:title="email" t:color="green1">
-  <t:implementation.python script="nuvem/email.py"/>
+ <component x="17" y="223" name="email" title="email" color="green1">
+  <implementation.python script="nuvem/email.py"/>
   <service name="email"/>
   <property name="email"/>
  </component>
- <component t:x="14" t:y="1" name="host" t:title="host" t:color="green1">
-  <t:implementation.python script="nuvem/host.py"/>
+ <component x="14" y="1" name="host" title="host" color="green1">
+  <implementation.python script="nuvem/host.py"/>
   <service name="host"/>
   <property name="host"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text4" name="value"/>
+  <property>parmx</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text5" name="value"/>
+  <property>parmy</property>
+ </component>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="number" name="value"/>
+  <property>parmn</property>
+ </component>
+ <component x="330" y="60" name="keychain1" title="keychain" color="green1">
+  <implementation.python script="nuvem/keychain.py"/>
+  <service name="keychain"/>
+  <reference target="text1" name="name"/>
+  <reference name="account" target="Accounts" visible="false"/>
+ </component>
+ <component x="330" y="10" name="keychain2" title="keychain" color="green1">
+  <implementation.python script="nuvem/keychain.py"/>
+  <service name="keychain"/>
+  <reference target="name1" name="name"/>
+  <reference name="account" target="Accounts" visible="false"/>
+ </component>
+ <component name="list" title="list" color="yellow1">
+  <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 name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+  <reference target="text2" name="item" clonable="true"/>
+  <reference target="text3" name="item" clonable="true"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component x="400" y="10" name="name1" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>key2</property>
+ </component>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>123</property>
  </component>
- <component t:x="16" t:y="91" name="params" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
+ <component x="16" y="91" name="params" title="?params" color="green1">
+  <implementation.python script="nuvem/params.py"/>
   <service name="params"/>
   <property name="params"/>
  </component>
- <component t:x="17" t:y="48" name="path" t:title="path" t:color="green1">
-  <t:implementation.python script="nuvem/path.py"/>
+ <component x="17" y="48" name="path" title="path" color="green1">
+  <implementation.python script="nuvem/path.py"/>
   <service name="path"/>
   <property name="path"/>
  </component>
- <component 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 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 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="14" t:y="177" name="realm" t:title="realm" t:color="green1">
-  <t:implementation.python script="nuvem/realm.py"/>
+ <component x="14" y="177" name="realm" title="realm" color="green1">
+  <implementation.python script="nuvem/realm.py"/>
   <service name="realm"/>
   <property name="realm"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://sca-store.com/</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component x="400" y="10" name="text1" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>key2</property>
+ </component>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>path</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xx</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>yy</property>
  </component>
- <component t:x="117" t:y="14" name="url" t:title="url" t:color="green1">
-  <t:implementation.python script="nuvem/url.py"/>
+ <component x="120" y="10" name="url" title="url" color="green1">
+  <implementation.python script="nuvem/url.py"/>
   <service name="url"/>
   <reference target="text" name="address"/>
   <reference target="list" name="args"/>
  </component>
- <component t:x="16" t:y="134" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
+ <component x="16" y="134" name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user"/>
  </component>
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
index 9641f58ba5..8c47186044 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page: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 6793aceef1..172fbb90d9 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
@@ -17,339 +17,353 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="empty" promote="empty"/>
  <service name="false" promote="false"/>
  <service name="first" promote="first"/>
  <service name="itemnb" promote="itemnb"/>
  <service name="list8" promote="list8"/>
  <service name="list9" promote="list9"/>
- <service name="lookup" promote="lookup"/>
  <service name="name" promote="name"/>
  <service name="nothing" promote="nothing"/>
  <service name="reduce2" promote="reduce2"/>
  <service name="rest" promote="rest"/>
- <service name="search" promote="search"/>
+ <service name="second" promote="second"/>
  <service name="shuffle" promote="shuffle"/>
  <service name="start" promote="start"/>
  <service name="true" promote="true"/>
- <component name="add" t:title="+" t:color="magenta1">
-  <t:implementation.python script="nuvem/add.py"/>
+ <service name="values" promote="values"/>
+ <service name="values2" promote="values2"/>
+ <component name="add" title="+" color="magenta1">
+  <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="17" t:y="269" name="empty" t:title="empty" t:color="yellow1">
-  <t:implementation.python script="nuvem/empty.py"/>
+ <component x="17" y="269" name="empty" title="empty" color="yellow1">
+  <implementation.python script="nuvem/empty.py"/>
   <service name="empty"/>
  </component>
- <component t:x="21" t:y="170" name="false" t:title="false" t:color="orange1">
-  <t:implementation.python script="nuvem/false_.py"/>
+ <component x="21" y="170" name="false" title="false" color="orange1">
+  <implementation.python script="nuvem/false_.py"/>
   <service name="false"/>
  </component>
- <component t:x="121" t:y="26" name="first" t:title="first" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
+ <component x="121" y="26" name="first" title="first" color="yellow1">
+  <implementation.python script="nuvem/first.py"/>
   <service name="first"/>
   <reference target="list7" name="list"/>
  </component>
- <component name="foreach" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
+ <component name="foreach" title="foreach" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
   <service name="foreach"/>
   <reference target="name2" name="item"/>
   <reference target="multiply" name="transform"/>
   <reference target="reverse" name="list"/>
  </component>
- <component t:x="123" t:y="147" name="itemnb" t:title="item #" t:color="yellow1">
-  <t:implementation.python script="nuvem/itemnb.py"/>
+ <component x="123" y="147" name="itemnb" title="item #" color="yellow1">
+  <implementation.python script="nuvem/itemnb.py"/>
   <service name="itemnb"/>
   <reference target="number8" name="index"/>
   <reference target="foreach" name="list"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <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"/>
+  <reference target="number" name="item" clonable="true"/>
+  <reference target="number7" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list10" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list10" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property13" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item13" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list2" title="list" color="yellow1">
+  <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"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item14" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <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"/>
+  <reference target="item10" name="item" clonable="true"/>
+  <reference target="item9" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list4" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference target="property6" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference target="item6" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list5" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list5" title="list" color="yellow1">
+  <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"/>
+  <reference target="item8" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list6" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list6" title="list" color="yellow1">
+  <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"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list7" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list7" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="number2" name="item" t:clonable="true"/>
-  <reference target="number3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="number2" name="item" clonable="true"/>
+  <reference target="number3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component t:x="430" t:y="269" name="list8" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component x="430" y="269" name="list8" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property11" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item11" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component t:x="407" t:y="354" name="list9" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component x="407" y="354" name="list9" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property12" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item12" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component t:x="32" t:y="375" name="lookup" t:title="lookup" t:color="yellow1">
-  <t:implementation.python script="nuvem/lookup.py"/>
+ <component name="lookup" title="lookup" color="yellow1">
+  <implementation.python script="nuvem/lookup.py"/>
   <service name="lookup"/>
   <reference target="name3" name="name"/>
   <reference target="list2" name="list"/>
  </component>
- <component name="multiply" t:title="*" t:color="magenta1">
-  <t:implementation.python script="nuvem/multiply.py"/>
+ <component name="multiply" title="*" color="magenta1">
+  <implementation.python script="nuvem/multiply.py"/>
   <service name="multiply">
    <documentation>*</documentation>
   </service>
   <reference target="valueof" name="value1"/>
   <reference target="number6" name="value2"/>
  </component>
- <component t:x="21" t:y="70" name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component x="21" y="70" name="name" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>abc</property>
  </component>
- <component name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name2" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>nb</property>
  </component>
- <component name="name3" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name3" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>d</property>
  </component>
- <component name="name6" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name6" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>sum</property>
  </component>
- <component name="name7" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name7" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>i</property>
  </component>
- <component name="name8" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name8" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>a.b</property>
  </component>
- <component t:x="19" t:y="219" name="nothing" t:title="nothing" t:color="orange1">
-  <t:implementation.python script="nuvem/nothing.py"/>
+ <component x="19" y="219" name="nothing" title="nothing" color="orange1">
+  <implementation.python script="nuvem/nothing.py"/>
   <service name="nothing"/>
  </component>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>12</property>
  </component>
- <component name="number10" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number10" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <component name="number11" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number11" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>123</property>
  </component>
- <component name="number12" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number12" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component name="number13" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number13" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <component name="number14" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number14" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component name="number2" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number2" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>123</property>
  </component>
- <component name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number3" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>456</property>
  </component>
- <component name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component name="number5" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number5" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <component name="number6" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number6" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>2</property>
  </component>
- <component name="number7" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number7" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>34</property>
  </component>
- <component name="number8" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number8" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3</property>
  </component>
- <component name="number9" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number9" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text3" name="value"/>
   <property>a</property>
  </component>
- <component name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item10" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list6" name="value"/>
   <property>a</property>
  </component>
- <component name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item11" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text7" name="value"/>
   <property>entry</property>
  </component>
- <component name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item12" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list10" name="value"/>
   <property>entry</property>
  </component>
- <component name="property13" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item13" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text9" name="value"/>
   <property>test</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item14" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text10" name="value"/>
+  <property>d</property>
+ </component>
+ <component name="item15" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text11" name="value"/>
+  <property>x</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text4" name="value"/>
   <property>d</property>
  </component>
- <component name="property3" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text5" name="value"/>
   <property>ccc</property>
  </component>
- <component name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text2" name="value"/>
   <property>b</property>
  </component>
- <component name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text8" name="value"/>
   <property>c</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number11" name="value"/>
   <property>c</property>
  </component>
- <component name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item7" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text6" name="value"/>
   <property>b</property>
  </component>
- <component name="property8" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item8" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list4" name="value"/>
   <property>a</property>
  </component>
- <component name="property9" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item9" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list5" name="value"/>
   <property>x</property>
  </component>
- <component name="range" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
+ <component name="range" title="range" color="yellow1">
+  <implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
   <reference target="number4" name="first"/>
   <reference target="number5" name="last"/>
  </component>
- <component name="range2" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
+ <component name="range2" title="range" color="yellow1">
+  <implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
   <reference target="number9" name="first"/>
   <reference target="number10" name="last"/>
  </component>
- <component name="range3" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
+ <component name="range3" title="range" color="yellow1">
+  <implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
   <reference target="number12" name="first"/>
   <reference target="number13" name="last"/>
  </component>
- <component t:x="437" t:y="24" name="reduce2" t:title="reduce" t:color="yellow1">
-  <t:implementation.python script="nuvem/reduce_.py"/>
+ <component x="437" y="24" name="reduce2" title="reduce" color="yellow1">
+  <implementation.python script="nuvem/reduce_.py"/>
   <service name="reduce"/>
   <reference target="name6" name="item"/>
   <reference target="name7" name="accum"/>
@@ -357,96 +371,121 @@
   <reference target="number14" name="init"/>
   <reference target="range2" name="list"/>
  </component>
- <component t:x="290" t:y="18" name="rest" t:title="rest" t:color="yellow1">
-  <t:implementation.python script="nuvem/rest.py"/>
+ <component x="290" y="18" name="rest" title="rest" color="yellow1">
+  <implementation.python script="nuvem/rest.py"/>
   <service name="rest"/>
   <reference target="list" name="list"/>
  </component>
- <component name="reverse" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
+ <component name="reverse" title="reverse" color="yellow1">
+  <implementation.python script="nuvem/reverse.py"/>
   <service name="reverse"/>
   <reference target="range" name="list"/>
  </component>
- <component t:x="628" t:y="20" name="search" t:title="search" t:color="yellow1">
-  <t:implementation.python script="nuvem/search.py"/>
-  <service name="search"/>
+ <component name="select" title="select" color="yellow1">
+  <implementation.python script="nuvem/select.py"/>
+  <service name="select"/>
   <reference target="name8" name="path"/>
   <reference target="list3" name="list"/>
  </component>
- <component t:x="223" t:y="368" name="shuffle" t:title="shuffle" t:color="yellow1">
-  <t:implementation.python script="nuvem/shuffle_.py"/>
+ <component x="1026" y="233" name="second" title="second" color="yellow1">
+  <implementation.python script="nuvem/second.py"/>
+  <service name="second"/>
+  <reference target="item15" name="list"/>
+ </component>
+ <component x="223" y="368" name="shuffle" title="shuffle" color="yellow1">
+  <implementation.python script="nuvem/shuffle_.py"/>
   <service name="shuffle"/>
   <reference target="range3" name="list"/>
  </component>
- <component t:x="15" t:y="11" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="15" y="11" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="text" name="content"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xyz</property>
+ </component>
+ <component name="text10" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xyz</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text11" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>y</property>
+ </component>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>bbb</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>def</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>ccc</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>BBB</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>hello</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>CCC</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component t:x="23" t:y="120" name="true" t:title="true" t:color="orange1">
-  <t:implementation.python script="nuvem/true_.py"/>
+ <component x="23" y="120" name="true" title="true" color="orange1">
+  <implementation.python script="nuvem/true_.py"/>
   <service name="true"/>
  </component>
- <component name="valueof" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>nb</property>
  </component>
- <component name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof2" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>sum</property>
  </component>
- <component name="valueof3" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof3" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>i</property>
  </component>
+ <component x="1020" y="31" name="values" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference target="lookup" name="list"/>
+ </component>
+ <component x="639" y="12" name="values2" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference target="select" name="list"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html
index 97889b7a9d..79bb081a97 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html
@@ -18,10 +18,10 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Test values and lists</H2>
  </SPAN>
  <SPAN id="value" class="text" style="position: absolute; top: 36px; left: 29px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=value</SPAN>
  </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 6b08e18f3b..690f1761e3 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
@@ -17,131 +17,131 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <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 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 name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+  <reference target="item10" name="item" clonable="true"/>
+  <reference target="item9" name="item" clonable="true"/>
+  <reference target="item8" name="item" clonable="true"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference target="item6" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text9" name="value"/>
   <property>testpath2</property>
  </component>
- <component name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item10" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text" name="value"/>
   <property>testh1</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="property" name="value"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="item" name="value"/>
   <property>testpath1</property>
  </component>
- <component name="property3" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text6" name="value"/>
   <property>testimg</property>
  </component>
- <component name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text8" name="value"/>
   <property>testtext</property>
  </component>
- <component name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text4" name="value"/>
   <property>testlink</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text5" name="value"/>
   <property>testcheckbox</property>
  </component>
- <component name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item7" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text3" name="value"/>
   <property>testentry</property>
  </component>
- <component name="property8" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item8" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text2" name="value"/>
   <property>testbutton</property>
  </component>
- <component name="property9" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item9" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text7" name="value"/>
   <property>testsection</property>
  </component>
- <component t:x="17" t:y="3" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="17" y="3" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="list" name="content"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test header 1</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test button</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test entry field</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://tuscany.apache.org</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test checkbox</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test section</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test text</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test path</property>
  </component>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html
index ff255ee45d..0b5022513d 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html
@@ -19,43 +19,43 @@
 -->
 <DIV id="page">
  <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; ">
-  <H1>Header1</H1>
+  <H1>=testh1</H1>
  </SPAN>
  <SPAN id="testsection" class="section" style="position: absolute; top: 45px; width: 100%; left: 11px; ">
-  <SPAN>section</SPAN>
+  <SPAN>=testsection</SPAN>
  </SPAN>
  <SPAN id="testimg" class="img" style="position: absolute; top: 90px; left: 263px; ">
   <IMG src="/public/img.png"/>
  </SPAN>
  <SPAN id="testbutton" class="button" style="position: absolute; top: 99px; left: 11px; ">
-  <INPUT type="button" value="button" class="graybutton"/>
+  <INPUT type="button" value="=testbutton" class="graybutton"/>
  </SPAN>
  <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; ">
-  <INPUT type="text" value="field" size="20" autocapitalize="off"/>
+  <INPUT type="text" value="=testentry" size="20" autocapitalize="off"/>
  </SPAN>
  <SPAN id="testcheckbox" class="checkbox" style="position: absolute; top: 180px; left: 11px; ">
-  <INPUT type="checkbox" value="checkbox"/>
-  <SPAN>checkbox</SPAN>
+  <INPUT type="checkbox" value="=testcheckbox"/>
+  <SPAN>=testcheckbox</SPAN>
  </SPAN>
  <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 href="=testlink2">
+   <SPAN>=testlink2</SPAN>
   </A>
  </SPAN>
  <SPAN id="testlink" class="link" style="position: absolute; top: 216px; left: 11px; ">
-  <A href="link">
-   <SPAN>link</SPAN>
+  <A href="=testlink">
+   <SPAN>=testlink</SPAN>
   </A>
  </SPAN>
  <SPAN id="testlink3" class="link" style="position: absolute; top: 225px; left: 263px; ">
-  <A href="http://www.apache.org">
-   <SPAN> Apache</SPAN>
+  <A href="=testlink3">
+   <SPAN>=testlink3</SPAN>
   </A>
  </SPAN>
  <SPAN id="testtext" class="text" style="position: absolute; top: 243px; left: 11px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=testtext</SPAN>
  </SPAN>
  <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 270px; left: 11px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=testpath1.testpath2</SPAN>
  </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 1a14eec510..84d87bf184 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
@@ -17,113 +17,113 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <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>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="list3" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text3" name="item" t:clonable="true"/>
-  <reference target="text4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text3" name="item" clonable="true"/>
+  <reference target="text4" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list4" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property6" name="item" t:clonable="true"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item6" name="item" clonable="true"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number3" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>1</property>
  </component>
- <component name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>2</property>
  </component>
- <component name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text5" name="value"/>
   <property>testframe</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list3" name="value"/>
   <property>testlink</property>
  </component>
- <component name="property3" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text2" name="value"/>
   <property>testhtml</property>
  </component>
- <component name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text" name="value"/>
   <property>testlist1</property>
  </component>
- <component name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list4" name="value"/>
   <property>testlist2</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number3" name="value"/>
   <property>a</property>
  </component>
- <component name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item7" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number4" name="value"/>
   <property>b</property>
  </component>
- <component t:x="13" t:y="8" name="start" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/start.py"/>
-  <service name="start" t:visible="false">
-   <t:binding.http uri="start"/>
+ <component x="13" y="8" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="list" name="content"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test value</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>&lt;b&gt;test bold text&lt;/b&gt;</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://www.apache.org/</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>Apache</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://www.cnn.com</property>
  </component>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html
index 2bf6593f02..a42c96bdff 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html
@@ -18,14 +18,14 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Test widget components</H2>
  </SPAN>
- <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; left: 20px; ">
-  <TABLE class="datatable" style="width: 100%; ">
+ <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; width: 100%; left: 20px; ">
+  <TABLE class="datatable" style="width: 100%;">
    <TBODY>
     <TR>
-     <TD>table</TD>
+     <TD>=testlist1</TD>
      <TD>...</TD>
     </TR>
     <TR>
@@ -35,11 +35,11 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; left: 20px; ">
-  <TABLE class="datatable" style="width: 100%; ">
+ <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; width: 100%; left: 20px; ">
+  <TABLE class="datatable" style="width: 100%;">
    <TBODY>
     <TR>
-     <TD>table</TD>
+     <TD>=testlist2</TD>
      <TD>...</TD>
     </TR>
     <TR>
@@ -49,11 +49,11 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 20px; ">
-  <TABLE class="datatable" style="width: 100%; ">
+ <SPAN id="b" class="table" style="position: absolute; top: 180px; width: 100%; left: 20px; ">
+  <TABLE class="datatable" style="width: 100%;">
    <TBODY>
     <TR>
-     <TD>table</TD>
+     <TD>=b</TD>
      <TD>...</TD>
     </TR>
     <TR>
@@ -64,16 +64,16 @@
   </TABLE>
  </SPAN>
  <SPAN id="testhtml" class="text" style="position: absolute; top: 234px; left: 20px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=testhtml</SPAN>
  </SPAN>
  <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; ">
   <SELECT>
-   <OPTION>select</OPTION>
+   <OPTION>=testselect</OPTION>
   </SELECT>
  </SPAN>
  <SPAN id="testlink" class="link" style="position: absolute; top: 270px; left: 20px; ">
-  <A href="/">
-   <SPAN>link</SPAN>
+  <A href="=testlink">
+   <SPAN>=testlink</SPAN>
   </A>
  </SPAN>
  <SPAN id="testframe" class="iframe" style="position: absolute; top: 306px; left: 20px; ">
diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
index 1ab4d4a54f..d22b9482ee 100644
--- a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
@@ -1,78 +1,49 @@
 <?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="start" promote="start"/>
-    <service name="stop" promote="stop"/>
-    <service name="service" promote="service"/>
-    <service name="timer" promote="timer"/>
-    <service name="geolocation" promote="geolocation"/>
-    <service name="call" promote="call"/>
-
-    <component name="start" t:title="start" t:color="green1">
-        <t:implementation.python script="nuvem/start.py"/>
-        <service name="start" t:visible="false">
-            <t:binding.http uri="start"/>
-        </service>
-        <reference name="content"/>
-    </component>
-    
-    <component name="stop" t:title="stop" t:color="green1">
-        <t:implementation.python script="nuvem/stop.py"/>
-        <service name="stop" t:visible="false">
-            <t:binding.http uri="stop"/>
-        </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="timer" t:title="timer" t:color="green1">
-        <t:implementation.python script="nuvem/timer.py"/>
-        <service name="timer" t:visible="false">
-            <t:binding.http uri="timer"/>
-        </service>
-        <reference 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 xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="call" promote="call"/>
+ <service name="location" promote="location"/>
+ <service name="service" promote="service"/>
+ <service name="start" promote="start"/>
+ <service name="stop" promote="stop"/>
+ <service name="timer" promote="timer"/>
+ <component x="90" y="70" name="call" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component x="90" y="120" name="location" title="location" color="green1">
+  <implementation.python script="nuvem/location.py"/>
+  <service name="location" visible="false">
+   <binding.http uri="location"/>
+  </service>
+  <reference name="content"/>
+ </component>
+ <component x="160" y="70" name="service" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference name="content"/>
+ </component>
+ <component x="90" y="10" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
+  </service>
+  <reference name="content"/>
+ </component>
+ <component x="150" y="10" name="stop" title="stop" color="green1">
+  <implementation.python script="nuvem/stop.py"/>
+  <service name="stop" visible="false">
+   <binding.http uri="stop"/>
+  </service>
+  <reference name="content"/>
+ </component>
+ <component x="210" y="10" name="timer" title="timer" color="green1">
+  <implementation.python script="nuvem/timer.py"/>
+  <service name="timer" visible="false">
+   <binding.http uri="timer"/>
+  </service>
+  <reference name="n"/>
+  <reference name="content"/>
+ </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 f9dab736f8..42d67af548 100644
--- a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
@@ -1,84 +1,54 @@
 <?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://database"
-  name="palette">
-        
-    <service name="filedb" promote="filedb"/>
-    <service name="nosqldb" promote="nosqldb"/>
-    <service name="sqldb" promote="sqldb"/>
-    <service name="get" promote="get"/>
-    <service name="post" promote="post"/>
-    <service name="put" promote="put"/>
-    <service name="delete" promote="delete"/>
-
-    <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="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 **" 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="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="red1">
-        <t:implementation.python script="nuvem/post.py"/>
-        <service name="post"/>
-        <reference name="collection"/>
-        <reference name="id"/>
-        <reference name="value"/>
-    </component>
-    
-    <component name="put" t:title="put" t:color="red1">
-        <t:implementation.python script="nuvem/put.py"/>
-        <service name="put"/>
-        <reference name="collection"/>
-        <reference name="id"/>
-        <reference name="value"/>
-    </component>
-    
-    <component name="delete" t:title="delete" t:color="red1">
-        <t:implementation.python script="nuvem/delete.py"/>
-        <service name="delete"/>
-        <reference name="collection"/>
-        <reference name="id"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="delete" promote="delete"/>
+ <service name="filedb" promote="filedb"/>
+ <service name="get" promote="get"/>
+ <service name="nosqldb" promote="nosqldb"/>
+ <service name="post" promote="post"/>
+ <service name="put" promote="put"/>
+ <service name="sqldb" promote="sqldb"/>
+ <component x="230" y="60" name="delete" title="delete" color="red1">
+  <implementation.python script="nuvem/delete.py"/>
+  <service name="delete"/>
+  <reference name="collection"/>
+  <reference name="id"/>
+ </component>
+ <component x="90" y="10" name="filedb" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
+ </component>
+ <component x="90" y="60" name="get" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference name="collection"/>
+  <reference name="id"/>
+ </component>
+ <component x="150" y="10" name="nosqldb" title="index **" color="red1">
+  <implementation.python script="nuvem/nosqldb.py"/>
+  <service name="nosqldb"/>
+  <reference name="db" target="AppDataNoSQLCache" visible="false"/>
+  <property name="host" visible="false"/>
+ </component>
+ <component x="90" y="130" name="post" title="post" color="red1">
+  <implementation.python script="nuvem/post.py"/>
+  <service name="post"/>
+  <reference name="collection"/>
+  <reference name="id"/>
+  <reference name="value"/>
+ </component>
+ <component x="160" y="60" name="put" title="put" color="red1">
+  <implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference name="collection"/>
+  <reference name="id"/>
+  <reference name="value"/>
+ </component>
+ <component x="240" y="10" name="sqldb" title="sql **" color="red1">
+  <implementation.python script="nuvem/sqldb.py"/>
+  <service name="sqldb"/>
+  <reference name="db" target="AppDataSQLCache" visible="false"/>
+  <property name="host" visible="false"/>
+ </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 317cf338ed..6b518f0a35 100644
--- a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
@@ -1,107 +1,80 @@
 <?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://http"
-  name="palette">
-        
-    <service name="host" promote="host"/>
-    <service name="path" promote="path"/>
-    <service name="params" promote="params"/>
-    <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"/>
-    <service name="delete" promote="delete"/>
-
-    <component name="host" t:title="host" t:color="green1">
-        <t:implementation.python script="nuvem/host.py"/>
-        <service name="host"/>
-        <property name="host" t:visible="false"></property>
-    </component>
-    
-    <component name="path" t:title="path" t:color="green1">
-        <t:implementation.python script="nuvem/path.py"/>
-        <service name="path"/>
-        <property name="path" t:visible="false"></property>
-    </component>
-    
-    <component name="params" t:title="?params" t:color="green1">
-        <t:implementation.python script="nuvem/params.py"/>
-        <service name="params"/>
-        <property name="query" t:visible="false"></property>
-    </component>
-    
-    <component name="param" t:title="?param" t:color="green1">
-        <t:implementation.python script="nuvem/param.py"/>
-        <service name="param"/>
-        <property name="name">x</property>
-        <property name="query" t:visible="false"></property>
-    </component>
-    
-    <component name="user" t:title="user" t:color="green1">
-        <t:implementation.python script="nuvem/user.py"/>
-        <service name="user"/>
-        <property name="user" t:visible="false"></property>
-    </component>
-    
-    <component name="email" t:title="email" t:color="green1">
-        <t:implementation.python script="nuvem/email.py"/>
-        <service name="email"/>
-        <property name="email" t:visible="false"></property>
-    </component>
-    
-    <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="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="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="delete" t:color="green1">
-        <implementation.cpp path="lib/http" library="libhttpdelete"/>
-        <service name="delete"/>
-        <reference name="url"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="delete" promote="delete"/>
+ <service name="email" promote="email"/>
+ <service name="get" promote="get"/>
+ <service name="host" promote="host"/>
+ <service name="keychain" promote="keychain"/>
+ <service name="param" promote="param"/>
+ <service name="params" promote="params"/>
+ <service name="path" promote="path"/>
+ <service name="post" promote="post"/>
+ <service name="put" promote="put"/>
+ <service name="url" promote="url"/>
+ <service name="user" promote="user"/>
+ <component x="180" y="230" name="delete" title="delete" color="green1">
+  <implementation.cpp path="lib/http" library="libhttpdelete"/>
+  <service name="delete"/>
+  <reference name="url"/>
+ </component>
+ <component x="160" y="110" name="email" title="email" color="green1">
+  <implementation.python script="nuvem/email.py"/>
+  <service name="email"/>
+  <property name="email" visible="false"/>
+ </component>
+ <component x="150" y="160" name="get" title="get" color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference name="url"/>
+ </component>
+ <component x="90" y="10" name="host" title="host" color="green1">
+  <implementation.python script="nuvem/host.py"/>
+  <service name="host"/>
+  <property name="host" visible="false"/>
+ </component>
+ <component x="230" y="110" name="keychain" title="keychain" color="green1">
+  <implementation.python script="nuvem/keychain.py"/>
+  <service name="keychain"/>
+  <reference name="name"/>
+  <reference name="account" target="Accounts" visible="false"/>
+ </component>
+ <component x="180" y="60" name="param" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>x</property>
+  <property name="query" visible="false"/>
+ </component>
+ <component x="90" y="60" name="params" title="?params" color="green1">
+  <implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="query" visible="false"/>
+ </component>
+ <component x="160" y="10" name="path" title="path" color="green1">
+  <implementation.python script="nuvem/path.py"/>
+  <service name="path"/>
+  <property name="path" visible="false"/>
+ </component>
+ <component x="90" y="230" name="post" title="post **" color="green1">
+  <implementation.cpp path="lib/http" library="libhttppost"/>
+  <service name="post"/>
+  <reference name="url"/>
+  <reference name="content"/>
+ </component>
+ <component x="220" y="160" name="put" title="put **" color="green1">
+  <implementation.cpp path="lib/http" library="libhttpput"/>
+  <service name="put"/>
+  <reference name="url"/>
+  <reference name="content"/>
+ </component>
+ <component x="90" y="160" name="url" title="url" color="green1">
+  <implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference name="address"/>
+  <reference name="args"/>
+ </component>
+ <component x="90" y="110" name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
index 2272a107c7..4190398e80 100644
--- a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
@@ -1,137 +1,99 @@
 <?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://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="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">
-        <t:implementation.python script="nuvem/pair.py"/>
-        <service name="pair"/>
-        <reference name="name"/>
-        <reference name="value"/>
-    </component>
-    
-    <component name="list" t:title="list" t:color="yellow1">
-        <t:implementation.python script="nuvem/list_.py"/>
-        <service name="list"/>
-        <reference name="item" t:clonable="true"/>
-    </component>
-    
-    <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" t:color="yellow1">
-        <t:implementation.python script="nuvem/rest.py"/>
-        <service name="rest"/>
-        <reference name="list"/>
-    </component>
-    
-    <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="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 #" t:color="yellow1">
-        <t:implementation.python script="nuvem/itemnb.py"/>
-        <service name="itemnb"/>
-        <reference name="index"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="lookup" t:title="lookup" t:color="yellow1">
-        <t:implementation.python script="nuvem/lookup.py"/>
-        <service name="lookup"/>
-        <reference name="name"/>
-        <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">
-        <t:implementation.python script="nuvem/range_.py"/>
-        <service name="range"/>
-        <reference name="first"/>
-        <reference name="last"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="append" promote="append"/>
+ <service name="empty" promote="empty"/>
+ <service name="first" promote="first"/>
+ <service name="insert" promote="insert"/>
+ <service name="itemnb" promote="itemnb"/>
+ <service name="last" promote="last"/>
+ <service name="list" promote="list"/>
+ <service name="lookup" promote="lookup"/>
+ <service name="names" promote="names"/>
+ <service name="pair" promote="pair"/>
+ <service name="range" promote="range"/>
+ <service name="rest" promote="rest"/>
+ <service name="second" promote="second"/>
+ <service name="select" promote="select"/>
+ <service name="values" promote="values"/>
+ <component x="170" y="70" name="append" title="+" color="yellow1">
+  <implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference name="first"/>
+  <reference name="second"/>
+ </component>
+ <component x="230" y="10" name="empty" title="empty" color="yellow1">
+  <implementation.python script="nuvem/empty.py"/>
+  <service name="empty"/>
+ </component>
+ <component x="90" y="140" name="first" title="first" color="yellow1">
+  <implementation.python script="nuvem/first.py"/>
+  <service name="first"/>
+  <reference name="list"/>
+ </component>
+ <component x="90" y="70" name="insert" title="insert" color="yellow1">
+  <implementation.python script="nuvem/insert.py"/>
+  <service name="insert"/>
+  <reference name="value"/>
+  <reference name="list"/>
+ </component>
+ <component x="230" y="140" name="itemnb" title="item #" color="yellow1">
+  <implementation.python script="nuvem/itemnb.py"/>
+  <service name="itemnb"/>
+  <reference name="index"/>
+  <reference name="list"/>
+ </component>
+ <component x="160" y="190" name="last" title="last" color="yellow1">
+  <implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference name="list"/>
+ </component>
+ <component x="90" y="13" name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component x="90" y="240" name="lookup" title="lookup" color="yellow1">
+  <implementation.python script="nuvem/lookup.py"/>
+  <service name="lookup"/>
+  <reference name="name"/>
+  <reference name="list"/>
+ </component>
+ <component x="90" y="310" name="names" title="names" color="yellow1">
+  <implementation.python script="nuvem/names.py"/>
+  <service name="names"/>
+  <reference name="list"/>
+ </component>
+ <component x="160" y="10" name="pair" title="pair" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="pair"/>
+  <reference name="name"/>
+  <reference name="value"/>
+ </component>
+ <component x="230" y="70" name="range" title="range" color="yellow1">
+  <implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference name="first"/>
+  <reference name="last"/>
+ </component>
+ <component x="90" y="190" name="rest" title="rest" color="yellow1">
+  <implementation.python script="nuvem/rest.py"/>
+  <service name="rest"/>
+  <reference name="list"/>
+ </component>
+ <component x="150" y="140" name="second" title="second" color="yellow1">
+  <implementation.python script="nuvem/second.py"/>
+  <service name="second"/>
+  <reference name="list"/>
+ </component>
+ <component x="170" y="240" name="select" title="select" color="yellow1">
+  <implementation.python script="nuvem/select.py"/>
+  <service name="select"/>
+  <reference name="path"/>
+  <reference name="list"/>
+ </component>
+ <component x="170" y="310" name="values" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference name="list"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
index e24d93a987..0c5a769567 100644
--- a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
@@ -1,82 +1,52 @@
 <?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://logic"
-  name="palette">
-        
-    <service name="if" promote="if"/>
-    <service name="and" promote="and"/>
-    <service name="or" promote="or"/>
-    <service name="not" promote="not"/>
-    <service name="equals" promote="equals"/>
-    <service name="greater" promote="greater"/>
-    <service name="lesser" promote="lesser"/>
-
-    <component name="if" t:title="if" t:color="magenta1">
-        <t:implementation.python script="nuvem/if_.py"/>
-        <service name="if"/>
-        <reference name="condition"/>
-        <reference name="then"/>
-        <reference name="else"/>
-    </component>
-    
-    <component name="and" t:title="and" t:color="magenta1">
-        <t:implementation.python script="nuvem/and_.py"/>
-        <service name="and"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="or" t:title="or" t:color="magenta1">
-        <t:implementation.python script="nuvem/or_.py"/>
-        <service name="or"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="not" t:title="not" t:color="magenta1">
-        <t:implementation.python script="nuvem/not_.py"/>
-        <service name="not"/>
-        <reference name="value"/>
-    </component>
-    
-    <component name="equals" t:title="=" t:color="magenta1">
-        <t:implementation.python script="nuvem/equals.py"/>
-        <service name="equals"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="greater" t:title="gt" t:color="magenta1">
-        <t:implementation.python script="nuvem/greater.py"/>
-        <service name="greater"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="lesser" t:title="lt" t:color="magenta1">
-        <t:implementation.python script="nuvem/lesser.py"/>
-        <service name="lesser"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="and" promote="and"/>
+ <service name="equals" promote="equals"/>
+ <service name="greater" promote="greater"/>
+ <service name="if" promote="if"/>
+ <service name="lesser" promote="lesser"/>
+ <service name="not" promote="not"/>
+ <service name="or" promote="or"/>
+ <component x="140" y="10" name="and" title="and" color="magenta1">
+  <implementation.python script="nuvem/and_.py"/>
+  <service name="and"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="90" y="100" name="equals" title="=" color="magenta1">
+  <implementation.python script="nuvem/equals.py"/>
+  <service name="equals"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="210" y="100" name="greater" title="gt" color="magenta1">
+  <implementation.python script="nuvem/greater.py"/>
+  <service name="greater"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="90" y="10" name="if" title="if" color="magenta1">
+  <implementation.python script="nuvem/if_.py"/>
+  <service name="if"/>
+  <reference name="condition"/>
+  <reference name="then"/>
+  <reference name="else"/>
+ </component>
+ <component x="150" y="100" name="lesser" title="lt" color="magenta1">
+  <implementation.python script="nuvem/lesser.py"/>
+  <service name="lesser"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="260" y="10" name="not" title="not" color="magenta1">
+  <implementation.python script="nuvem/not_.py"/>
+  <service name="not"/>
+  <reference name="value"/>
+ </component>
+ <component x="200" y="10" name="or" title="or" color="magenta1">
+  <implementation.python script="nuvem/or_.py"/>
+  <service name="or"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
index f835d8df03..f8d7ced4b8 100644
--- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
@@ -1,123 +1,88 @@
 <?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://math"
-  name="palette">
-        
-    <service name="multiply" promote="multiply"/>
-    <service name="divide" promote="divide"/>
-    <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="*" t:color="magenta1">
-        <t:implementation.python script="nuvem/multiply.py"/>
-        <service name="multiply">
-            <documentation>*</documentation>
-        </service>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="divide" t:title="/" t:color="magenta1">
-        <t:implementation.python script="nuvem/divide.py"/>
-        <service name="divide">
-            <documentation>/</documentation>
-        </service>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="add" t:title="+" t:color="magenta1">
-        <t:implementation.python script="nuvem/add.py"/>
-        <service name="add">
-            <documentation>+</documentation>
-        </service>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="subtract" t:title="-" t:color="magenta1">
-        <t:implementation.python script="nuvem/subtract.py"/>
-        <service name="subtract">
-            <documentation>-</documentation>
-        </service>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="distance" t:title="distance **" t:color="magenta1">
-        <t:implementation.python script="nuvem/distance.py"/>
-        <service name="distance"/>
-        <reference name="location1"/>
-        <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 xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="add" promote="add"/>
+ <service name="cos" promote="cos"/>
+ <service name="distance" promote="distance"/>
+ <service name="divide" promote="divide"/>
+ <service name="max" promote="max"/>
+ <service name="min" promote="min"/>
+ <service name="multiply" promote="multiply"/>
+ <service name="random" promote="random"/>
+ <service name="round" promote="round"/>
+ <service name="sin" promote="sin"/>
+ <service name="subtract" promote="subtract"/>
+ <service name="sum" promote="sum"/>
+ <component x="90" y="10" name="add" title="+" color="magenta1">
+  <implementation.python script="nuvem/add.py"/>
+  <service name="add">
+   <documentation>+</documentation>
+  </service>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="250" y="200" name="cos" title="cos" color="magenta1">
+  <implementation.python script="nuvem/cos_.py"/>
+  <service name="cos"/>
+  <reference name="x"/>
+ </component>
+ <component x="90" y="200" name="distance" title="distance **" color="magenta1">
+  <implementation.python script="nuvem/distance.py"/>
+  <service name="distance"/>
+  <reference name="location1"/>
+  <reference name="location2"/>
+ </component>
+ <component x="270" y="10" name="divide" title="/" color="magenta1">
+  <implementation.python script="nuvem/divide.py"/>
+  <service name="divide">
+   <documentation>/</documentation>
+  </service>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="160" y="80" name="max" title="max" color="magenta1">
+  <implementation.python script="nuvem/max_.py"/>
+  <service name="max"/>
+  <reference name="l"/>
+ </component>
+ <component x="230" y="80" name="min" title="min" color="magenta1">
+  <implementation.python script="nuvem/min_.py"/>
+  <service name="min"/>
+  <reference name="l"/>
+ </component>
+ <component x="210" y="10" name="multiply" title="*" color="magenta1">
+  <implementation.python script="nuvem/multiply.py"/>
+  <service name="multiply">
+   <documentation>*</documentation>
+  </service>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="170" y="130" name="random" title="rand" color="magenta1">
+  <implementation.python script="nuvem/random_.py"/>
+  <service name="random"/>
+ </component>
+ <component x="90" y="130" name="round" title="round" color="magenta1">
+  <implementation.python script="nuvem/round_.py"/>
+  <service name="round"/>
+  <reference name="n"/>
+  <reference name="x"/>
+ </component>
+ <component x="190" y="200" name="sin" title="sin" color="magenta1">
+  <implementation.python script="nuvem/sin_.py"/>
+  <service name="sin"/>
+  <reference name="x"/>
+ </component>
+ <component x="150" y="10" name="subtract" title="-" color="magenta1">
+  <implementation.python script="nuvem/subtract.py"/>
+  <service name="subtract">
+   <documentation>-</documentation>
+  </service>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="90" y="80" name="sum" title="sum" color="magenta1">
+  <implementation.python script="nuvem/sum_.py"/>
+  <service name="sum"/>
+  <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 2cabac1a26..315a44b105 100644
--- a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
@@ -1,42 +1,17 @@
 <?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://python"
-  name="palette">
-        
-    <service name="eval" promote="eval"/>
-    <service name="exec" promote="exec"/>
-
-    <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="script" t:color="magenta1">
-        <t:implementation.python script="nuvem/exec_.py"/>
-        <service name="exec"/>
-        <reference name="py"/>
-        <reference name="ref"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="eval" promote="eval"/>
+ <service name="exec" promote="exec"/>
+ <component x="90" y="10" name="eval" title="expr" color="magenta1">
+  <implementation.python script="nuvem/eval_.py"/>
+  <service name="eval"/>
+  <reference name="py"/>
+  <reference name="ref"/>
+ </component>
+ <component x="170" y="10" name="exec" title="script" color="magenta1">
+  <implementation.python script="nuvem/exec_.py"/>
+  <service name="exec"/>
+  <reference name="py"/>
+  <reference name="ref"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
index 04cc674962..eb359ee84f 100644
--- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
@@ -1,93 +1,82 @@
 <?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://sensor"
-  name="palette">
-        
-    <service name="googlesearch" promote="googlesearch"/>
-    <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" t:color="red1">
-        <t:implementation.python script="nuvem/gsearch.py"/>
-        <service name="googlesearch"/>
-        <reference name="query"/>
-        <reference name="s" t:visible="false">
-            <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
-        </reference>
-    </component>
-    
-    <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" 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">
-        <t:implementation.python script="nuvem/gmap.py"/>
-        <service name="googlemap"/>
-        <reference name="locations"/>
-        <reference name="s" t:visible="false">
-            <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
-        </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"/>
-        <reference name="zip"/>
-        <reference name="ws" t:visible="false">
-            <t:binding.http uri="http://www.google.com/ig/api"/>
-        </reference>
-    </component>
-    
-    <component name="traffic" t:title="traffic **" t:color="red1">
-        <t:implementation.python script="nuvem/traffic.py"/>
-        <service name="traffic"/>
-        <reference name="location"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="bsearch" promote="bsearch"/>
+ <service name="gaddress" promote="gaddress"/>
+ <service name="ggeopos" promote="ggeopos"/>
+ <service name="gimages" promote="gimages"/>
+ <service name="gmap" promote="gmap"/>
+ <service name="gsearch" promote="gsearch"/>
+ <service name="gweather" promote="gweather"/>
+ <service name="traffic" promote="traffic"/>
+ <service name="ysearch" promote="ysearch"/>
+ <component x="250" y="10" name="bsearch" title="bing" color="red1">
+  <implementation.python script="nuvem/bsearch.py"/>
+  <service name="bsearch"/>
+  <reference name="query"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://www.bing.com/search"/>
+  </reference>
+ </component>
+ <component x="90" y="110" name="gaddress" title="address" color="red1">
+  <implementation.python script="nuvem/gaddress.py"/>
+  <service name="gaddress"/>
+  <reference name="address"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
+  </reference>
+ </component>
+ <component x="180" y="110" name="ggeopos" title="geo position" color="red1">
+  <implementation.python script="nuvem/ggeopos.py"/>
+  <service name="ggeopos"/>
+  <reference name="latitude"/>
+  <reference name="longitude"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
+  </reference>
+ </component>
+ <component x="90" y="60" name="gimages" title="google images" color="red1">
+  <implementation.python script="nuvem/gimages.py"/>
+  <service name="gimages"/>
+  <reference name="query"/>
+  <reference name="s" visible="false">
+   <binding.http uri="https://ajax.googleapis.com/ajax/services/search/images"/>
+  </reference>
+ </component>
+ <component x="210" y="60" name="gmap" title="google map" color="red1">
+  <implementation.python script="nuvem/gmap.py"/>
+  <service name="gmap"/>
+  <reference name="locations"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  </reference>
+ </component>
+ <component x="90" y="10" name="gsearch" title="google" color="red1">
+  <implementation.python script="nuvem/gsearch.py"/>
+  <service name="gsearch"/>
+  <reference name="query"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
+  </reference>
+ </component>
+ <component x="90" y="180" name="gweather" title="weather" color="red1">
+  <implementation.python script="nuvem/gweather.py"/>
+  <service name="gweather"/>
+  <reference name="zip"/>
+  <reference name="ws" visible="false">
+   <binding.http uri="http://www.google.com/ig/api"/>
+  </reference>
+ </component>
+ <component x="180" y="180" name="traffic" title="traffic **" color="red1">
+  <implementation.python script="nuvem/traffic.py"/>
+  <service name="traffic"/>
+  <reference name="location"/>
+ </component>
+ <component x="170" y="10" name="ysearch" title="yahoo" color="red1">
+  <implementation.python script="nuvem/ysearch.py"/>
+  <service name="ysearch"/>
+  <reference name="query"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
+  </reference>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
index fea8fba4e1..d319fc9c45 100644
--- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
@@ -1,136 +1,102 @@
 <?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 requiblue 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://social"
-  name="palette">
-        
-    <service name="fbprofile" promote="fbprofile"/>
-    <service name="fbalbums" promote="fbalbums"/>
-    <service name="fbfriends" promote="fbfriends"/>
-    <service name="fbgroups" promote="fbgroups"/>
-    <service name="twprofile" promote="twprofile"/>
-    <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"/>
-        <service name="fbprofile"/>
-        <reference name="id"/>
-        <reference name="fb" t:visible="false">
-            <t:binding.http uri="https://graph.facebook.com"/>
-        </reference>
-    </component>
-    
-    <component name="fbalbums" t:title="facebook albums" t:color="blue1">
-        <t:implementation.python script="nuvem/fbalbums.py"/>
-        <service name="fbalbums"/>
-        <reference name="id"/>
-        <reference name="fb" t:visible="false">
-            <t:binding.http uri="https://graph.facebook.com"/>
-        </reference>
-    </component>
-    
-    <component name="fbfriends" t:title="facebook friends" t:color="blue1">
-        <t:implementation.python script="nuvem/fbfriends.py"/>
-        <service name="fbfriends"/>
-        <reference name="id"/>
-        <reference name="fb" t:visible="false">
-            <t:binding.http uri="https://graph.facebook.com"/>
-        </reference>
-    </component>
-    
-    <component name="fbgroups" t:title="facebook groups" t:color="blue1">
-        <t:implementation.python script="nuvem/fbgroups.py"/>
-        <service name="fbgroups"/>
-        <reference name="id"/>
-        <reference name="fb" t:visible="false">
-            <t:binding.http uri="https://graph.facebook.com"/>
-        </reference>
-    </component>
-    
-    <component 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>
-    
-    <component name="twfriends" t:title="twitter friends" t:color="blue1">
-        <t:implementation.python script="nuvem/twfriends.py"/>
-        <service name="twfriends"/>
-        <reference name="id"/>
-        <reference name="tw" t:visible="false">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
-        </reference>
-    </component>
-    
-    <component name="twfollowers" t:title="twitter followers" t:color="blue1">
-        <t:implementation.python script="nuvem/twfollowers.py"/>
-        <service name="twfollowers"/>
-        <reference name="id"/>
-        <reference name="tw" t:visible="false">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
-        </reference>
-    </component>
-    
-    <component name="twtimeline" t:title="twitter timeline" t:color="blue1">
-        <t:implementation.python script="nuvem/twtimeline.py"/>
-        <service name="twtimeline"/>
-        <reference name="id"/>
-        <reference name="tw" t:visible="false">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
-        </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 xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="bzprofile" promote="bzprofile"/>
+ <service name="fbalbums" promote="fbalbums"/>
+ <service name="fbfriends" promote="fbfriends"/>
+ <service name="fbgroups" promote="fbgroups"/>
+ <service name="fbprofile" promote="fbprofile"/>
+ <service name="flkalbum" promote="flkalbum"/>
+ <service name="picalbum" promote="picalbum"/>
+ <service name="twfollowers" promote="twfollowers"/>
+ <service name="twfriends" promote="twfriends"/>
+ <service name="twprofile" promote="twprofile"/>
+ <service name="twtimeline" promote="twtimeline"/>
+ <component x="90" y="320" name="bzprofile" title="buzz profile" color="blue1">
+  <implementation.python script="nuvem/bzprofile.py"/>
+  <service name="bzprofile"/>
+  <reference name="id"/>
+  <reference name="bz" visible="false">
+   <binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
+  </reference>
+ </component>
+ <component x="90" y="230" name="fbalbums" title="facebook albums" color="blue1">
+  <implementation.python script="nuvem/fbalbums.py"/>
+  <service name="fbalbums"/>
+  <reference name="id"/>
+  <reference name="fb" visible="false">
+   <binding.http uri="https://graph.facebook.com"/>
+  </reference>
+ </component>
+ <component x="90" y="50" name="fbfriends" title="facebook friends" color="blue1">
+  <implementation.python script="nuvem/fbfriends.py"/>
+  <service name="fbfriends"/>
+  <reference name="id"/>
+  <reference name="fb" visible="false">
+   <binding.http uri="https://graph.facebook.com"/>
+  </reference>
+ </component>
+ <component x="90" y="90" name="fbgroups" title="facebook groups" color="blue1">
+  <implementation.python script="nuvem/fbgroups.py"/>
+  <service name="fbgroups"/>
+  <reference name="id"/>
+  <reference name="fb" visible="false">
+   <binding.http uri="https://graph.facebook.com"/>
+  </reference>
+ </component>
+ <component x="90" y="10" name="fbprofile" title="facebook profile" color="blue1">
+  <implementation.python script="nuvem/fbprofile.py"/>
+  <service name="fbprofile"/>
+  <reference name="id"/>
+  <reference name="fb" visible="false">
+   <binding.http uri="https://graph.facebook.com"/>
+  </reference>
+ </component>
+ <component x="90" y="270" name="flkalbum" title="flicker album" color="blue1">
+  <implementation.python script="nuvem/flkalbum.py"/>
+  <service name="flkalbum"/>
+  <reference name="id"/>
+  <reference name="flk" visible="false">
+   <binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
+  </reference>
+ </component>
+ <component x="220" y="230" name="picalbum" title="picasa album" color="blue1">
+  <implementation.python script="nuvem/picalbum.py"/>
+  <service name="picalbum"/>
+  <reference name="id"/>
+  <reference name="pic" visible="false">
+   <binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
+  </reference>
+ </component>
+ <component x="90" y="180" name="twfollowers" title="twitter followers" color="blue1">
+  <implementation.python script="nuvem/twfollowers.py"/>
+  <service name="twfollowers"/>
+  <reference name="id"/>
+  <reference name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
+  </reference>
+ </component>
+ <component x="210" y="180" name="twfriends" title="twitter friends" color="blue1">
+  <implementation.python script="nuvem/twfriends.py"/>
+  <service name="twfriends"/>
+  <reference name="id"/>
+  <reference name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
+  </reference>
+ </component>
+ <component x="90" y="140" name="twprofile" title="twitter profile" color="blue1">
+  <implementation.python script="nuvem/twprofile.py"/>
+  <service name="twprofile"/>
+  <reference name="id"/>
+  <reference name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/users/show.json"/>
+  </reference>
+ </component>
+ <component x="200" y="140" name="twtimeline" title="twitter timeline" color="blue1">
+  <implementation.python script="nuvem/twtimeline.py"/>
+  <service name="twtimeline"/>
+  <reference name="id"/>
+  <reference name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
+  </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 050316acb1..af293b97f5 100644
--- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
@@ -1,61 +1,34 @@
 <?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 requiblue 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://talk"
-  name="palette">
-        
-    <service name="voicecall" promote="voicecall"/>
-    <service name="sendsms" promote="sendsms"/>
-    <service name="sendgtalk" promote="sendgtalk"/>
-    <service name="sendemail" promote="sendemail"/>
-
-    <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="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="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="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 xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="sendemail" promote="sendemail"/>
+ <service name="sendgtalk" promote="sendgtalk"/>
+ <service name="sendsms" promote="sendsms"/>
+ <service name="voicecall" promote="voicecall"/>
+ <component x="170" y="10" name="sendemail" title="email **" color="blue1">
+  <implementation.python script="nuvem/sendemail.py"/>
+  <service name="sendemail"/>
+  <reference name="from"/>
+  <reference name="to"/>
+  <reference name="msg"/>
+ </component>
+ <component x="90" y="10" name="sendgtalk" title="gtalk" color="blue1">
+  <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 x="90" y="120" name="sendsms" title="sms **" color="blue1">
+  <implementation.python script="nuvem/sendsms.py"/>
+  <service name="sendsms"/>
+  <reference name="user"/>
+  <reference name="to"/>
+  <reference name="msg"/>
+ </component>
+ <component x="170" y="120" name="voicecall" title="voice **" color="blue1">
+  <implementation.python script="nuvem/voicecall.py"/>
+  <service name="voicecall"/>
+  <reference name="to"/>
+ </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 a8844b172e..4b643000ef 100644
--- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
@@ -1,89 +1,58 @@
 <?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://text"
-  name="palette">
-        
-    <service name="contains" promote="contains"/>
-    <service name="split" promote="split"/>
-    <service name="join" promote="join"/>
-    <service name="replace" promote="replace"/>
-    <service name="lowercase" promote="lowercase"/>
-    <service name="uppercase" promote="uppercase"/>
-    <service name="format" promote="format"/>
-    <service name="parse" promote="parse"/>
-
-    <component name="contains" t:title="contains" t:color="magenta1">
-        <t:implementation.python script="nuvem/contains.py"/>
-        <service name="contains"/>
-        <reference name="search"/>
-        <reference name="string"/>
-    </component>
-    
-    <component name="split" t:title="split" t:color="magenta1">
-        <t:implementation.python script="nuvem/split.py"/>
-        <service name="split"/>
-        <reference name="separator"/>
-        <reference name="string"/>
-    </component>
-    
-    <component name="join" t:title="join" t:color="magenta1">
-        <t:implementation.python script="nuvem/join.py"/>
-        <service name="join"/>
-        <reference name="separator"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="replace" t:title="replace" t:color="magenta1">
-        <t:implementation.python script="nuvem/replace.py"/>
-        <service name="replace"/>
-        <reference name="from"/>
-        <reference name="to"/>
-        <reference name="string"/>
-    </component>
-    
-    <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="upper" t:color="magenta1">
-        <t:implementation.python script="nuvem/uppercase.py"/>
-        <service name="uppercase"/>
-        <reference name="string"/>
-    </component>
-    
-    <component name="format" t:title="format" t:color="magenta1">
-        <t:implementation.python script="nuvem/format_.py"/>
-        <service name="format"/>
-        <reference name="pattern"/>
-        <reference name="values"/>
-    </component>
-    
-    <component name="parse" t:title="parse" t:color="magenta1">
-        <t:implementation.python script="nuvem/parse.py"/>
-        <service name="parse"/>
-        <reference name="regexp"/>
-        <reference name="string"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="contains" promote="contains"/>
+ <service name="format" promote="format"/>
+ <service name="join" promote="join"/>
+ <service name="lowercase" promote="lowercase"/>
+ <service name="parse" promote="parse"/>
+ <service name="replace" promote="replace"/>
+ <service name="split" promote="split"/>
+ <service name="uppercase" promote="uppercase"/>
+ <component x="90" y="10" name="contains" title="contains" color="magenta1">
+  <implementation.python script="nuvem/contains.py"/>
+  <service name="contains"/>
+  <reference name="search"/>
+  <reference name="string"/>
+ </component>
+ <component x="90" y="90" name="format" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference name="pattern"/>
+  <reference name="values"/>
+ </component>
+ <component x="160" y="160" name="join" title="join" color="magenta1">
+  <implementation.python script="nuvem/join.py"/>
+  <service name="join"/>
+  <reference name="separator"/>
+  <reference name="list"/>
+ </component>
+ <component x="90" y="230" name="lowercase" title="lower" color="magenta1">
+  <implementation.python script="nuvem/lowercase.py"/>
+  <service name="lowercase"/>
+  <reference name="string"/>
+ </component>
+ <component x="170" y="90" name="parse" title="parse" color="magenta1">
+  <implementation.python script="nuvem/parse.py"/>
+  <service name="parse"/>
+  <reference name="regexp"/>
+  <reference name="string"/>
+ </component>
+ <component x="180" y="10" name="replace" title="replace" color="magenta1">
+  <implementation.python script="nuvem/replace.py"/>
+  <service name="replace"/>
+  <reference name="from"/>
+  <reference name="to"/>
+  <reference name="string"/>
+ </component>
+ <component x="90" y="160" name="split" title="split" color="magenta1">
+  <implementation.python script="nuvem/split.py"/>
+  <service name="split"/>
+  <reference name="separator"/>
+  <reference name="string"/>
+ </component>
+ <component x="170" y="230" name="uppercase" title="upper" color="magenta1">
+  <implementation.python script="nuvem/uppercase.py"/>
+  <service name="uppercase"/>
+  <reference name="string"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
index a762a46b2a..febefec9a1 100644
--- a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
@@ -1,69 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://transform"
-  name="palette">
-        
-    <service name="foreach" promote="foreach"/>
-    <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"/>
-        <service name="foreach"/>
-        <reference name="item"/>
-        <reference name="transform"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="filter" t:title="filter" t:color="yellow1">
-        <t:implementation.python script="nuvem/filter_.py"/>
-        <service name="filter"/>
-        <reference name="item"/>
-        <reference name="condition"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="reduce" t:title="reduce" t:color="yellow1">
-        <t:implementation.python script="nuvem/reduce_.py"/>
-        <service name="reduce"/>
-        <reference name="item"/>
-        <reference name="accum"/>
-        <reference name="transform"/>
-        <reference name="init"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="reverse" t:title="reverse" t:color="yellow1">
-        <t:implementation.python script="nuvem/reverse.py"/>
-        <service name="reverse"/>
-        <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 xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="filter" promote="filter"/>
+ <service name="foreach" promote="foreach"/>
+ <service name="reduce" promote="reduce"/>
+ <service name="reverse" promote="reverse"/>
+ <service name="shuffle" promote="shuffle"/>
+ <component x="170" y="10" name="filter" title="filter" color="yellow1">
+  <implementation.python script="nuvem/filter_.py"/>
+  <service name="filter"/>
+  <reference name="item"/>
+  <reference name="condition"/>
+  <reference name="list"/>
+ </component>
+ <component x="90" y="10" name="foreach" title="foreach" color="yellow1">
+  <implementation.python script="nuvem/map_.py"/>
+  <service name="foreach"/>
+  <reference name="item"/>
+  <reference name="transform"/>
+  <reference name="list"/>
+ </component>
+ <component x="240" y="10" name="reduce" title="reduce" color="yellow1">
+  <implementation.python script="nuvem/reduce_.py"/>
+  <service name="reduce"/>
+  <reference name="item"/>
+  <reference name="accum"/>
+  <reference name="transform"/>
+  <reference name="init"/>
+  <reference name="list"/>
+ </component>
+ <component x="90" y="120" name="reverse" title="reverse" color="yellow1">
+  <implementation.python script="nuvem/reverse.py"/>
+  <service name="reverse"/>
+  <reference name="list"/>
+ </component>
+ <component x="170" y="120" name="shuffle" title="shuffle" color="yellow1">
+  <implementation.python script="nuvem/shuffle_.py"/>
+  <service name="shuffle"/>
+  <reference name="list"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
index 75c4bca5bb..8f143e42bf 100644
--- a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
@@ -1,87 +1,61 @@
 <?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://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="true" promote="true"/>
-    <service name="false" promote="false"/>
-    <service name="nothing" promote="nothing"/>
-    <service name="now" promote="now"/>
-
-    <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">text</property>
-    </component>
-    
-    <component name="number" t:title="#" t:color="orange1">
-        <t:implementation.python script="nuvem/number.py"/>
-        <service name="number"/>
-        <property name="property">123</property>
-    </component>
-    
-    <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="valueof" t:color="orange1">
-        <t:implementation.python script="nuvem/valueof.py"/>
-        <service name="valueof"/>
-        <property name="name">name</property>
-    </component>
-    
-    <component name="true" t:title="true" t:color="orange1">
-        <t:implementation.python script="nuvem/true_.py"/>
-        <service name="true"/>
-    </component>
-    
-    <component name="false" t:title="false" t:color="orange1">
-        <t:implementation.python script="nuvem/false_.py"/>
-        <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 xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="comment" promote="comment"/>
+ <service name="false" promote="false"/>
+ <service name="item" promote="item"/>
+ <service name="name" promote="name"/>
+ <service name="nothing" promote="nothing"/>
+ <service name="now" promote="now"/>
+ <service name="number" promote="number"/>
+ <service name="text" promote="text"/>
+ <service name="true" promote="true"/>
+ <service name="valueof" promote="valueof"/>
+ <component x="160" y="160" name="comment" title="{propval}" color="white">
+  <implementation.python script="nuvem/comment.py"/>
+  <service name="comment" visible="false"/>
+  <property>comment</property>
+ </component>
+ <component x="160" y="110" name="false" title="false" color="orange1">
+  <implementation.python script="nuvem/false_.py"/>
+  <service name="false"/>
+ </component>
+ <component x="90" y="60" name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference name="value"/>
+  <property>name</property>
+ </component>
+ <component x="230" y="10" name="name" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>name</property>
+ </component>
+ <component x="230" y="110" name="nothing" title="nothing" color="orange1">
+  <implementation.python script="nuvem/nothing.py"/>
+  <service name="nothing"/>
+ </component>
+ <component x="90" y="160" name="now" title="now" color="orange1">
+  <implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+  <reference name="format"/>
+ </component>
+ <component x="160" y="10" name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>123</property>
+ </component>
+ <component x="90" y="10" name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>text</property>
+ </component>
+ <component x="90" y="110" name="true" title="true" color="orange1">
+  <implementation.python script="nuvem/true_.py"/>
+  <service name="true"/>
+ </component>
+ <component x="170" y="60" name="valueof" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>name</property>
+ </component>
 </composite>