From 636e046fd1cdf7a6f1a365e4f02f5bbc2f593c70 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 2 May 2011 05:58:47 +0000
Subject: Reformat, sort and refactor test and sample apps.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1098490 13f79535-47bb-0310-9956-ffa450edef68
---
 .../modules/edit/apps/buzzprofile/app.composite    |  54 --
 .../trunk/modules/edit/apps/buzzprofile/app.html   |  24 -
 .../trunk/modules/edit/apps/me360/app.composite    | 146 ++--
 sca-cpp/trunk/modules/edit/apps/me360/app.html     |  75 --
 .../trunk/modules/edit/apps/me360/htdocs/app.html  |  75 ++
 .../trunk/modules/edit/apps/nearme/app.composite   | 572 +++++++-------
 sca-cpp/trunk/modules/edit/apps/nearme/app.html    |  54 --
 .../trunk/modules/edit/apps/nearme/htdocs/app.html |  54 ++
 .../modules/edit/apps/ourphotos/app.composite      | 158 ++--
 sca-cpp/trunk/modules/edit/apps/ourphotos/app.html |  36 -
 .../modules/edit/apps/ourphotos/htdocs/app.html    |  36 +
 .../modules/edit/apps/shoppingcart/app.composite   | 830 ++++++++++-----------
 .../trunk/modules/edit/apps/shoppingcart/app.html  |  72 --
 .../modules/edit/apps/shoppingcart/htdocs/app.html |  72 ++
 .../trunk/modules/edit/apps/slice/app.composite    |  16 +-
 sca-cpp/trunk/modules/edit/apps/test/app.composite |  22 +-
 sca-cpp/trunk/modules/edit/apps/test/app.html      |  20 -
 .../trunk/modules/edit/apps/test/htdocs/app.html   |  20 +
 .../trunk/modules/edit/apps/testdb/app.composite   | 100 +--
 sca-cpp/trunk/modules/edit/apps/testdb/app.html    |  24 -
 .../trunk/modules/edit/apps/testdb/htdocs/app.html |  24 +
 .../modules/edit/apps/testevents/app.composite     | 204 ++---
 .../trunk/modules/edit/apps/testevents/app.html    |  57 --
 .../modules/edit/apps/testevents/htdocs/app.html   |  57 ++
 .../trunk/modules/edit/apps/testhttp/app.composite | 122 +--
 sca-cpp/trunk/modules/edit/apps/testhttp/app.html  |  31 -
 .../modules/edit/apps/testhttp/htdocs/app.html     |  31 +
 .../modules/edit/apps/testlogic/app.composite      | 176 ++---
 sca-cpp/trunk/modules/edit/apps/testlogic/app.html |  24 -
 .../modules/edit/apps/testlogic/htdocs/app.html    |  24 +
 .../modules/edit/apps/testsearch/app.composite     | 230 +++---
 .../trunk/modules/edit/apps/testsearch/app.html    |  24 -
 .../modules/edit/apps/testsearch/htdocs/app.html   |  24 +
 .../modules/edit/apps/testsocial/app.composite     | 220 +++---
 .../trunk/modules/edit/apps/testsocial/app.html    |  24 -
 .../modules/edit/apps/testsocial/htdocs/app.html   |  24 +
 .../trunk/modules/edit/apps/testtext/app.composite | 232 +++---
 sca-cpp/trunk/modules/edit/apps/testtext/app.html  |  24 -
 .../modules/edit/apps/testtext/htdocs/app.html     |  24 +
 .../trunk/modules/edit/apps/testurl/app.composite  | 120 +--
 sca-cpp/trunk/modules/edit/apps/testurl/app.html   |  24 -
 .../modules/edit/apps/testurl/htdocs/app.html      |  24 +
 .../modules/edit/apps/testvalues/app.composite     | 614 +++++++--------
 .../trunk/modules/edit/apps/testvalues/app.html    |  27 -
 .../modules/edit/apps/testvalues/htdocs/app.html   |  27 +
 .../modules/edit/apps/testwidgets/app.composite    | 146 ++--
 .../trunk/modules/edit/apps/testwidgets/app.html   |  61 --
 .../modules/edit/apps/testwidgets/htdocs/app.html  |  61 ++
 .../modules/edit/apps/testwidgets2/app.composite   | 138 ++--
 .../trunk/modules/edit/apps/testwidgets2/app.html  |  86 ---
 .../modules/edit/apps/testwidgets2/htdocs/app.html |  86 +++
 .../edit/palettes/control/palette.composite        |  30 +-
 sca-cpp/trunk/modules/edit/store/all               |   1 +
 sca-cpp/trunk/modules/edit/store/myapps            |   1 -
 sca-cpp/trunk/modules/edit/store/tests             |   1 -
 55 files changed, 2685 insertions(+), 2798 deletions(-)
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/me360/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/nearme/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/ourphotos/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/test/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testdb/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testevents/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testhttp/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testlogic/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testsearch/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testsocial/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testtext/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testurl/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testvalues/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/store/all
 delete mode 100644 sca-cpp/trunk/modules/edit/store/myapps
 delete mode 100644 sca-cpp/trunk/modules/edit/store/tests

(limited to 'sca-cpp/trunk/modules/edit')

diff --git a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite
deleted file mode 100644
index 46ada96983..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.composite
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://buzzprofile" name="buzzprofile">
- <service name="example" promote="example"/>
- <component t:x="107" t:y="131" name="example" t:title="get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="text2" name="url"/>
- </component>
- <service name="profile" promote="profile"/>
- <component t:x="106" t:y="36" name="profile" t:title="get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="format" name="url"/>
- </component>
- <component t:x="174" t:y="36" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text" name="pattern"/>
-  <reference target="path" name="values"/>
- </component>
- <component t:x="235" t:y="64" name="path" t:title="path" t:color="green1">
-  <t:implementation.python script="nuvem/path.py"/>
-  <service name="path"/>
-  <property name="path" t:visible="false"/>
- </component>
- <component t:x="175" t:y="131" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>https://buzzprofile.sca-store.com:8453/components/profile/jsdelfino</property>
- </component>
- <component t:x="235" t:y="36" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
- </component>
-</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html b/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html
deleted file mode 100644
index e0b04fe70a..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/buzzprofile/app.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Test buzzprofile component</H2>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.composite b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
index fb03b89d3c..234c8cd61a 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
@@ -17,19 +17,23 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://me360" name="me360">
- <component t:x="635" t:y="232" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference name="item" t:clonable="true"/>
+<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"/>
+ <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 t:x="574" t:y="204" 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 name="bzprofile" t:title="buzz profile" t:color="blue1">
+  <t:implementation.python script="nuvem/bzprofile.py"/>
+  <service name="bzprofile"/>
+  <reference target="text4" name="id"/>
+  <reference name="bz" t:visible="false">
+   <t:binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
+  </reference>
  </component>
- <component t:x="453" t:y="45" name="fbprofile" t:title="facebook profile" t:color="blue1">
+ <component name="fbprofile" t:title="facebook profile" t:color="blue1">
   <t:implementation.python script="nuvem/fbprofile.py"/>
   <service name="fbprofile"/>
   <reference target="text" name="id"/>
@@ -37,20 +41,24 @@
    <t:binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component t:x="433" t:y="87" name="twprofile" t:title="twitter profile" t:color="blue1">
-  <t:implementation.python script="nuvem/twprofile.py"/>
-  <service name="twprofile"/>
-  <reference target="text2" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
-  </reference>
+ <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 t:x="491" t:y="108" name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>buzz</property>
+ <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 t:x="242" t:y="23" name="list2" t:title="list" t:color="yellow1">
+ <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"/>
@@ -58,76 +66,62 @@
   <reference target="property3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="126" t:y="23" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="list2" name="content"/>
+ <component name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="fbprofile" name="value"/>
+  <property>fbprofile</property>
  </component>
- <component t:x="224" t:y="222" name="get" t:title="get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="format" name="url"/>
+ <component name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twprofile" name="value"/>
+  <property>twitprofile</property>
  </component>
- <service name="buzz" promote="buzz"/>
- <component name="buzz" t:x="127" t:y="220" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="get" name="content"/>
+ <component name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="bzprofile" name="value"/>
+  <property>buzzprofile</property>
+ </component>
+ <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"/>
+  </service>
+  <reference target="list2" name="content"/>
  </component>
- <component t:x="276" t:y="220" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
- </component>
- <service name="call" promote="call"/>
- <component t:x="583" t:y="156" name="call" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="306" t:y="111" name="bzprofile" t:title="buzz profile" t:color="blue1">
-  <t:implementation.python script="nuvem/bzprofile.py"/>
-  <service name="bzprofile"/>
-  <reference target="text4" name="id"/>
-  <reference name="bz" t:visible="false">
-   <t:binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
-  </reference>
+  <property>100001053301307</property>
  </component>
- <component t:x="398" t:y="25" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>100001053301307</property>
+  <property>jsdelfino</property>
  </component>
- <component t:x="213" t:y="23" name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="fbprofile" name="value"/>
-  <property>fbprofile</property>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
  </component>
- <component t:x="394" t:y="67" name="text2" t:title=" '{propval}'" t:color="orange1">
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="395" t:y="111" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="213" t:y="67" name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="twprofile" name="value"/>
-  <property>twitprofile</property>
- </component>
- <component t:x="213" t:y="111" name="property3" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="bzprofile" name="value"/>
-  <property>buzzprofile</property>
+ <component name="twprofile" t:title="twitter profile" t:color="blue1">
+  <t: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>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.html b/sca-cpp/trunk/modules/edit/apps/me360/app.html
deleted file mode 100644
index 31ed5e58bd..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Me360</H2>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
-  <SPAN>Facebook</SPAN>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 225px; width: 100%; left: 2px; ">
-  <SPAN>Twitter</SPAN>
- </SPAN>
- <SPAN id="fbprofile" class="table" style="position: absolute; top: 54px; left: 2px; ">
-  <TABLE class="datatable" style="width: 100%; ">
-   <TBODY>
-    <TR>
-     <TD>table</TD>
-     <TD>...</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="twitprofile" class="table" style="position: absolute; top: 252px; left: 2px; ">
-  <TABLE class="datatable" style="width: 100%; ">
-   <TBODY>
-    <TR>
-     <TD>table</TD>
-     <TD>...</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 1143px; width: 100%; left: 2px; ">
-  <SPAN>Buzz</SPAN>
- </SPAN>
- <SPAN id="buzzprofile" class="table" style="position: absolute; top: 1170px; left: 2px; ">
-  <TABLE class="datatable" style="width: 100%; ">
-   <TBODY>
-    <TR>
-     <TD>table</TD>
-     <TD>...</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html
new file mode 100644
index 0000000000..84427a8ce9
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html
@@ -0,0 +1,75 @@
+<?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="section" class="section" style="position: absolute; top: 225px; width: 100%; left: 2px; ">
+  <SPAN>Twitter</SPAN>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 1143px; width: 100%; left: 2px; ">
+  <SPAN>Buzz</SPAN>
+ </SPAN>
+ <SPAN id="buzzprofile" class="table" style="position: absolute; top: 1170px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>table</TD>
+     <TD>...</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="twitprofile" class="table" style="position: absolute; top: 252px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>table</TD>
+     <TD>...</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Me360</H2>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
+  <SPAN>Facebook</SPAN>
+ </SPAN>
+ <SPAN id="fbprofile" class="table" style="position: absolute; top: 54px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>table</TD>
+     <TD>...</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
index d81de55232..dbe637538a 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" targetNamespace="http://nearme" name="nearme">
- <component xmlns="" t:x="811" t:y="384" name="filedb4" t:title="file" t:color="red1">
+<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"/>
+ <service name="getlocs" promote="getlocs"/>
+ <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"/>
+  <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"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name2" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call3" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name4" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call4" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name3" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="filedb" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="814" t:y="554" name="filedb5" t:title="file" t:color="red1">
+ <component name="filedb10" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="169" t:y="168" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component name="filedb11" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="792" t:y="284" name="filedb6" t:title="file" t:color="red1">
+ <component xmlns="" name="filedb4" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="648" t:y="185" name="filedb7" t:title="file" t:color="red1">
+ <component xmlns="" name="filedb5" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="898" t:y="284" name="filedb8" t:title="file" t:color="red1">
+ <component xmlns="" name="filedb6" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="675" t:y="394" name="filedb9" t:title="file" t:color="red1">
+ <component xmlns="" name="filedb7" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="729" t:y="59" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>/components/map</property>
+ <component xmlns="" name="filedb8" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="387" t:y="32" name="user3" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component xmlns="" name="filedb9" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
+ </component>
+ <component t:x="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 xmlns="" t:x="265" t:y="625" name="get4" t:title="get" t:color="red1">
+ <component name="get10" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb5" name="collection"/>
-  <reference target="param4" name="id"/>
+  <reference target="filedb11" name="collection"/>
+  <reference target="param5" name="id"/>
  </component>
- <component xmlns="" t:x="268" t:y="540" name="get3" t:title="get" t:color="red1">
+ <component xmlns="" name="get3" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb4" name="collection"/>
   <reference target="param3" name="id"/>
  </component>
- <component t:x="471" t:y="20" name="filedb10" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="475" t:y="51" name="user5" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
- </component>
- <component t:x="513" t:y="1" name="get9" t:title="get" t:color="red1">
+ <component xmlns="" name="get4" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb10" name="collection"/>
-  <reference target="user5" name="id"/>
+  <reference target="filedb5" name="collection"/>
+  <reference target="param4" name="id"/>
  </component>
- <component t:x="544" t:y="97" name="get10" t:title="get" t:color="red1">
+ <component xmlns="" name="get5" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb11" name="collection"/>
-  <reference target="param5" name="id"/>
- </component>
- <component t:x="578" t:y="98" name="filedb11" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="264" t:y="221" name="param10" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>latitude</property>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="338" t:y="564" name="param3" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend2</property>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="340" t:y="631" name="param4" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend3</property>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="698" t:y="120" name="param5" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend1</property>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="652" t:y="43" name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="get9" name="value"/>
-  <property>x</property>
- </component>
- <component t:x="652" t:y="115" name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="get10" name="value"/>
-  <property>1</property>
- </component>
- <component t:x="653" t:y="193" name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="get3" name="value"/>
-  <property>2</property>
- </component>
- <component t:x="655" t:y="261" name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="get4" name="value"/>
-  <property>3</property>
- </component>
- <component t:x="785" t:y="175" name="append" t:title="+" t:color="yellow1">
-  <t:implementation.python script="nuvem/append.py"/>
-  <service name="append"/>
-  <reference target="params" name="first"/>
-  <reference target="call2" name="second"/>
- </component>
- <component xmlns="" t:x="846" t:y="183" name="params" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
-  <service name="params"/>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="745" t:y="153" name="url" t:title="url" t:color="green1">
-  <t:implementation.python script="nuvem/url.py"/>
-  <service name="url"/>
-  <reference target="text2" name="address"/>
-  <reference target="append" name="args"/>
+  <reference target="filedb6" name="collection"/>
+  <reference target="param2" name="id"/>
  </component>
- <component xmlns="" t:x="812" t:y="270" name="get6" t:title="get" t:color="red1">
+ <component xmlns="" name="get6" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb7" name="collection"/>
   <reference target="user4" name="id"/>
  </component>
- <component t:x="743" t:y="270" name="last" t:title="last" t:color="yellow1">
-  <t:implementation.python script="nuvem/last.py"/>
-  <service name="last"/>
-  <reference target="get6" name="list"/>
- </component>
- <component xmlns="" t:x="802" t:y="353" name="get5" t:title="get" t:color="red1">
+ <component xmlns="" name="get7" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb6" name="collection"/>
-  <reference target="param2" name="id"/>
+  <reference target="filedb8" name="collection"/>
+  <reference target="param7" name="id"/>
  </component>
- <component xmlns="" t:x="802" t:y="423" name="get8" t:title="get" t:color="red1">
+ <component xmlns="" name="get8" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb9" name="collection"/>
   <reference target="param6" name="id"/>
  </component>
- <component xmlns="" t:x="800" t:y="495" name="get7" t:title="get" t:color="red1">
+ <component name="get9" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb8" name="collection"/>
-  <reference target="param7" name="id"/>
+  <reference target="filedb10" name="collection"/>
+  <reference target="user5" name="id"/>
  </component>
- <component t:x="734" t:y="347" name="last2" t:title="last" t:color="yellow1">
+ <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"/>
+  <reference target="list3" name="content"/>
+ </component>
+ <component xmlns="" name="googlemap" t:title="google map" t:color="red1">
+  <t:implementation.python script="nuvem/gmap.py"/>
+  <service name="googlemap"/>
+  <reference target="call" name="locations"/>
+  <reference name="s" t:visible="false">
+   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  </reference>
+ </component>
+ <component name="last" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get6" name="list"/>
+ </component>
+ <component name="last2" t:title="last" t:color="yellow1">
   <t:implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get5" name="list"/>
  </component>
- <component t:x="733" t:y="387" name="last3" t:title="last" t:color="yellow1">
+ <component name="last3" t:title="last" t:color="yellow1">
   <t:implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get8" name="list"/>
  </component>
- <component t:x="731" t:y="420" name="last4" t:title="last" t:color="yellow1">
+ <component name="last4" t:title="last" t:color="yellow1">
   <t:implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get7" name="list"/>
  </component>
- <component t:x="836" t:y="377" name="param2" t:title="?param" t:color="green1">
+ <component xmlns="" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text7" name="item" t:clonable="true"/>
+  <reference target="param10" name="item" t:clonable="true"/>
+  <reference target="param" name="item" t:clonable="true"/>
+  <reference target="now" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component xmlns="" name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="property6" name="item" t:clonable="true"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property11" name="item" t:clonable="true"/>
+  <reference target="property12" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="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="googlemap" name="content"/>
+ </component>
+ <component name="name" t:title="" t:color="orange1">
+  <t: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"/>
+  <service name="name"/>
+  <property>getlocs</property>
+ </component>
+ <component name="name3" t:title="" t:color="orange1">
+  <t: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"/>
+  <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"/>
+  <reference target="list2" name="content"/>
+ </component>
+ <component name="now" t:title="now" t:color="orange1">
+  <t:implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+  <reference target="text" name="format"/>
+ </component>
+ <component xmlns="" name="number" t:title="#" t:color="orange1">
+  <t: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"/>
+  <service name="param"/>
+  <property>longitude</property>
+  <property name="query" t:visible="false"/>
+ </component>
+ <component name="param10" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>latitude</property>
+  <property name="query" t:visible="false"/>
+ </component>
+ <component name="param2" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend1</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="836" t:y="457" name="param6" t:title="?param" t:color="green1">
+ <component name="param3" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend2</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="836" t:y="537" name="param7" t:title="?param" t:color="green1">
+ <component name="param4" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend3</property>
   <property name="query" t:visible="false"/>
  </component>
- <component xmlns="" t:x="258" t:y="167" name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>green</property>
+ <component name="param5" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>friend1</property>
+  <property name="query" t:visible="false"/>
  </component>
- <component xmlns="" t:x="185" t:y="167" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text7" name="item" t:clonable="true"/>
-  <reference target="param10" name="item" t:clonable="true"/>
-  <reference target="param" name="item" t:clonable="true"/>
-  <reference target="now" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="param6" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>friend2</property>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="193" t:y="855" name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="last3" name="value"/>
-  <property>time2</property>
+ <component name="param7" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>friend3</property>
+  <property name="query" t:visible="false"/>
+ </component>
+ <component xmlns="" name="params" t:title="?params" t:color="green1">
+  <t:implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="196" t:y="775" name="property8" t:title="{propval} :" t:color="orange1">
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="last2" name="value"/>
-  <property>time1</property>
+  <reference target="user3" name="value"/>
+  <property>me</property>
  </component>
- <component t:x="198" t:y="1012" name="property10" t:title="{propval} :" t:color="orange1">
+ <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 t:x="197" t:y="695" name="property9" t:title="{propval} :" t:color="orange1">
+ <component name="property11" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="last" name="value"/>
-  <property>mytime</property>
+  <reference target="get9" name="value"/>
+  <property>x</property>
  </component>
- <component t:x="195" t:y="658" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="property12" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="user3" name="value"/>
-  <property>me</property>
+  <reference target="get10" name="value"/>
+  <property>1</property>
  </component>
- <component t:x="188" t:y="276" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property4" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="last4" name="value"/>
-  <property>time3</property>
+  <reference target="get3" name="value"/>
+  <property>2</property>
  </component>
- <component t:x="528" t:y="412" name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>getlocs</property>
+ <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 t:x="447" t:y="411" name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name2" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last4" name="value"/>
+  <property>time3</property>
  </component>
- <component t:x="225" t:y="61" name="call" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component 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 xmlns="" t:x="181" t:y="63" name="googlemap" t:title="google map" t:color="red1">
-  <t:implementation.python script="nuvem/gmap.py"/>
-  <service name="googlemap"/>
-  <reference target="call" name="locations"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
-  </reference>
+ <component 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>
- <service name="map" promote="map"/>
- <component t:x="129" t:y="599" name="map" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="googlemap" name="content"/>
+ <component name="property9" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last" name="value"/>
+  <property>mytime</property>
  </component>
- <component xmlns="" t:x="732" t:y="111" name="put" t:title="put" t:color="red1">
+ <component xmlns="" name="put" t:title="put" t:color="red1">
   <t:implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb" name="collection"/>
   <reference target="user" name="id"/>
   <reference target="list" name="value"/>
  </component>
- <service name="geolocation" promote="geolocation"/>
- <component t:x="545" t:y="103" name="geolocation" t:title="location" t:color="green1">
-  <t:implementation.python script="nuvem/geolocation.py"/>
-  <service name="geolocation" t:visible="false">
-   <t:binding.http uri="geolocation"/>
-  </service>
-  <reference target="put" name="content"/>
- </component>
- <component t:x="751" t:y="357" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property11" name="item" t:clonable="true"/>
-  <reference target="property12" name="item" t:clonable="true"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="getlocs" promote="getlocs"/>
- <component t:x="551" t:y="334" name="getlocs" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="list3" name="content"/>
- </component>
- <component t:x="290" t:y="5" name="name3" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>nearme</property>
- </component>
- <component t:x="358" t:y="62" name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>getlocs</property>
- </component>
- <component t:x="832" t:y="35" name="name4" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>nearme</property>
- </component>
- <service name="appstart2" promote="appstart2"/>
- <component t:x="130" t:y="12" name="appstart2" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
+ <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"/>
   </service>
   <reference target="call4" name="content"/>
  </component>
- <component t:x="196" t:y="8" name="call4" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name3" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>%a %b %d, %I:%M %p</property>
  </component>
- <component xmlns="" t:x="734" t:y="11" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>5000</property>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>/components/map</property>
  </component>
- <component t:x="729" t:y="42" name="call3" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name4" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component xmlns="" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <service name="every" promote="every"/>
- <component t:x="543" t:y="8" name="every" t:title="timer" t:color="green1">
-  <t:implementation.python script="nuvem/every.py"/>
-  <service name="every" t:visible="false">
-   <t:binding.http uri="every"/>
+ <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"/>
   </service>
   <reference target="number" name="n"/>
   <reference target="call3" name="content"/>
  </component>
- <component xmlns="" t:x="514" t:y="128" name="user4" t:title="user" t:color="green1">
+ <component name="url" t:title="url" t:color="green1">
+  <t:implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference target="text2" name="address"/>
+  <reference target="append" name="args"/>
+ </component>
+ <component xmlns="" name="user" t:title="user" t:color="green1">
   <t:implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user" t:visible="false"/>
  </component>
- <component xmlns="" t:x="190" t:y="81" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference target="property9" name="item" t:clonable="true"/>
-  <reference target="property8" name="item" t:clonable="true"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference target="property6" name="item" t:clonable="true"/>
-  <reference target="property10" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="nearme" promote="nearme"/>
- <component t:x="128" t:y="70" name="nearme" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="list2" name="content"/>
- </component>
- <component t:x="863" t:y="102" name="filedb" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="691" t:y="215" name="param" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>longitude</property>
-  <property name="query" t:visible="false"/>
+ <component xmlns="" name="user3" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="691" t:y="243" name="now" t:title="now" t:color="orange1">
-  <t:implementation.python script="nuvem/now.py"/>
-  <service name="now"/>
-  <reference target="text" name="format"/>
+ <component xmlns="" name="user4" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="736" t:y="243" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>%a %b %d, %I:%M %p</property>
+ <component name="user5" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.html b/sca-cpp/trunk/modules/edit/apps/nearme/app.html
deleted file mode 100644
index 364a46a1c8..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0pt; left: 0px; ">
-  <H2>Nearme</H2>
- </SPAN>
- <SPAN id="me" class="h2" style="position: absolute; top: 0px; left: 101px; ">
-  <H2>me</H2>
- </SPAN>
- <SPAN style="position: absolute; top: 81px; left: 2px; " class="entry" id="friend2">
-  <INPUT type="text" size="20" value="" autocapitalize="off"/>
- </SPAN>
- <SPAN style="position: absolute; top: 108px; left: 2px; " class="entry" id="friend3">
-  <INPUT type="text" size="20" value="" autocapitalize="off"/>
- </SPAN>
- <SPAN style="position: absolute; top: 135px; left: 2px; " class="img" id="mapimg">
-  <IMG src="https://sca-store.com:8453/public/img.png"/>
- </SPAN>
- <SPAN style="position: absolute; top: 54px; left: 182px; " class="text" id="time1">
-  <SPAN>last seen...</SPAN>
- </SPAN>
- <SPAN style="position: absolute; top: 81px; left: 182px; " class="text" id="time2">
-  <SPAN>last seen...</SPAN>
- </SPAN>
- <SPAN style="position: absolute; top: 108px; left: 182px; " class="text" id="time3">
-  <SPAN>last seen...</SPAN>
- </SPAN>
- <SPAN style="position: absolute; top: 0px; left: 182px; " class="text" id="mytime">
-  <SPAN>updating...</SPAN>
- </SPAN>
- <SPAN style="position: absolute; top: 54px; left: 2px; " class="entry" id="friend1">
-  <INPUT type="text" size="20" value="" autocapitalize="off"/>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
-  <SPAN>My friends</SPAN>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html
new file mode 100644
index 0000000000..1077688b6c
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html
@@ -0,0 +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.    
+-->
+<DIV id="page">
+ <SPAN id="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>
+ </SPAN>
+ <SPAN style="position: absolute; top: 0px; left: 182px; " class="text" id="mytime">
+  <SPAN>updating...</SPAN>
+ </SPAN>
+ <SPAN id="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"/>
+ </SPAN>
+ <SPAN style="position: absolute; top: 54px; left: 182px; " class="text" id="time1">
+  <SPAN>last seen...</SPAN>
+ </SPAN>
+ <SPAN style="position: absolute; top: 81px; left: 2px; " class="entry" id="friend2">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+ </SPAN>
+ <SPAN style="position: absolute; top: 81px; left: 182px; " class="text" id="time2">
+  <SPAN>last seen...</SPAN>
+ </SPAN>
+ <SPAN style="position: absolute; top: 108px; left: 2px; " class="entry" id="friend3">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+ </SPAN>
+ <SPAN style="position: absolute; top: 108px; left: 182px; " class="text" id="time3">
+  <SPAN>last seen...</SPAN>
+ </SPAN>
+ <SPAN style="position: absolute; top: 135px; left: 2px; " class="img" id="mapimg">
+  <IMG src="https://sca-store.com:8453/public/img.png"/>
+ </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 2031da70f5..8d27c3b6c8 100644
--- a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
@@ -17,82 +17,57 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://ourphotos" name="ourphotos">
- <component t:x="191" t:y="433" name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>61049883@N06</property>
- </component>
- <component t:x="820" t:y="140" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component t:x="190" t:y="69" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="valueof2" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="430" t:y="52" name="name5" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>image</property>
- </component>
- <component t:x="524" t:y="108" name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>image</property>
- </component>
- <component t:x="659" t:y="141" name="shuffle" t:title="shuffle" t:color="yellow1">
-  <t:implementation.python script="nuvem/shuffle_.py"/>
-  <service name="shuffle"/>
-  <reference target="append" name="list"/>
- </component>
- <component t:x="565" t:y="373" name="append" t:title="+" t:color="yellow1">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="start" promote="start"/>
+ <component name="append" t:title="+" t:color="yellow1">
   <t:implementation.python script="nuvem/append.py"/>
   <service name="append"/>
   <reference target="values" name="first"/>
   <reference target="values2" name="second"/>
  </component>
- <component t:x="438" t:y="31" name="foreach2" t:title="foreach" t:color="yellow1">
+ <component name="flkalbum" t:title="flicker album" t:color="blue1">
+  <t:implementation.python script="nuvem/flkalbum.py"/>
+  <service name="flkalbum"/>
+  <reference target="text7" name="id"/>
+  <reference name="flk" t:visible="false">
+   <t:binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
+  </reference>
+ </component>
+ <component name="foreach2" t:title="foreach" t:color="yellow1">
   <t:implementation.python script="nuvem/map_.py"/>
   <service name="foreach"/>
   <reference target="name5" name="item"/>
   <reference target="format" name="transform"/>
   <reference target="shuffle" name="list"/>
  </component>
- <component t:x="501" t:y="59" name="format" t:title="format" t:color="magenta1">
+ <component name="format" t:title="format" t:color="magenta1">
   <t:implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text2" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <component t:x="318" t:y="26" name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="foreach2" name="value"/>
-  <property>images</property>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="valueof2" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="193" t:y="37" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="property" name="content"/>
+ <component name="name3" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>src</property>
  </component>
- <component t:x="553" t:y="52" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>&lt;img src=&quot;{0}&quot; width=&quot;320&quot;/&gt;</property>
+ <component name="name4" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>m</property>
  </component>
- <component t:x="586" t:y="148" name="name3" t:title="" t:color="orange1">
+ <component name="name5" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>src</property>
+  <property>image</property>
  </component>
- <component t:x="590" t:y="175" name="picalbum" t:title="picasa album" t:color="blue1">
+ <component name="picalbum" t:title="picasa album" t:color="blue1">
   <t:implementation.python script="nuvem/picalbum.py"/>
   <service name="picalbum"/>
   <reference target="text5" name="id"/>
@@ -100,39 +75,64 @@
    <t:binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
   </reference>
  </component>
- <component t:x="605" t:y="240" name="name4" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>m</property>
+ <component name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="foreach2" name="value"/>
+  <property>images</property>
  </component>
- <component t:x="606" t:y="265" name="flkalbum" t:title="flicker album" t:color="blue1">
-  <t:implementation.python script="nuvem/flkalbum.py"/>
-  <service name="flkalbum"/>
-  <reference target="text7" name="id"/>
-  <reference name="flk" t:visible="false">
-   <t:binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
-  </reference>
+ <component name="search" t:title="search" t:color="yellow1">
+  <t:implementation.python script="nuvem/search.py"/>
+  <service name="search"/>
+  <reference target="name3" name="path"/>
+  <reference target="picalbum" name="list"/>
+ </component>
+ <component name="search2" t:title="search" t:color="yellow1">
+  <t:implementation.python script="nuvem/search.py"/>
+  <service name="search"/>
+  <reference target="name4" name="path"/>
+  <reference target="flkalbum" name="list"/>
+ </component>
+ <component name="shuffle" t:title="shuffle" t:color="yellow1">
+  <t:implementation.python script="nuvem/shuffle_.py"/>
+  <service name="shuffle"/>
+  <reference target="append" name="list"/>
+ </component>
+ <component t:x="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"/>
+  </service>
+  <reference target="property" name="content"/>
+ </component>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>&lt;img src=&quot;{0}&quot; width=&quot;320&quot;/&gt;</property>
+ </component>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
  </component>
- <component t:x="497" t:y="147" name="values" t:title="values" t:color="yellow1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t: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"/>
+  <service name="valueof"/>
+  <property>image</property>
+ </component>
+ <component name="values" t:title="values" t:color="yellow1">
   <t:implementation.python script="nuvem/values.py"/>
   <service name="values"/>
   <reference target="search" name="list"/>
  </component>
- <component t:x="486" t:y="228" name="values2" t:title="values" t:color="yellow1">
+ <component name="values2" t:title="values" t:color="yellow1">
   <t:implementation.python script="nuvem/values.py"/>
   <service name="values"/>
   <reference target="search2" name="list"/>
  </component>
- <component t:x="542" t:y="223" name="search2" t:title="search" t:color="yellow1">
-  <t:implementation.python script="nuvem/search.py"/>
-  <service name="search"/>
-  <reference target="name4" name="path"/>
-  <reference target="flkalbum" name="list"/>
- </component>
- <component t:x="540" t:y="144" name="search" t:title="search" t:color="yellow1">
-  <t:implementation.python script="nuvem/search.py"/>
-  <service name="search"/>
-  <reference target="name3" name="path"/>
-  <reference target="picalbum" name="list"/>
- </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html
deleted file mode 100644
index 5b2645db8b..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 9px; left: 2px; ">
-  <H2>Our Photos</H2>
- </SPAN>
- <SPAN id="images" class="list" style="position: absolute; top: 45px; left: 2px; ">
-  <TABLE class="datatable" style="width: 100%; ">
-   <TBODY>
-    <TR>
-     <TD>list</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html
new file mode 100644
index 0000000000..489e6fe825
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Our Photos</H2>
+ </SPAN>
+ <SPAN id="images" class="list" style="position: absolute; top: 27px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>list</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
index 8cec2914ba..919a79f0f0 100644
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
@@ -17,94 +17,225 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://shoppingcart" name="shoppingcart">
- <service name="appstart" promote="appstart"/>
- <component t:x="14" t:y="26" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="list4" name="content"/>
- </component>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
  <service name="addToCart" promote="addToCart"/>
- <component t:x="427" t:y="412" name="addToCart" t:title="{compname}" t:color="green1">
+ <service name="carthtml" promote="carthtml"/>
+ <service name="catalog" promote="catalog"/>
+ <service name="cataloghtml" promote="cataloghtml"/>
+ <service name="checkout" promote="checkout"/>
+ <service name="emptyCart" promote="emptyCart"/>
+ <service name="getcart" promote="getcart"/>
+ <service name="order" promote="order"/>
+ <service name="start" promote="start"/>
+ <service name="total" promote="total"/>
+ <component t:x="367" t:y="421" name="addToCart" t:title="{compname}" t:color="green1">
   <t:implementation.python script="nuvem/service.py"/>
   <service name="service" t:visible="false"/>
   <reference target="list6" name="content"/>
  </component>
- <service name="emptyCart" promote="emptyCart"/>
- <component t:x="10" t:y="560" name="emptyCart" t:title="{compname}" t:color="green1">
+ <component name="append" t:title="+" t:color="yellow1">
+  <t:implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference target="call2" name="first"/>
+  <reference target="lookup" name="second"/>
+ </component>
+ <component name="call" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name14" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call10" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name12" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call11" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name16" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call12" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name13" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call13" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name17" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call14" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name19" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call15" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name20" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call16" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name21" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name5" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call3" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name6" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call4" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name15" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call5" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name8" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call6" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name10" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call7" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name9" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call8" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name11" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call9" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name2" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="12" t:y="388" name="carthtml" t:title="{compname}" t:color="green1">
   <t:implementation.python script="nuvem/service.py"/>
   <service name="service" t:visible="false"/>
-  <reference target="list5" name="content"/>
+  <reference target="property6" name="content"/>
+ </component>
+ <component t:x="354" t:y="28" name="catalog" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list" name="content"/>
+ </component>
+ <component t:x="12" t:y="221" name="cataloghtml" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="property" name="content"/>
  </component>
- <service name="checkout" promote="checkout"/>
  <component t:x="12" t:y="758" name="checkout" t:title="{compname}" t:color="green1">
   <t:implementation.python script="nuvem/service.py"/>
   <service name="service" t:visible="false"/>
   <reference target="list3" name="content"/>
  </component>
- <component t:x="372" t:y="285" name="filedb" t:title="file" t:color="red1">
+ <component name="delete2" t:title="delete" t:color="red1">
+  <t:implementation.python script="nuvem/delete.py"/>
+  <service name="delete"/>
+  <reference target="filedb2" name="collection"/>
+  <reference target="user2" name="id"/>
+ </component>
+ <component t:x="10" t:y="560" name="emptyCart" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list5" name="content"/>
+ </component>
+ <component name="filedb" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="374" t:y="311" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component name="filedb2" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="861" t:y="26" name="get" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb" name="collection"/>
-  <reference target="user" name="id"/>
+ <component name="filedb3" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <service name="getcart" promote="getcart"/>
- <component t:x="558" t:y="148" name="getcart" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="get" name="content"/>
+ <component name="foreach" t:title="foreach" t:color="yellow1">
+  <t:implementation.python script="nuvem/map_.py"/>
+  <service name="foreach"/>
+  <reference target="name" name="item"/>
+  <reference target="format2" name="transform"/>
+  <reference target="call9" name="list"/>
  </component>
- <component t:x="827" t:y="16" name="name5" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>getcart</property>
+ <component name="foreach2" t:title="foreach" t:color="yellow1">
+  <t:implementation.python script="nuvem/map_.py"/>
+  <service name="foreach"/>
+  <reference target="name3" name="item"/>
+  <reference target="format3" name="transform"/>
+  <reference target="call10" name="list"/>
  </component>
- <service name="total" promote="total"/>
- <component t:x="427" t:y="294" name="total" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="property2" name="content"/>
+ <component name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text4" name="pattern"/>
+  <reference target="call8" name="values"/>
  </component>
- <component t:x="748" t:y="243" name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="call11" name="value"/>
-  <property>message</property>
+ <component name="format2" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text5" name="pattern"/>
+  <reference target="valueof" name="values"/>
  </component>
- <component t:x="229" t:y="11" name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text2" name="value"/>
-  <property>message</property>
+ <component name="format3" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text6" name="pattern"/>
+  <reference target="valueof2" name="values"/>
  </component>
- <service name="catalog" promote="catalog"/>
- <component t:x="405" t:y="22" name="catalog" t:title="{compname}" t:color="green1">
+ <component name="get" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb" name="collection"/>
+  <reference target="user" name="id"/>
+ </component>
+ <component t:x="477" t:y="153" name="getcart" t:title="{compname}" t:color="green1">
   <t:implementation.python script="nuvem/service.py"/>
   <service name="service" t:visible="false"/>
-  <reference target="list" name="content"/>
+  <reference target="get" name="content"/>
  </component>
- <component t:x="672" t:y="8" name="list5" t:title="list" t:color="yellow1">
+ <component name="list" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property11" name="item" t:clonable="true"/>
-  <reference target="call7" name="item" t:clonable="true"/>
-  <reference target="call16" name="item" t:clonable="true"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference target="property10" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="689" t:y="166" name="list3" t:title="list" t:color="yellow1">
+ <component name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="property4" name="item" t:clonable="true"/>
@@ -112,15 +243,7 @@
   <reference target="call3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="144" t:y="179" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property8" name="item" t:clonable="true"/>
-  <reference target="property9" name="item" t:clonable="true"/>
-  <reference target="property10" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="147" t:y="7" name="list4" t:title="list" t:color="yellow1">
+ <component name="list4" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="property5" name="item" t:clonable="true"/>
@@ -129,449 +252,316 @@
   <reference target="call14" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="543" t:y="250" name="name11" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>total</property>
- </component>
- <component t:x="297" t:y="183" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>2.99</property>
- </component>
- <component t:x="219" t:y="179" name="property8" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="number" name="value"/>
-  <property>Mango</property>
- </component>
- <component t:x="224" t:y="218" name="property9" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="number2" name="value"/>
-  <property>Passion</property>
- </component>
- <component t:x="336" t:y="215" name="number2" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>3.55</property>
- </component>
- <component t:x="314" t:y="250" name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>1.55</property>
- </component>
- <service name="cataloghtml" promote="cataloghtml"/>
- <component t:x="12" t:y="221" name="cataloghtml" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="property" name="content"/>
- </component>
- <component t:x="219" t:y="207" name="format2" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text5" name="pattern"/>
-  <reference target="valueof" name="values"/>
+ <component name="list5" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property11" name="item" t:clonable="true"/>
+  <reference target="call7" name="item" t:clonable="true"/>
+  <reference target="call16" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="310" t:y="275" name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>catalog</property>
+ <component name="list6" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="call4" name="item" t:clonable="true"/>
+  <reference target="call6" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="218" t:y="272" name="call9" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name2" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="lookup" t:title="lookup" t:color="yellow1">
+  <t:implementation.python script="nuvem/lookup.py"/>
+  <service name="lookup"/>
+  <reference target="param" name="name"/>
+  <reference target="call15" name="list"/>
  </component>
- <component t:x="222" t:y="180" name="name" t:title="" t:color="orange1">
+ <component name="name" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>fruit</property>
  </component>
- <service name="carthtml" promote="carthtml"/>
- <component t:x="12" t:y="388" name="carthtml" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="property6" name="content"/>
- </component>
- <component t:x="421" t:y="43" name="name8" t:title="" t:color="orange1">
+ <component name="name10" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>cataloghtml</property>
+  <property>total</property>
  </component>
- <component t:x="215" t:y="425" name="name3" t:title="" t:color="orange1">
+ <component name="name11" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>fruit</property>
- </component>
- <component t:x="216" t:y="457" name="format3" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text6" name="pattern"/>
-  <reference target="valueof2" name="values"/>
- </component>
- <component t:x="294" t:y="246" name="valueof" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>fruit</property>
- </component>
- <component t:x="272" t:y="478" name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>fruit</property>
+  <property>total</property>
  </component>
- <component t:x="307" t:y="518" name="name12" t:title="" t:color="orange1">
+ <component name="name12" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component t:x="256" t:y="161" name="foreach" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name" name="item"/>
-  <reference target="format2" name="transform"/>
-  <reference target="call9" name="list"/>
- </component>
- <component t:x="200" t:y="56" name="call5" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name8" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="297" t:y="590" name="name9" t:title="" t:color="orange1">
+ <component name="name13" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>carthtml</property>
- </component>
- <component t:x="313" t:y="794" name="name6" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>emptyCart</property>
- </component>
- <component t:x="567" t:y="822" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Your order has been processed. Your total: ${1}</property>
- </component>
- <component t:x="296" t:y="588" name="valueof3" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>sum</property>
+  <property>order</property>
  </component>
- <component t:x="528" t:y="96" name="name14" t:title="" t:color="orange1">
+ <component name="name14" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>getcart</property>
  </component>
- <component t:x="336" t:y="386" name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>${1} - {0}</property>
- </component>
- <component t:x="556" t:y="340" name="filedb3" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="555" t:y="366" name="user3" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
- </component>
- <component t:x="859" t:y="410" name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name5" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="859" t:y="499" name="name10" t:title="" t:color="orange1">
+ <component name="name15" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>total</property>
+  <property>carthtml</property>
  </component>
- <component t:x="857" t:y="464" name="name15" t:title="" t:color="orange1">
+ <component name="name16" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>carthtml</property>
- </component>
- <component t:x="121" t:y="358" name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="foreach2" name="value"/>
-  <property>cart</property>
- </component>
- <component t:x="773" t:y="510" name="call6" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name10" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="848" t:y="289" name="put" t:title="put" t:color="red1">
-  <t:implementation.python script="nuvem/put.py"/>
-  <service name="put"/>
-  <reference target="filedb3" name="collection"/>
-  <reference target="user3" name="id"/>
-  <reference target="append" name="value"/>
- </component>
- <component t:x="769" t:y="291" name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="put" name="value"/>
-  <property>putresult</property>
- </component>
- <component t:x="749" t:y="105" name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="number4" name="value"/>
-  <property>Kiwi</property>
- </component>
- <component t:x="814" t:y="592" name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="delete2" name="value"/>
-  <property>delresult</property>
- </component>
- <component t:x="299" t:y="617" name="valueof4" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>price</property>
- </component>
- <component t:x="98" t:y="526" name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="round" name="value"/>
-  <property>total</property>
- </component>
- <component t:x="570" t:y="917" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text4" name="pattern"/>
-  <reference target="call8" name="values"/>
- </component>
- <service name="order" promote="order"/>
- <component t:x="426" t:y="727" name="order" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="format" name="content"/>
- </component>
- <component t:x="328" t:y="797" name="call11" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name16" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+  <property>order</property>
  </component>
- <component t:x="1016" t:y="150" name="name16" t:title="" t:color="orange1">
+ <component name="name17" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>order</property>
+  <property>carthtml</property>
  </component>
- <component t:x="201" t:y="114" name="call13" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name17" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="name19" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>total</property>
  </component>
- <component t:x="283" t:y="114" name="name17" t:title="" t:color="orange1">
+ <component name="name2" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>carthtml</property>
+  <property>catalog</property>
  </component>
- <component t:x="197" t:y="153" name="call14" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name19" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="name20" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>catalog</property>
  </component>
- <component t:x="289" t:y="151" name="name19" t:title="" t:color="orange1">
+ <component name="name21" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>total</property>
  </component>
- <component t:x="742" t:y="944" name="name13" t:title="" t:color="orange1">
+ <component name="name3" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>order</property>
+  <property>fruit</property>
  </component>
- <component t:x="680" t:y="1038" name="call8" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name11" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="name5" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>getcart</property>
  </component>
- <component t:x="378" t:y="263" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>&lt;span id=&quot;fruit&quot; class=&quot;checkbox&quot;&gt;&lt;input type=&quot;checkbox&quot; value=&quot;{0}&quot;/&gt;${1} - {0}&lt;/span&gt;</property>
+ <component name="name6" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>emptyCart</property>
  </component>
- <component t:x="467" t:y="374" name="name20" t:title="" t:color="orange1">
+ <component name="name8" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>catalog</property>
+  <property>cataloghtml</property>
  </component>
- <component t:x="143" t:y="235" name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="foreach" name="value"/>
-  <property>catalog</property>
+ <component name="name9" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>carthtml</property>
+ </component>
+ <component name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>2.99</property>
+ </component>
+ <component name="number2" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3.55</property>
+ </component>
+ <component name="number3" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>2</property>
+ </component>
+ <component name="number4" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>1.55</property>
+ </component>
+ <component t:x="418" t:y="750" name="order" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="format" name="content"/>
  </component>
- <component t:x="258" t:y="734" name="param" t:title="?param" t:color="green1">
+ <component name="param" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>fruit</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="257" t:y="757" name="call15" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name20" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="foreach" name="value"/>
+  <property>catalog</property>
  </component>
- <component t:x="391" t:y="635" name="append" t:title="+" t:color="yellow1">
-  <t:implementation.python script="nuvem/append.py"/>
-  <service name="append"/>
-  <reference target="call2" name="first"/>
-  <reference target="lookup" name="second"/>
+ <component name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number4" name="value"/>
+  <property>Kiwi</property>
  </component>
- <component t:x="455" t:y="671" name="lookup" t:title="lookup" t:color="yellow1">
-  <t:implementation.python script="nuvem/lookup.py"/>
-  <service name="lookup"/>
-  <reference target="param" name="name"/>
-  <reference target="call15" name="list"/>
+ <component name="property11" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="delete2" name="value"/>
+  <property>delresult</property>
  </component>
- <component t:x="281" t:y="497" name="call10" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name12" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property12" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="sendgtalk" name="value"/>
+  <property>sendresult</property>
  </component>
- <component t:x="216" t:y="405" name="foreach2" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name3" name="item"/>
-  <reference target="format3" name="transform"/>
-  <reference target="call10" name="list"/>
+ <component name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="round" name="value"/>
+  <property>total</property>
  </component>
- <component t:x="854" t:y="834" name="call7" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name9" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="call11" name="value"/>
+  <property>message</property>
  </component>
- <component t:x="853" t:y="866" name="call16" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name21" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text2" name="value"/>
+  <property>message</property>
  </component>
- <component t:x="464" t:y="189" name="name21" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>total</property>
+ <component name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="foreach2" name="value"/>
+  <property>cart</property>
  </component>
- <component t:x="214" t:y="767" name="call4" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name15" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property7" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="put" name="value"/>
+  <property>putresult</property>
  </component>
- <component t:x="139" t:y="579" name="list6" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference target="call4" name="item" t:clonable="true"/>
-  <reference target="call6" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="property8" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number" name="value"/>
+  <property>Mango</property>
  </component>
- <component t:x="320" t:y="42" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Welcome to my online store</property>
+ <component name="property9" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number2" name="value"/>
+  <property>Passion</property>
+ </component>
+ <component name="put" t:title="put" t:color="red1">
+  <t:implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference target="filedb3" name="collection"/>
+  <reference target="user3" name="id"/>
+  <reference target="append" name="value"/>
  </component>
- <component t:x="667" t:y="375" name="round" t:title="round" t:color="magenta1">
+ <component name="round" t:title="round" t:color="magenta1">
   <t:implementation.python script="nuvem/round_.py"/>
   <service name="round"/>
   <reference target="number3" name="n"/>
   <reference target="sum" name="x"/>
  </component>
- <component t:x="722" t:y="375" name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>2</property>
+ <component name="sendgtalk" t:title="gtalk" t:color="blue1">
+  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+  <service name="sendgtalk"/>
+  <reference target="text" name="jid"/>
+  <reference target="text7" name="pass"/>
+  <reference target="text3" name="to"/>
+  <reference target="call12" name="msg"/>
  </component>
- <component t:x="866" t:y="771" name="filedb2" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+ <component t:x="13" t:y="15" name="start" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/start.py"/>
+  <service name="start" t:visible="false">
+   <t:binding.http uri="start"/>
+  </service>
+  <reference target="list4" name="content"/>
  </component>
- <component t:x="816" t:y="767" name="delete2" t:title="delete" t:color="red1">
-  <t:implementation.python script="nuvem/delete.py"/>
-  <service name="delete"/>
-  <reference target="filedb2" name="collection"/>
-  <reference target="user2" name="id"/>
+ <component name="sum" t:title="sum" t:color="magenta1">
+  <t:implementation.python script="nuvem/sum_.py"/>
+  <service name="sum"/>
+  <reference target="values" name="l"/>
  </component>
- <component t:x="865" t:y="798" name="user2" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.1@gmail.com</property>
  </component>
- <component t:x="714" t:y="492" name="call" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name14" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Welcome to my online store</property>
  </component>
- <component t:x="263" t:y="879" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmppsca.2@gmail.com</property>
  </component>
- <component t:x="269" t:y="908" name="call12" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name13" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="635" t:y="345" name="values" t:title="values" t:color="yellow1">
-  <t:implementation.python script="nuvem/values.py"/>
-  <service name="values"/>
-  <reference target="call" name="list"/>
- </component>
- <component t:x="590" t:y="348" name="sum" t:title="sum" t:color="magenta1">
-  <t:implementation.python script="nuvem/sum_.py"/>
-  <service name="sum"/>
-  <reference target="values" name="l"/>
- </component>
- <component t:x="131" t:y="839" name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="sendgtalk" name="value"/>
-  <property>sendresult</property>
- </component>
- <component t:x="131" t:y="958" name="call3" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name6" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Your order has been processed. Your total: ${1}</property>
  </component>
- <component t:x="217" t:y="841" name="sendgtalk" t:title="gtalk" t:color="blue1">
-  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
-  <service name="sendgtalk"/>
-  <reference target="text" name="jid"/>
-  <reference target="text7" name="pass"/>
-  <reference target="text3" name="to"/>
-  <reference target="call12" name="msg"/>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>&lt;span id=&quot;fruit&quot; class=&quot;checkbox&quot;&gt;&lt;input type=&quot;checkbox&quot; value=&quot;{0}&quot;/&gt;${1} - {0}&lt;/span&gt;</property>
  </component>
- <component t:x="266" t:y="802" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>xmppsca.1@gmail.com</property>
+  <property>${1} - {0}</property>
  </component>
- <component t:x="266" t:y="830" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmpp4sca</property>
  </component>
+ <component t:x="387" t:y="296" name="total" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="property2" name="content"/>
+ </component>
+ <component name="user" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
+ </component>
+ <component name="user2" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
+ </component>
+ <component name="user3" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
+ </component>
+ <component name="valueof" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>fruit</property>
+ </component>
+ <component name="valueof2" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>fruit</property>
+ </component>
+ <component name="values" t:title="values" t:color="yellow1">
+  <t:implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference target="call" name="list"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html
deleted file mode 100644
index 4a7bc1557b..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="message" class="text" style="position: absolute; top: 36px; left: 2px; ">
-  <SPAN>Welcome</SPAN>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 189px; width: 100%; left: 2px; ">
-  <SPAN>Your Cart:</SPAN>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 72px; width: 100%; left: 2px; ">
-  <SPAN>Catalog</SPAN>
- </SPAN>
- <SPAN id="catalog" class="list" style="position: absolute; top: 99px; left: 2px; ">
-  <TABLE class="datatable" style="width: 100%; ">
-   <TBODY>
-    <TR>
-     <TD>list</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="cart" class="list" style="position: absolute; top: 216px; left: 2px; ">
-  <TABLE class="datatable" style="width: 100%; ">
-   <TBODY>
-    <TR>
-     <TD>list</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Shopping Cart</H2>
- </SPAN>
- <SPAN id="addToCart" class="button" style="position: absolute; top: 72px; left: 146px; ">
-  <INPUT type="button" value="Add to cart"/>
- </SPAN>
- <SPAN id="checkout" class="button" style="position: absolute; top: 189px; left: 146px; ">
-  <INPUT type="button" value="Check out"/>
- </SPAN>
- <SPAN id="emptyCart" class="button" style="position: absolute; top: 189px; left: 245px; ">
-  <INPUT type="button" value="Empty"/>
- </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 189px; left: 74px; ">
-  <SPAN>$</SPAN>
- </SPAN>
- <SPAN id="total" class="text" style="position: absolute; top: 189px; left: 83px; ">
-  <SPAN>0</SPAN>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html
new file mode 100644
index 0000000000..7d32ddd5b7
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="message" class="text" style="position: absolute; top: 36px; left: 2px; ">
+  <SPAN>Welcome</SPAN>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 189px; width: 100%; left: 2px; ">
+  <SPAN>Your Cart:</SPAN>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 72px; width: 100%; left: 2px; ">
+  <SPAN>Catalog</SPAN>
+ </SPAN>
+ <SPAN id="catalog" class="list" style="position: absolute; top: 99px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>list</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="cart" class="list" style="position: absolute; top: 216px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>list</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Shopping Cart</H2>
+ </SPAN>
+ <SPAN id="addToCart" class="button" style="position: absolute; top: 72px; left: 146px; ">
+  <INPUT type="button" value="Add to cart" 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 009b31b3b6..ba16436c3e 100644
--- a/sca-cpp/trunk/modules/edit/apps/slice/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/slice/app.composite
@@ -17,23 +17,23 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://slice" name="slice">
- <component t:x="271" t:y="21" name="number" t:title="#" t:color="orange1">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="start" promote="start"/>
+ <component name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component t:x="246" t:y="25" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number" name="value"/>
   <property>slice</property>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="129" t:y="23" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
+ <component t:x="17" t:y="9" name="start" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/start.py"/>
+  <service name="start" t:visible="false">
+   <t:binding.http uri="start"/>
   </service>
   <reference target="property" name="content"/>
  </component>
diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.composite b/sca-cpp/trunk/modules/edit/apps/test/app.composite
index 37abe589ad..7e4828573a 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite
@@ -17,29 +17,11 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://test" name="test">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
  <service name="text3" promote="text3"/>
- <component t:x="48" t:y="35" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component t:x="27" t:y="12" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>Hello World</property>
  </component>
- <service name="fbprofile" promote="fbprofile"/>
- <component t:x="404" t:y="163" name="fbprofile" t:title="facebook profile" t:color="blue1">
-  <t:implementation.python script="nuvem/fbprofile.py"/>
-  <service name="fbprofile"/>
-  <reference name="id"/>
-  <reference name="fb" t:visible="false">
-   <t:binding.http uri="https://graph.facebook.com"/>
-  </reference>
- </component>
- <service name="twprofile" promote="twprofile"/>
- <component t:x="402" t:y="216" name="twprofile" t:title="twitter profile" t:color="blue1">
-  <t:implementation.python script="nuvem/twprofile.py"/>
-  <service name="twprofile"/>
-  <reference name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
-  </reference>
- </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.html b/sca-cpp/trunk/modules/edit/apps/test/app.html
deleted file mode 100644
index 5c7c7219bb..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/test/app.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
new file mode 100644
index 0000000000..5c7c7219bb
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
@@ -0,0 +1,20 @@
+<?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"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
index 1a764eb20e..ddad3cd7a1 100644
--- a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
@@ -17,81 +17,81 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testdb" name="testdb">
- <component t:x="177" t:y="36" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>testkey</property>
- </component>
- <component t:x="102" t:y="35" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="103" t:y="91" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>testvalue</property>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="delete" promote="delete"/>
+ <service name="get" promote="get"/>
+ <service name="put" promote="put"/>
+ <component t:x="176" t:y="11" name="delete" t:title="delete" t:color="red1">
+  <t:implementation.python script="nuvem/delete.py"/>
+  <service name="delete"/>
+  <reference target="filedb2" name="collection"/>
+  <reference target="list3" name="id"/>
  </component>
- <component t:x="105" t:y="8" name="filedb" t:title="file" t:color="red1">
+ <component name="filedb" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <service name="put" promote="put"/>
- <component t:x="72" t:y="38" name="put" t:title="put" t:color="red1">
-  <t:implementation.python script="nuvem/put.py"/>
-  <service name="put"/>
-  <reference target="filedb" name="collection"/>
-  <reference target="list" name="id"/>
-  <reference target="text2" name="value"/>
- </component>
- <component t:x="311" t:y="186" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="get" promote="get"/>
- <component t:x="263" t:y="42" name="get" t:title="get" t:color="red1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb3" name="collection"/>
-  <reference target="list2" name="id"/>
- </component>
- <component t:x="311" t:y="155" name="filedb3" t:title="file" t:color="red1">
+ <component name="filedb2" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <service name="delete" promote="delete"/>
- <component t:x="457" t:y="44" name="delete" t:title="delete" t:color="red1">
-  <t:implementation.python script="nuvem/delete.py"/>
-  <service name="delete"/>
-  <reference target="filedb2" name="collection"/>
-  <reference target="list3" name="id"/>
- </component>
- <component t:x="113" t:y="223" name="filedb2" t:title="file" t:color="red1">
+ <component name="filedb3" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="111" t:y="243" name="list3" t:title="list" t:color="yellow1">
+ <component t:x="18" t:y="137" name="get" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb3" name="collection"/>
+  <reference target="list2" name="id"/>
+ </component>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text3" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="text4" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="187" t:y="249" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component t:x="13" t:y="1" name="put" t:title="put" t:color="red1">
+  <t:implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference target="filedb" name="collection"/>
+  <reference target="list" name="id"/>
+  <reference target="text2" name="value"/>
+ </component>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>testkey</property>
+ </component>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>testvalue</property>
+ </component>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
  </component>
- <component t:x="342" t:y="70" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>testkey</property>
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.html b/sca-cpp/trunk/modules/edit/apps/testdb/app.html
deleted file mode 100644
index 734ec8f687..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testdb/app.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
-  <H1>Test db components</H1>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html
new file mode 100644
index 0000000000..734ec8f687
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test db components</H1>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
index 04c6eea787..ffe17c3cd4 100644
--- a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
@@ -17,155 +17,155 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testevents" name="testevents">
- <component t:x="888" t:y="14" name="text3" t:title=" '{propval}'" t:color="orange1">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="call2" promote="call2"/>
+ <service name="compabc" promote="compabc"/>
+ <service name="compxyz" promote="compxyz"/>
+ <service name="geolocation" promote="geolocation"/>
+ <service name="start" promote="start"/>
+ <service name="testbutton1" promote="testbutton1"/>
+ <service name="testbutton2" promote="testbutton2"/>
+ <service name="timer3" promote="timer3"/>
+ <component name="abc" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>cancel button clicked</property>
+  <property>abc</property>
  </component>
- <component t:x="844" t:y="132" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>timer fired</property>
+ <component t:x="16" t:y="208" name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="359" t:y="75" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>page opens</property>
+ <component t:x="14" t:y="265" name="compabc" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="abc" name="content"/>
  </component>
- <component t:x="228" t:y="197" name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text2" name="value"/>
-  <property>status</property>
+ <component t:x="15" t:y="316" name="compxyz" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="text12" name="content"/>
  </component>
- <component t:x="371" t:y="408" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>ok button clicked</property>
+ <component t:x="12" t:y="146" name="geolocation" t:title="location" t:color="green1">
+  <t:implementation.python script="nuvem/geolocation.py"/>
+  <service name="geolocation" t:visible="false">
+   <t:binding.http uri="geolocation"/>
+  </service>
+  <reference target="property6" name="content"/>
  </component>
- <component t:x="229" t:y="156" name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="param" name="value"/>
-  <property>testtext</property>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="619" t:y="371" name="params2" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
-  <service name="params"/>
-  <property name="query" t:visible="false"/>
+ <component name="name" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>compxyz</property>
  </component>
- <component t:x="307" t:y="147" name="param" t:title="?param" t:color="green1">
+ <component name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3000</property>
+ </component>
+ <component name="param" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>testfield</property>
   <property name="query" t:visible="false"/>
  </component>
- <service name="every3" promote="every3"/>
- <component t:x="62" t:y="91" name="every3" t:title="every" t:color="green1">
-  <t:implementation.python script="nuvem/every.py"/>
-  <service name="every" t:visible="false">
-   <t:binding.http uri="every"/>
-  </service>
-  <reference target="number" name="n"/>
-  <reference target="property2" name="content"/>
+ <component name="params2" t:title="?params" t:color="green1">
+  <t:implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="601" t:y="122" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>3000</property>
+ <component name="prop2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text3" name="value"/>
+  <property>status</property>
  </component>
- <component t:x="602" t:y="148" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text4" name="value"/>
   <property>status</property>
  </component>
- <component t:x="598" t:y="227" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="params2" name="value"/>
-  <property>location</property>
- </component>
- <service name="geolocation" promote="geolocation"/>
- <component t:x="61" t:y="178" name="geolocation" t:title="location" t:color="green1">
-  <t:implementation.python script="nuvem/geolocation.py"/>
-  <service name="geolocation" t:visible="false">
-   <t:binding.http uri="geolocation"/>
-  </service>
-  <reference target="property6" name="content"/>
+  <reference target="text" name="value"/>
+  <property>status</property>
  </component>
- <component t:x="159" t:y="42" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property4" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="text" name="value"/>
+  <reference target="text2" name="value"/>
   <property>status</property>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="63" t:y="31" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
+ <component name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="param" name="value"/>
+  <property>testtext</property>
+ </component>
+ <component name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="params2" name="value"/>
+  <property>location</property>
+ </component>
+ <component t:x="15" t:y="3" name="start" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/start.py"/>
+  <service name="start" t:visible="false">
+   <t:binding.http uri="start"/>
   </service>
   <reference target="property3" name="content"/>
  </component>
- <component t:x="172" t:y="141" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="testbutton1" promote="testbutton1"/>
- <component t:x="364" t:y="102" name="testbutton1" t:title="{compname}" t:color="green1">
+ <component t:x="228" t:y="78" name="testbutton1" t:title="{compname}" t:color="green1">
   <t:implementation.python script="nuvem/service.py"/>
   <service name="service" t:visible="false"/>
   <reference target="list" name="content"/>
  </component>
- <service name="testbutton2" promote="testbutton2"/>
- <component t:x="362" t:y="35" name="testbutton2" t:title="{compname}" t:color="green1">
+ <component t:x="223" t:y="16" name="testbutton2" t:title="{compname}" t:color="green1">
   <t:implementation.python script="nuvem/service.py"/>
   <service name="service" t:visible="false"/>
   <reference target="prop2" name="content"/>
  </component>
- <component t:x="602" t:y="52" name="prop2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text3" name="value"/>
-  <property>status</property>
- </component>
- <component t:x="455" t:y="315" name="abc" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abc</property>
+  <property>page opens</property>
  </component>
- <service name="compabc" promote="compabc"/>
- <component t:x="236" t:y="248" name="compabc" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="abc" name="content"/>
+ <component name="text12" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xyz</property>
  </component>
- <service name="compxyz" promote="compxyz"/>
- <component t:x="236" t:y="299" name="compxyz" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference name="content" target="text12"/>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>ok button clicked</property>
  </component>
- <component name="text12" t:x="428" t:y="366" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>xyz</property>
+  <property>cancel button clicked</property>
  </component>
- <service name="call2" promote="call2"/>
- <component t:x="69" t:y="248" name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>timer fired</property>
  </component>
- <component t:x="184" t:y="316" name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>compxyz</property>
+ <component t:x="13" t:y="58" name="timer3" t:title="timer" t:color="green1">
+  <t:implementation.python script="nuvem/timer.py"/>
+  <service name="timer" t:visible="false">
+   <t:binding.http uri="timer"/>
+  </service>
+  <reference target="number" name="n"/>
+  <reference target="property2" name="content"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.html b/sca-cpp/trunk/modules/edit/apps/testevents/app.html
deleted file mode 100644
index 94ffd7a609..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testevents/app.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="testbutton1" class="button" style="position: absolute; top: 207px; left: 2px; ">
-  <INPUT type="button" value="OK"/>
- </SPAN>
- <SPAN id="testbutton2" class="button" style="position: absolute; top: 207px; left: 47px; ">
-  <INPUT type="button" value="Cancel"/>
- </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 171px; left: 11px; ">
-  <SPAN>Latitude:</SPAN>
- </SPAN>
- <SPAN id="latitude" class="text" style="position: absolute; top: 171px; left: 92px; ">
-  <SPAN>text</SPAN>
- </SPAN>
- <SPAN id="longitude" class="text" style="position: absolute; top: 144px; left: 92px; ">
-  <SPAN>text</SPAN>
- </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 144px; left: 11px; ">
-  <SPAN>Longitude:</SPAN>
- </SPAN>
- <SPAN id="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>
- <SPAN id="text" class="text" style="position: absolute; top: 90px; left: 11px; ">
-  <SPAN>Status:</SPAN>
- </SPAN>
- <SPAN id="status" class="text" style="position: absolute; top: 90px; left: 92px; ">
-  <SPAN>text</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>
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
-  <H1>Test events</H1>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html
new file mode 100644
index 0000000000..36b07205c7
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html
@@ -0,0 +1,57 @@
+<?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="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>
+ <SPAN id="latitude" class="text" style="position: absolute; top: 171px; left: 92px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="longitude" class="text" style="position: absolute; top: 144px; left: 92px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="text" class="text" style="position: absolute; top: 144px; left: 11px; ">
+  <SPAN>Longitude:</SPAN>
+ </SPAN>
+ <SPAN id="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>
+ <SPAN id="text" class="text" style="position: absolute; top: 90px; left: 11px; ">
+  <SPAN>Status:</SPAN>
+ </SPAN>
+ <SPAN id="status" class="text" style="position: absolute; top: 90px; left: 92px; ">
+  <SPAN>text</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>
+ <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test events</H1>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
index d403fcb32a..f9955c5640 100644
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
@@ -17,114 +17,114 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testhttp" name="testhttp">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
  <service name="get" promote="get"/>
- <component t:x="25" t:y="25" name="get" t:title="get" t:color="green1">
+ <service name="get2" promote="get2"/>
+ <service name="get3" promote="get3"/>
+ <service name="get4" promote="get4"/>
+ <service name="get5" promote="get5"/>
+ <service name="get6" promote="get6"/>
+ <service name="parse" promote="parse"/>
+ <component name="first" t:title="first" t:color="yellow1">
+  <t:implementation.python script="nuvem/first.py"/>
+  <service name="first"/>
+  <reference target="rest" name="list"/>
+ </component>
+ <component t:x="20" t:y="8" name="get" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text" name="url"/>
  </component>
- <service name="get2" promote="get2"/>
- <component t:x="24" t:y="83" name="get2" t:title="get" t:color="green1">
+ <component t:x="18" t:y="61" name="get2" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text2" name="url"/>
  </component>
- <service name="get3" promote="get3"/>
- <component t:x="23" t:y="146" name="get3" t:title="get" t:color="green1">
+ <component t:x="14" t:y="112" name="get3" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="87" t:y="175" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdXMLclient.php?whichClient=NDFDgen&amp;lat=38.99&amp;lon=-77.01&amp;listLatLon=&amp;lat1=&amp;lon1=&amp;lat2=&amp;lon2=&amp;resolutionSub=&amp;listLat1=&amp;listLon1=&amp;listLat2=&amp;listLon2=&amp;resolutionList=&amp;endPoint1Lat=&amp;endPoint1Lon=&amp;endPoint2Lat=&amp;endPoint2Lon=&amp;listEndPoint1Lat=&amp;listEndPoint1Lon=&amp;listEndPoint2Lat=&amp;listEndPoint2Lon=&amp;zipCodeList=&amp;listZipCodeList=&amp;centerPointLat=&amp;centerPointLon=&amp;distanceLat=&amp;distanceLon=&amp;resolutionSquare=&amp;listCenterPointLat=&amp;listCenterPointLon=&amp;listDistanceLat=&amp;listDistanceLon=&amp;listResolutionSquare=&amp;citiesLevel=&amp;listCitiesLevel=&amp;sector=&amp;gmlListLatLon=&amp;featureType=&amp;requestedTime=&amp;startTime=&amp;endTime=&amp;compType=&amp;propertyName=&amp;product=time-series&amp;begin=2004-01-01T00%3A00%3A00&amp;end=2015-03-10T00%3A00%3A00&amp;maxt=maxt&amp;Submit=Submit</property>
- </component>
- <component t:x="88" t:y="91" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&amp;destination=Concord,MA&amp;waypoints=Charlestown,MA|Lexington,MA&amp;sensor=false</property>
- </component>
- <service name="get4" promote="get4"/>
- <component t:x="25" t:y="210" name="get4" t:title="get" t:color="green1">
+ <component t:x="17" t:y="166" name="get4" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text4" name="url"/>
  </component>
- <component t:x="90" t:y="267" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://feedproxy.google.com/TechCrunch</property>
- </component>
- <component t:x="93" t:y="25" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.google.com</property>
- </component>
- <service name="get5" promote="get5"/>
- <component t:x="26" t:y="274" name="get5" t:title="get" t:color="green1">
+ <component t:x="19" t:y="218" name="get5" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
- <component t:x="95" t:y="331" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>cnn.com</property>
- </component>
- <service name="get6" promote="get6"/>
- <component t:x="26" t:y="335" name="get6" t:title="get" t:color="green1">
+ <component t:x="19" t:y="271" name="get6" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text6" name="url"/>
  </component>
- <component t:x="95" t:y="395" name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>https://chart.googleapis.com/chart?cht=p3&amp;chs=250x100&amp;chd=t:60,40&amp;chl=Hello|World</property>
+ <component name="get7" t:title="get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="text7" name="url"/>
  </component>
- <service name="parse" promote="parse"/>
- <component t:x="529" t:y="192" name="parse" t:title="parse" t:color="magenta1">
+ <component name="join" t:title="join" t:color="magenta1">
+  <t:implementation.python script="nuvem/join.py"/>
+  <service name="join"/>
+  <reference target="text9" name="separator"/>
+  <reference target="first" name="list"/>
+ </component>
+ <component t:x="19" t:y="329" name="parse" t:title="parse" t:color="magenta1">
   <t:implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference target="text8" name="regexp"/>
   <reference target="join" name="string"/>
  </component>
- <component t:x="832" t:y="249" name="rest" t:title="rest" t:color="yellow1">
+ <component name="rest" t:title="rest" t:color="yellow1">
   <t:implementation.python script="nuvem/rest.py"/>
   <service name="rest"/>
   <reference target="get7" name="list"/>
  </component>
- <component t:x="868" t:y="311" name="get7" t:title="get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="text7" name="url"/>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.google.com</property>
+ </component>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&amp;destination=Concord,MA&amp;waypoints=Charlestown,MA|Lexington,MA&amp;sensor=false</property>
+ </component>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdXMLclient.php?whichClient=NDFDgen&amp;lat=38.99&amp;lon=-77.01&amp;listLatLon=&amp;lat1=&amp;lon1=&amp;lat2=&amp;lon2=&amp;resolutionSub=&amp;listLat1=&amp;listLon1=&amp;listLat2=&amp;listLon2=&amp;resolutionList=&amp;endPoint1Lat=&amp;endPoint1Lon=&amp;endPoint2Lat=&amp;endPoint2Lon=&amp;listEndPoint1Lat=&amp;listEndPoint1Lon=&amp;listEndPoint2Lat=&amp;listEndPoint2Lon=&amp;zipCodeList=&amp;listZipCodeList=&amp;centerPointLat=&amp;centerPointLon=&amp;distanceLat=&amp;distanceLon=&amp;resolutionSquare=&amp;listCenterPointLat=&amp;listCenterPointLon=&amp;listDistanceLat=&amp;listDistanceLon=&amp;listResolutionSquare=&amp;citiesLevel=&amp;listCitiesLevel=&amp;sector=&amp;gmlListLatLon=&amp;featureType=&amp;requestedTime=&amp;startTime=&amp;endTime=&amp;compType=&amp;propertyName=&amp;product=time-series&amp;begin=2004-01-01T00%3A00%3A00&amp;end=2015-03-10T00%3A00%3A00&amp;maxt=maxt&amp;Submit=Submit</property>
+ </component>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://feedproxy.google.com/TechCrunch</property>
  </component>
- <component t:x="795" t:y="269" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cnn.com</property>
  </component>
- <component t:x="553" t:y="292" name="first" t:title="first" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="rest" name="list"/>
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>https://chart.googleapis.com/chart?cht=p3&amp;chs=250x100&amp;chd=t:60,40&amp;chl=Hello|World</property>
  </component>
- <component t:x="812" t:y="334" name="text9" t:title=" '{propval}'" t:color="orange1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property name="property"/>
+  <property>cnn.com</property>
  </component>
- <component t:x="617" t:y="226" name="text8" t:title=" '{propval}'" t:color="orange1">
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>(CNN)</property>
  </component>
- <component t:x="617" t:y="254" name="join" t:title="join" t:color="magenta1">
-  <t:implementation.python script="nuvem/join.py"/>
-  <service name="join"/>
-  <reference target="text9" name="separator"/>
-  <reference target="first" name="list"/>
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property name="property"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.html b/sca-cpp/trunk/modules/edit/apps/testhttp/app.html
deleted file mode 100644
index 2faf6fa886..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
-  <H1>Test HTTP components</H1>
- </SPAN>
- <SPAN id="iframe" class="iframe" style="position: absolute; top: 234px; left: 11px; ">
-  <A href="https://testhttp.sca-store.com:8453/components/get5">
-   <SPAN class="fakeframe">
-    <SPAN>frame ...</SPAN>
-   </SPAN>
-  </A>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html
new file mode 100644
index 0000000000..ddbd0ebc48
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test 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">
+   <SPAN class="fakeframe">
+    <SPAN>frame ...</SPAN>
+   </SPAN>
+  </A>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
index a5ab623b3c..d9b209fe10 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
@@ -17,134 +17,134 @@
  * 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://testlogic" name="testlogic">
+<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="cos" promote="cos"/>
+ <service name="eval" promote="eval"/>
+ <service name="eval2" promote="eval2"/>
+ <service name="exec" promote="exec"/>
+ <service name="exec2" promote="exec2"/>
  <service name="if" promote="if"/>
- <component t:x="22" t:y="45" name="if" t:title="if" t:color="magenta1">
-  <t:implementation.python script="nuvem/if_.py"/>
-  <service name="if"/>
-  <reference target="greater" name="condition"/>
-  <reference target="text" name="then"/>
-  <reference target="text2" name="else"/>
+ <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <service name="exec"/>
+  <reference target="text6" name="py"/>
+  <reference target="number5" name="ref"/>
+ </component>
+ <component name="get" t:title="get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="text5" name="url"/>
  </component>
- <component t:x="75" t:y="24" name="greater" t:title="gt" t:color="magenta1">
+ <component name="greater" t:title="gt" t:color="magenta1">
   <t:implementation.python script="nuvem/greater.py"/>
   <service name="greater"/>
   <reference target="number2" name="value1"/>
   <reference target="number" name="value2"/>
  </component>
- <component t:x="118" t:y="66" name="number" t:title="#" t:color="orange1">
+ <component t:x="19" t:y="9" name="if" t:title="if" t:color="magenta1">
+  <t: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"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component t:x="78" t:y="118" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>greater than 5</property>
- </component>
- <component t:x="76" t:y="162" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>not greater than 5</property>
- </component>
- <component t:x="88" t:y="25" name="number2" t:title="#" t:color="orange1">
+ <component name="number2" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3</property>
  </component>
- <service name="eval" promote="eval"/>
- <component t:x="235" t:y="46" name="eval" t:title="expr" t:color="magenta1">
-  <t:implementation.python script="nuvem/eval_.py"/>
-  <service name="eval"/>
-  <reference target="text3" name="py"/>
-  <reference name="ref"/>
+ <component name="number3" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>5</property>
  </component>
- <service name="eval2" promote="eval2"/>
- <component t:x="454" t:y="46" name="eval2" t:title="expr" t:color="magenta1">
-  <t:implementation.python script="nuvem/eval_.py"/>
-  <service name="eval"/>
-  <reference target="text4" name="py"/>
-  <reference target="number3" name="ref"/>
+ <component name="number4" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>5</property>
  </component>
- <component t:x="350" t:y="160" name="number3" t:title="#" t:color="orange1">
+ <component name="number5" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <service name="exec" promote="exec"/>
- <component t:x="234" t:y="233" name="exec" t:title="script" t:color="magenta1">
-  <t:implementation.python script="nuvem/exec_.py"/>
-  <service name="exec"/>
-  <reference target="get" name="py"/>
-  <reference target="number4" name="ref"/>
+ <component name="number6" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0.5</property>
  </component>
- <component t:x="357" t:y="289" name="number4" t:title="#" t:color="orange1">
+ <component name="number7" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>5</property>
+  <property>0.5</property>
  </component>
- <component t:x="358" t:y="267" name="get" t:title="get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="text5" name="url"/>
+ <component t:x="24" t:y="158" name="random" t:title="rand" t:color="magenta1">
+  <t:implementation.python script="nuvem/random_.py"/>
+  <service name="random"/>
  </component>
- <service name="exec2" promote="exec2"/>
- <component t:x="236" t:y="146" name="exec2" t:title="script" t:color="magenta1">
-  <t:implementation.python script="nuvem/exec_.py"/>
-  <service name="exec"/>
-  <reference target="text6" name="py"/>
-  <reference target="number5" name="ref"/>
+ <component t:x="21" t:y="198" name="sin" t:title="sin" t:color="magenta1">
+  <t:implementation.python script="nuvem/sin_.py"/>
+  <service name="sin"/>
+  <reference target="number6" name="x"/>
  </component>
- <component t:x="350" t:y="37" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>3.14116 * 5 * 5</property>
+  <property>greater than 5</property>
  </component>
- <component t:x="350" t:y="130" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>3.14116 * ref.get(r) * ref.get(r)</property>
+  <property>not greater than 5</property>
  </component>
- <component t:x="359" t:y="286" name="number5" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>5</property>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>3.14116 * 5 * 5</property>
  </component>
- <component t:x="357" t:y="245" name="text6" t:title=" '{propval}'" t:color="orange1">
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>val = 3.14116 * ref.get(r) * ref.get(r)</property>
+  <property>3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
- <component t:x="423" t:y="365" name="text5" t:title=" '{propval}'" t:color="orange1">
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://people.apache.org/~jsdelfino/tuscany/test/surface.py</property>
  </component>
- <service name="random" promote="random"/>
- <component t:x="43" t:y="208" name="random" t:title="rand" t:color="magenta1">
-  <t:implementation.python script="nuvem/random_.py"/>
-  <service name="random"/>
- </component>
- <service name="sin" promote="sin"/>
- <component t:x="44" t:y="258" name="sin" t:title="sin" t:color="magenta1">
-  <t:implementation.python script="nuvem/sin_.py"/>
-  <service name="sin"/>
-  <reference target="number6" name="x"/>
- </component>
- <component t:x="70" t:y="258" name="number6" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>0.5</property>
- </component>
- <service name="cos" promote="cos"/>
- <component t:x="40" t:y="316" name="cos" t:title="cos" t:color="magenta1">
-  <t:implementation.python script="nuvem/cos_.py"/>
-  <service name="cos"/>
-  <reference target="number7" name="x"/>
- </component>
- <component t:x="81" t:y="316" name="number7" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>0.5</property>
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>val = 3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html b/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
deleted file mode 100644
index c2dc3a21c2..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Test logic components</H2>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html
new file mode 100644
index 0000000000..c2dc3a21c2
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test 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 dc6a42753c..3846266b74 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
@@ -17,57 +17,29 @@
  * 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://testsearch" name="testsearch">
+<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="bingsearch" promote="bingsearch"/>
+ <service name="get" promote="get"/>
+ <service name="googlemap" promote="googlemap"/>
+ <service name="googlemap2" promote="googlemap2"/>
  <service name="googlesearch" promote="googlesearch"/>
- <component t:x="91" t:y="20" name="googlesearch" t:title="google" t:color="red1">
-  <t:implementation.python script="nuvem/gsearch.py"/>
-  <service name="googlesearch"/>
-  <reference target="text" name="query"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
-  </reference>
- </component>
  <service name="weather" promote="weather"/>
- <component t:x="92" t:y="70" name="weather" t:title="weather" t:color="red1">
-  <t:implementation.python script="nuvem/gweather.py"/>
-  <service name="weather"/>
-  <reference target="number" name="zip"/>
-  <reference name="ws" t:visible="false">
-   <t:binding.http uri="http://www.google.com/ig/api"/>
-  </reference>
- </component>
- <component t:x="141" t:y="95" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>94070</property>
- </component>
  <service name="weather2" promote="weather2"/>
- <component t:x="333" t:y="73" name="weather2" t:title="weather" t:color="red1">
-  <t:implementation.python script="nuvem/gweather.py"/>
-  <service name="weather"/>
-  <reference target="text2" name="zip"/>
-  <reference name="ws" t:visible="false">
-   <t:binding.http uri="http://www.google.com/ig/api"/>
+ <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"/>
+  <service name="bingsearch"/>
+  <reference target="text10" name="query"/>
+  <reference name="s" t:visible="false">
+   <t:binding.http uri="http://www.bing.com/search"/>
   </reference>
  </component>
- <component t:x="141" t:y="162" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>94070</property>
- </component>
- <service name="get" promote="get"/>
- <component t:x="43" t:y="348" name="get" t:title="get" t:color="green1">
+ <component t:x="20" t:y="300" name="get" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="141" t:y="234" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://maps.google.com/maps/api/staticmap?center=Brooklyn+Bridge,New+York,NY&amp;zoom=14&amp;size=512x512&amp;maptype=roadmap%20&amp;markers=color:blue|label:S|40.702147,-74.015794&amp;markers=color:green|label:G|40.711614,-74.012318%20&amp;markers=color:red|color:red|label:C|40.718217,-73.998284&amp;sensor=false</property>
- </component>
- <service name="googlemap" promote="googlemap"/>
- <component t:x="492" t:y="143" name="googlemap" t:title="google map" t:color="red1">
+ <component t:x="347" t:y="106" name="googlemap" t:title="google map" t:color="red1">
   <t:implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list2" name="locations"/>
@@ -75,8 +47,7 @@
    <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <service name="googlemap2" promote="googlemap2"/>
- <component t:x="90" t:y="144" name="googlemap2" t:title="google map" t:color="red1">
+ <component t:x="15" t:y="96" name="googlemap2" t:title="google map" t:color="red1">
   <t:implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list3" name="locations"/>
@@ -84,123 +55,152 @@
    <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component t:x="300" t:y="391" name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>-122.260526</property>
+ <component t:x="18" t:y="0" name="googlesearch" t:title="google" t:color="red1">
+  <t: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>
  </component>
- <component t:x="303" t:y="659" name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>green</property>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text4" name="item" t:clonable="true"/>
+  <reference target="number2" name="item" t:clonable="true"/>
+  <reference target="number3" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="300" t:y="335" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>green</property>
+ <component name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t: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"/>
  </component>
- <component t:x="300" t:y="363" name="number2" t:title="#" t:color="orange1">
+ <component name="number" t:title="#" t:color="orange1">
+  <t: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"/>
   <service name="number"/>
   <property>37.507156</property>
  </component>
- <component t:x="164" t:y="307" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="number3" t:title="#" t:color="orange1">
+  <t: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"/>
+  <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"/>
+  <service name="pair"/>
+  <reference target="text8" name="name"/>
+  <reference target="text6" name="value"/>
  </component>
- <component t:x="202" t:y="308" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="list" name="value"/>
   <property>A</property>
  </component>
- <component t:x="640" t:y="423" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text4" name="item" t:clonable="true"/>
-  <reference target="number2" name="item" t:clonable="true"/>
-  <reference target="number3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="208" t:y="532" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="pair4" name="value"/>
   <property>A</property>
  </component>
- <component t:x="512" t:y="485" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="text7" name="name"/>
-  <reference target="text5" name="value"/>
- </component>
- <component t:x="208" t:y="604" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="pair5" name="value"/>
   <property>B</property>
  </component>
- <component t:x="527" t:y="579" name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="text8" name="name"/>
-  <reference target="text6" name="value"/>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>apache tuscany</property>
  </component>
- <component t:x="315" t:y="212" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text10" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>yellow</property>
+  <property>apache tuscany</property>
  </component>
- <component t:x="315" t:y="240" name="text5" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>San Francisco, CA</property>
+  <property>94070</property>
  </component>
- <component t:x="315" t:y="312" name="text6" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>San Carlos, CA</property>
+  <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 t:x="161" t:y="212" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <service name="yahoosearch" promote="yahoosearch"/>
- <component t:x="333" t:y="22" name="yahoosearch" t:title="yahoo" t:color="red1">
-  <t:implementation.python script="nuvem/ysearch.py"/>
-  <service name="yahoosearch"/>
-  <reference target="text9" name="query"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
-  </reference>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>San Francisco, CA</property>
  </component>
- <component t:x="682" t:y="231" name="text9" t:title=" '{propval}'" t:color="orange1">
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>apache tuscany</property>
+  <property>San Carlos, CA</property>
  </component>
- <component t:x="173" t:y="31" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>apache tuscany</property>
+  <property>yellow</property>
+ </component>
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <component t:x="774" t:y="54" name="text10" t:title=" '{propval}'" t:color="orange1">
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>apache tuscany</property>
  </component>
- <service name="bingsearch" promote="bingsearch"/>
- <component t:x="569" t:y="22" name="bingsearch" t:title="bing" t:color="red1">
-  <t:implementation.python script="nuvem/bsearch.py"/>
-  <service name="bingsearch"/>
-  <reference target="text10" name="query"/>
+ <component t:x="18" t:y="49" name="weather" t:title="weather" t:color="red1">
+  <t: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>
+ </component>
+ <component t:x="190" t:y="51" name="weather2" t:title="weather" t:color="red1">
+  <t: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>
+ </component>
+ <component t:x="204" t:y="5" name="yahoosearch" t:title="yahoo" t:color="red1">
+  <t:implementation.python script="nuvem/ysearch.py"/>
+  <service name="yahoosearch"/>
+  <reference target="text9" name="query"/>
   <reference name="s" t:visible="false">
-   <t:binding.http uri="http://www.bing.com/search"/>
+   <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
   </reference>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.html b/sca-cpp/trunk/modules/edit/apps/testsearch/app.html
deleted file mode 100644
index 3760a04794..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
-  <H1>Test search components</H1>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html
new file mode 100644
index 0000000000..3760a04794
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test search components</H1>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
index 26642deccb..ad7c983098 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
@@ -17,60 +17,10 @@
  * 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://testsocial" name="testsocial">
- <component t:x="485" t:y="164" name="twtimeline" t:title="twitter timeline" t:color="blue1">
-  <t:implementation.python script="nuvem/twtimeline.py"/>
-  <service name="twtimeline"/>
-  <reference target="text2" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
-  </reference>
- </component>
- <component t:x="477" t:y="201" name="twfriends" t:title="twitter friends" t:color="blue1">
-  <t:implementation.python script="nuvem/twfriends.py"/>
-  <service name="twfriends"/>
-  <reference target="text4" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
-  </reference>
- </component>
- <component t:x="488" t:y="254" name="twfollowers" t:title="twitter followers" t:color="blue1">
-  <t:implementation.python script="nuvem/twfollowers.py"/>
-  <service name="twfollowers"/>
-  <reference target="text5" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
-  </reference>
- </component>
- <component t:x="589" t:y="71" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>100001053301307</property>
- </component>
- <component t:x="252" t:y="308" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component t:x="745" t:y="149" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component t:x="493" t:y="132" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component t:x="334" t:y="462" name="twprofile" t:title="twitter profile" t:color="blue1">
-  <t:implementation.python script="nuvem/twprofile.py"/>
-  <service name="twprofile"/>
-  <reference target="text3" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
-  </reference>
- </component>
- <component t:x="626" t:y="77" name="fbprofile" t:title="facebook profile" t:color="blue1">
+<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="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"/>
   <service name="fbprofile"/>
   <reference target="text" name="id"/>
@@ -78,102 +28,152 @@
    <t:binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component t:x="662" t:y="220" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
+ <component name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text7" name="pattern"/>
+  <reference target="list" name="values"/>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="204" t:y="35" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="list3" name="content"/>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="now" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="393" t:y="35" name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="fbprofile" name="value"/>
-  <property>name</property>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t: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 t:x="393" t:y="79" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="now" t:title="now" t:color="orange1">
+  <t: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"/>
   <reference target="twprofile" name="value"/>
   <property>twitprofile</property>
  </component>
- <component t:x="393" t:y="123" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="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"/>
   <reference target="twtimeline" name="value"/>
   <property>twittimeline</property>
  </component>
- <component t:x="393" t:y="167" name="property4" t:title="{propval} :" t:color="orange1">
+ <component name="property4" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="twfriends" name="value"/>
   <property>twitfriends</property>
  </component>
- <component t:x="393" t:y="211" name="property5" t:title="{propval} :" t:color="orange1">
+ <component name="property5" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="twfollowers" name="value"/>
   <property>twitfollowers</property>
  </component>
- <component t:x="318" t:y="35" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="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 t:x="34" t:y="286" name="sendgtalk" t:title="gtalk" t:color="blue1">
+  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+  <service name="sendgtalk"/>
+  <reference target="text8" name="jid"/>
+  <reference target="text9" name="pass"/>
+  <reference target="text6" name="to"/>
+  <reference target="format" name="msg"/>
+ </component>
+ <component t:x="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"/>
+  </service>
+  <reference target="list3" name="content"/>
  </component>
- <component t:x="460" t:y="358" name="text6" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>xmppsca.2@gmail.com</property>
+  <property>100001053301307</property>
  </component>
- <component t:x="582" t:y="431" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>Hello, the time is {0}</property>
+  <property>jsdelfino</property>
  </component>
- <component t:x="623" t:y="452" name="now" t:title="now" t:color="orange1">
-  <t:implementation.python script="nuvem/now.py"/>
-  <service name="now"/>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
  </component>
- <component t:x="575" t:y="447" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="now" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
  </component>
- <component t:x="461" t:y="380" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text7" name="pattern"/>
-  <reference target="list" name="values"/>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
  </component>
- <service name="sendgtalk" promote="sendgtalk"/>
- <component t:x="410" t:y="318" name="sendgtalk" t:title="gtalk" t:color="blue1">
-  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
-  <service name="sendgtalk"/>
-  <reference target="text8" name="jid"/>
-  <reference target="text9" name="pass"/>
-  <reference target="text6" name="to"/>
-  <reference target="format" name="msg"/>
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.2@gmail.com</property>
+ </component>
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Hello, the time is {0}</property>
  </component>
- <component t:x="460" t:y="318" name="text8" t:title=" '{propval}'" t:color="orange1">
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmppsca.1@gmail.com</property>
  </component>
- <component t:x="460" t:y="346" name="text9" t:title=" '{propval}'" t:color="orange1">
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
   <t: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"/>
+  <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>
+ </component>
+ <component name="twfriends" t:title="twitter friends" t:color="blue1">
+  <t: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>
+ </component>
+ <component name="twprofile" t:title="twitter profile" t:color="blue1">
+  <t: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>
+ </component>
+ <component name="twtimeline" t:title="twitter timeline" t:color="blue1">
+  <t: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>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html b/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
deleted file mode 100644
index 9630d36d0f..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
-  <H1>Test social components</H1>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html
new file mode 100644
index 0000000000..9630d36d0f
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test 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 56cde3999c..22436f5019 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
@@ -17,200 +17,200 @@
  * 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://testtext" name="testtext">
+<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="contains" promote="contains"/>
- <component t:x="34" t:y="33" name="contains" t:title="contains" t:color="magenta1">
+ <service name="format" promote="format"/>
+ <service name="format2" promote="format2"/>
+ <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 t:x="19" t:y="7" name="contains" t:title="contains" t:color="magenta1">
   <t:implementation.python script="nuvem/contains.py"/>
   <service name="contains"/>
   <reference target="text10" name="search"/>
   <reference target="text9" name="string"/>
  </component>
- <service name="split" promote="split"/>
- <component t:x="34" t:y="140" name="split" t:title="split" t:color="magenta1">
-  <t:implementation.python script="nuvem/split.py"/>
-  <service name="split"/>
-  <reference target="text11" name="separator"/>
-  <reference target="text12" name="string"/>
+ <component t:x="176" t:y="115" name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text13" name="pattern"/>
+  <reference target="list" name="values"/>
  </component>
- <service name="join" promote="join"/>
- <component t:x="420" t:y="25" name="join" t:title="join" t:color="magenta1">
+ <component t:x="369" t:y="141" name="format2" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text14" name="pattern"/>
+  <reference target="list3" name="values"/>
+ </component>
+ <component t:x="361" t:y="8" name="join" t:title="join" t:color="magenta1">
   <t:implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text6" name="separator"/>
   <reference target="list2" name="list"/>
  </component>
- <service name="replace" promote="replace"/>
- <component t:x="204" t:y="27" name="replace" t:title="replace" t:color="magenta1">
+ <component name="list" t:title="list" t:color="yellow1">
+  <t: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"/>
+ </component>
+ <component name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text7" name="item" t:clonable="true"/>
+  <reference target="text8" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference name="item" t: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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
   <service name="replace"/>
   <reference target="text4" name="from"/>
   <reference target="text5" name="to"/>
   <reference target="text3" name="string"/>
  </component>
- <service name="lowercase" promote="lowercase"/>
- <component t:x="34" t:y="297" name="lowercase" t:title="lower" t:color="magenta1">
-  <t:implementation.python script="nuvem/lowercase.py"/>
-  <service name="lowercase"/>
-  <reference target="text2" name="string"/>
- </component>
- <service name="uppercase" promote="uppercase"/>
- <component t:x="35" t:y="236" name="uppercase" t:title="upper" t:color="magenta1">
-  <t:implementation.python script="nuvem/uppercase.py"/>
-  <service name="uppercase"/>
-  <reference target="text" name="string"/>
+ <component t:x="23" t:y="89" name="split" t:title="split" t:color="magenta1">
+  <t:implementation.python script="nuvem/split.py"/>
+  <service name="split"/>
+  <reference target="text11" name="separator"/>
+  <reference target="text12" name="string"/>
  </component>
- <component t:x="391" t:y="223" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component t:x="391" t:y="150" name="text2" t:title=" '{propval}'" t:color="orange1">
+ <component name="text10" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>ABC</property>
+  <property>cd</property>
  </component>
- <component t:x="376" t:y="81" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text11" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abcxdefxghi</property>
+  <property>x</property>
  </component>
- <component t:x="377" t:y="20" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component name="text12" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>x</property>
+  <property>abcxdefxghi</property>
  </component>
- <component t:x="376" t:y="63" name="text5" t:title=" '{propval}'" t:color="orange1">
+ <component name="text13" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>y</property>
+  <property>The {0} brown {1}</property>
  </component>
- <component t:x="107" t:y="56" name="text9" t:title=" '{propval}'" t:color="orange1">
+ <component name="text14" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abcdef</property>
+  <property>The {a} brown {b}</property>
  </component>
- <component t:x="107" t:y="14" name="text10" t:title=" '{propval}'" t:color="orange1">
+ <component name="text15" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>cd</property>
+  <property>quick</property>
  </component>
- <component t:x="587" t:y="20" name="text6" t:title=" '{propval}'" t:color="orange1">
+ <component name="text16" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>x</property>
+  <property>fox</property>
  </component>
- <component t:x="85" t:y="156" name="text11" t:title=" '{propval}'" t:color="orange1">
+ <component name="text17" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>x</property>
+  <property>quick</property>
  </component>
- <component t:x="89" t:y="193" name="text12" t:title=" '{propval}'" t:color="orange1">
+ <component name="text18" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abcxdefxghi</property>
- </component>
- <component t:x="583" t:y="60" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text7" name="item" t:clonable="true"/>
-  <reference target="text8" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <property>fox</property>
  </component>
- <component t:x="662" t:y="61" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text19" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abc</property>
+  <property>city (.*) state (.*)</property>
  </component>
- <component t:x="655" t:y="98" name="text8" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>def</property>
- </component>
- <service name="format" promote="format"/>
- <component t:x="220" t:y="170" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text13" name="pattern"/>
-  <reference target="list" name="values"/>
- </component>
- <service name="format2" promote="format2"/>
- <component t:x="444" t:y="164" name="format2" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text14" name="pattern"/>
-  <reference target="list3" name="values"/>
+  <property>ABC</property>
  </component>
- <component t:x="365" t:y="194" name="text13" t:title=" '{propval}'" t:color="orange1">
+ <component name="text20" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>The {0} brown {1}</property>
- </component>
- <component t:x="369" t:y="238" name="list" t:title="list" t:color="yellow1">
-  <t: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"/>
+  <property>city San Francisco state CA</property>
  </component>
- <component t:x="444" t:y="236" name="text15" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>quick</property>
+  <property>abcxdefxghi</property>
  </component>
- <component t:x="438" t:y="274" name="text16" t:title=" '{propval}'" t:color="orange1">
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>fox</property>
+  <property>x</property>
  </component>
- <component t:x="599" t:y="198" name="text14" t:title=" '{propval}'" t:color="orange1">
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>The {a} brown {b}</property>
- </component>
- <component t:x="603" t:y="239" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="parse" promote="parse"/>
- <component t:x="218" t:y="325" name="parse" t:title="parse" t:color="magenta1">
-  <t:implementation.python script="nuvem/parse.py"/>
-  <service name="parse"/>
-  <reference target="text19" name="regexp"/>
-  <reference target="text20" name="string"/>
+  <property>y</property>
  </component>
- <component t:x="89" t:y="428" name="text20" t:title=" '{propval}'" t:color="orange1">
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>city San Francisco state CA</property>
+  <property>x</property>
  </component>
- <component t:x="89" t:y="388" name="text19" t:title=" '{propval}'" t:color="orange1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>city (.*) state (.*)</property>
- </component>
- <component t:x="589" t:y="215" name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text17" name="value"/>
-  <property>a</property>
+  <property>abc</property>
  </component>
- <component t:x="840" t:y="241" name="text17" t:title=" '{propval}'" t:color="orange1">
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>quick</property>
- </component>
- <component t:x="586" t:y="254" name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text18" name="value"/>
-  <property>b</property>
+  <property>def</property>
  </component>
- <component t:x="837" t:y="299" name="text18" t:title=" '{propval}'" t:color="orange1">
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>fox</property>
+  <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"/>
+  <service name="uppercase"/>
+  <reference target="text" name="string"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.html b/sca-cpp/trunk/modules/edit/apps/testtext/app.html
deleted file mode 100644
index 99f719ef40..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testtext/app.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Test text processing components</H2>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html
new file mode 100644
index 0000000000..99f719ef40
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test 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 6cda648ac1..2bb49a9e81 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
@@ -17,56 +17,25 @@
  * 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://testurl" name="testurl">
+<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="email" promote="email"/>
  <service name="host" promote="host"/>
- <component t:x="40" t:y="30" name="host" t:title="host" t:color="green1">
-  <t:implementation.python script="nuvem/host.py"/>
-  <service name="host"/>
-  <property name="host"/>
- </component>
- <service name="path" promote="path"/>
- <component t:x="39" t:y="81" name="path" t:title="path" t:color="green1">
-  <t:implementation.python script="nuvem/path.py"/>
-  <service name="path"/>
-  <property name="path"/>
- </component>
  <service name="params" promote="params"/>
- <component t:x="41" t:y="133" name="params" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
-  <service name="params"/>
-  <property name="params"/>
- </component>
- <service name="user" promote="user"/>
- <component t:x="37" t:y="198" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user"/>
- </component>
+ <service name="path" promote="path"/>
  <service name="realm" promote="realm"/>
- <component t:x="35" t:y="254" name="realm" t:title="realm" t:color="green1">
-  <t:implementation.python script="nuvem/realm.py"/>
-  <service name="realm"/>
-  <property name="realm"/>
- </component>
- <service name="email" promote="email"/>
- <component t:x="35" t:y="316" name="email" t:title="email" t:color="green1">
+ <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"/>
   <service name="email"/>
   <property name="email"/>
  </component>
- <service name="url" promote="url"/>
- <component t:x="162" t:y="36" name="url" t:title="url" t:color="green1">
-  <t:implementation.python script="nuvem/url.py"/>
-  <service name="url"/>
-  <reference target="text" name="address"/>
-  <reference target="list" name="args"/>
- </component>
- <component t:x="240" t:y="27" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://sca-store.com/</property>
+ <component t:x="14" t:y="1" name="host" t:title="host" t:color="green1">
+  <t:implementation.python script="nuvem/host.py"/>
+  <service name="host"/>
+  <property name="host"/>
  </component>
- <component t:x="242" t:y="58" name="list" t:title="list" t:color="yellow1">
+ <component name="list" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="text2" name="item" t:clonable="true"/>
@@ -76,47 +45,78 @@
   <reference target="property3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="280" t:y="61" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test</property>
+ <component name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>123</property>
  </component>
- <component t:x="282" t:y="90" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>path</property>
+ <component t:x="16" t:y="91" name="params" t:title="?params" t:color="green1">
+  <t:implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="params"/>
  </component>
- <component t:x="277" t:y="108" name="property" t:title="{propval} :" t:color="orange1">
+ <component t:x="17" t:y="48" name="path" t:title="path" t:color="green1">
+  <t: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 t:x="276" t:y="169" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text5" name="value"/>
   <property>parmy</property>
  </component>
- <component t:x="271" t:y="224" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number" name="value"/>
   <property>parmn</property>
  </component>
- <component t:x="385" t:y="228" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>123</property>
+ <component t:x="14" t:y="177" name="realm" t:title="realm" t:color="green1">
+  <t:implementation.python script="nuvem/realm.py"/>
+  <service name="realm"/>
+  <property name="realm"/>
  </component>
- <component t:x="386" t:y="169" name="text5" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>yy</property>
+  <property>http://sca-store.com/</property>
  </component>
- <component t:x="386" t:y="110" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t: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"/>
+  <service name="text"/>
+  <property>path</property>
+ </component>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t: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"/>
+  <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"/>
+  <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"/>
+  <service name="user"/>
+  <property name="user"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/app.html
deleted file mode 100644
index 9641f58ba5..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Test url components</H2>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
new file mode 100644
index 0000000000..9641f58ba5
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test 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 8de688216a..6793aceef1 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
@@ -17,436 +17,436 @@
  * 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://testvalues" name="testvalues">
+<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="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"/>
- <component t:x="36" t:y="152" name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>abc</property>
- </component>
+ <service name="nothing" promote="nothing"/>
+ <service name="reduce2" promote="reduce2"/>
+ <service name="rest" promote="rest"/>
+ <service name="search" promote="search"/>
+ <service name="shuffle" promote="shuffle"/>
+ <service name="start" promote="start"/>
  <service name="true" promote="true"/>
- <component t:x="34" t:y="204" name="true" t:title="true" t:color="orange1">
-  <t:implementation.python script="nuvem/true_.py"/>
-  <service name="true"/>
+ <component name="add" t:title="+" t:color="magenta1">
+  <t:implementation.python script="nuvem/add.py"/>
+  <service name="add">
+   <documentation>+</documentation>
+  </service>
+  <reference target="valueof2" name="value1"/>
+  <reference target="valueof3" name="value2"/>
  </component>
- <service name="false" promote="false"/>
- <component t:x="35" t:y="254" name="false" t:title="false" t:color="orange1">
+ <component t:x="17" t:y="269" name="empty" t:title="empty" t:color="yellow1">
+  <t: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"/>
   <service name="false"/>
  </component>
- <service name="lookup" promote="lookup"/>
- <component t:x="128" t:y="399" name="lookup" t:title="lookup" t:color="yellow1">
+ <component t:x="121" t:y="26" name="first" t:title="first" t:color="yellow1">
+  <t: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"/>
+  <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"/>
+  <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"/>
+  <service name="list"/>
+  <reference target="number" name="item" t:clonable="true"/>
+  <reference target="number7" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list10" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property13" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list4" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="property6" 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"/>
+  <service name="list"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list6" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list7" t:title="list" t:color="yellow1">
+  <t: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"/>
+ </component>
+ <component t:x="430" t:y="269" name="list8" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property11" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="407" t:y="354" name="list9" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property12" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="32" t:y="375" name="lookup" t:title="lookup" t:color="yellow1">
   <t:implementation.python script="nuvem/lookup.py"/>
   <service name="lookup"/>
   <reference target="name3" name="name"/>
   <reference target="list2" name="list"/>
  </component>
- <component t:x="283" t:y="351" name="name3" t:title="" t:color="orange1">
+ <component name="multiply" t:title="*" t:color="magenta1">
+  <t: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"/>
+  <service name="name"/>
+  <property>abc</property>
+ </component>
+ <component name="name2" t:title="" t:color="orange1">
+  <t: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"/>
   <service name="name"/>
   <property>d</property>
  </component>
- <component t:x="433" t:y="37" name="range" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
-  <service name="range"/>
-  <reference target="number4" name="first"/>
-  <reference target="number5" name="last"/>
+ <component name="name6" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>sum</property>
  </component>
- <component t:x="378" t:y="48" name="number4" t:title="#" t:color="orange1">
+ <component name="name7" t:title="" t:color="orange1">
+  <t: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"/>
+  <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"/>
+  <service name="nothing"/>
+ </component>
+ <component name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>0</property>
+  <property>12</property>
  </component>
- <component t:x="378" t:y="90" name="number5" t:title="#" t:color="orange1">
+ <component name="number10" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <service name="first" promote="first"/>
- <component t:x="179" t:y="34" name="first" t:title="first" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="list7" name="list"/>
- </component>
- <service name="rest" promote="rest"/>
- <component t:x="362" t:y="35" name="rest" t:title="rest" t:color="yellow1">
-  <t:implementation.python script="nuvem/rest.py"/>
-  <service name="rest"/>
-  <reference target="list" name="list"/>
- </component>
- <service name="empty" promote="empty"/>
- <component t:x="29" t:y="362" name="empty" t:title="empty" t:color="yellow1">
-  <t:implementation.python script="nuvem/empty.py"/>
-  <service name="empty"/>
- </component>
- <service name="itemnb" promote="itemnb"/>
- <component t:x="123" t:y="147" name="itemnb" t:title="item #" t:color="yellow1">
-  <t:implementation.python script="nuvem/itemnb.py"/>
-  <service name="itemnb"/>
-  <reference target="number8" name="index"/>
-  <reference target="foreach" name="list"/>
- </component>
- <component t:x="208" t:y="187" name="number8" t:title="#" t:color="orange1">
+ <component name="number11" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>3</property>
- </component>
- <component t:x="225" t:y="293" name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>nb</property>
+  <property>123</property>
  </component>
- <component t:x="498" t:y="437" name="number9" t:title="#" t:color="orange1">
+ <component name="number12" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component t:x="547" t:y="403" name="number10" t:title="#" t:color="orange1">
+ <component name="number13" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <component t:x="226" t:y="373" name="number6" t:title="#" t:color="orange1">
+ <component name="number14" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>2</property>
- </component>
- <component t:x="533" t:y="265" name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>sum</property>
- </component>
- <component t:x="533" t:y="307" name="valueof3" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>i</property>
- </component>
- <component t:x="253" t:y="266" name="multiply" t:title="*" t:color="magenta1">
-  <t: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="280" t:y="264" name="valueof" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>nb</property>
- </component>
- <component t:x="167" t:y="13" name="list7" t:title="list" t:color="yellow1">
-  <t: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"/>
+  <property>0</property>
  </component>
- <component t:x="241" t:y="11" name="number2" t:title="#" t:color="orange1">
+ <component name="number2" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>123</property>
  </component>
- <component t:x="241" t:y="48" name="number3" t:title="#" t:color="orange1">
+ <component name="number3" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>456</property>
  </component>
- <service name="nothing" promote="nothing"/>
- <component t:x="33" t:y="304" name="nothing" t:title="nothing" t:color="orange1">
-  <t:implementation.python script="nuvem/nothing.py"/>
-  <service name="nothing"/>
+ <component name="number4" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
  </component>
- <component t:x="558" t:y="6" name="number" t:title="#" t:color="orange1">
+ <component name="number5" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>12</property>
+  <property>10</property>
  </component>
- <component t:x="559" t:y="46" name="number7" t:title="#" t:color="orange1">
+ <component name="number6" t:title="#" t:color="orange1">
+  <t: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"/>
   <service name="number"/>
   <property>34</property>
  </component>
- <component t:x="252" t:y="352" name="reverse" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="range" name="list"/>
+ <component name="number8" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3</property>
  </component>
- <component t:x="189" t:y="224" name="foreach" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name2" name="item"/>
-  <reference target="multiply" name="transform"/>
-  <reference target="reverse" name="list"/>
+ <component name="number9" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
  </component>
- <component t:x="834" t:y="61" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property10" name="item" t:clonable="true"/>
-  <reference target="property9" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text3" name="value"/>
+  <property>a</property>
  </component>
- <component t:x="833" t:y="32" name="name8" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>a.b</property>
+ <component name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="list6" name="value"/>
+  <property>a</property>
  </component>
- <service name="search" promote="search"/>
- <component t:x="734" t:y="33" name="search" t:title="search" t:color="yellow1">
-  <t:implementation.python script="nuvem/search.py"/>
-  <service name="search"/>
-  <reference target="name8" name="path"/>
-  <reference target="list3" name="list"/>
+ <component name="property11" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text7" name="value"/>
+  <property>entry</property>
  </component>
- <component t:x="264" t:y="429" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="property12" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="text3" name="value"/>
-  <property>a</property>
+  <reference target="list10" name="value"/>
+  <property>entry</property>
  </component>
- <component t:x="470" t:y="441" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>abc</property>
+ <component name="property13" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text9" name="value"/>
+  <property>test</property>
  </component>
- <component t:x="267" t:y="460" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text4" name="value"/>
   <property>d</property>
  </component>
- <component t:x="480" t:y="517" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>def</property>
- </component>
- <component t:x="935" t:y="92" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text5" name="value"/>
   <property>ccc</property>
  </component>
- <component t:x="1255" t:y="126" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>ccc</property>
- </component>
- <component t:x="938" t:y="127" name="property4" t:title="{propval} :" t:color="orange1">
+ <component name="property4" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text2" name="value"/>
   <property>b</property>
  </component>
- <component t:x="1229" t:y="179" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>bbb</property>
- </component>
- <component t:x="1037" t:y="559" name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>CCC</property>
- </component>
- <component t:x="1177" t:y="476" name="number11" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>123</property>
- </component>
- <component t:x="1230" t:y="253" name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>BBB</property>
- </component>
- <component t:x="1018" t:y="256" name="property7" t:title="{propval} :" t:color="orange1">
+ <component name="property5" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="text6" name="value"/>
-  <property>b</property>
+  <reference target="text8" name="value"/>
+  <property>c</property>
  </component>
- <component t:x="1020" t:y="286" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property6" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number11" name="value"/>
   <property>c</property>
  </component>
- <component t:x="941" t:y="334" name="property5" t:title="{propval} :" t:color="orange1">
+ <component name="property7" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="text8" name="value"/>
-  <property>c</property>
+  <reference target="text6" name="value"/>
+  <property>b</property>
  </component>
- <component t:x="941" t:y="227" name="property8" t:title="{propval} :" t:color="orange1">
+ <component name="property8" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="list4" name="value"/>
   <property>a</property>
  </component>
- <component t:x="1166" t:y="182" name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference target="property6" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="844" t:y="516" name="list5" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property8" name="item" t:clonable="true"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="972" t:y="531" name="list6" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="860" t:y="171" name="property9" t:title="{propval} :" t:color="orange1">
+ <component name="property9" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="list5" name="value"/>
   <property>x</property>
  </component>
- <component t:x="542" t:y="28" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="number" name="item" t:clonable="true"/>
-  <reference target="number7" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="list8" promote="list8"/>
- <component t:x="550" t:y="351" name="list8" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property11" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="627" t:y="410" name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>hello</property>
+ <component name="range" t:title="range" t:color="yellow1">
+  <t:implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference target="number4" name="first"/>
+  <reference target="number5" name="last"/>
  </component>
- <component t:x="529" t:y="410" name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text7" name="value"/>
-  <property>entry</property>
+ <component name="range2" t:title="range" t:color="yellow1">
+  <t:implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference target="number9" name="first"/>
+  <reference target="number10" name="last"/>
  </component>
- <service name="list9" promote="list9"/>
- <component t:x="408" t:y="458" name="list9" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property12" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="range3" t:title="range" t:color="yellow1">
+  <t:implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference target="number12" name="first"/>
+  <reference target="number13" name="last"/>
  </component>
- <component t:x="876" t:y="414" name="list10" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property13" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="437" t:y="24" name="reduce2" t:title="reduce" t:color="yellow1">
+  <t:implementation.python script="nuvem/reduce_.py"/>
+  <service name="reduce"/>
+  <reference target="name6" name="item"/>
+  <reference target="name7" name="accum"/>
+  <reference target="add" name="transform"/>
+  <reference target="number14" name="init"/>
+  <reference target="range2" name="list"/>
  </component>
- <component t:x="1013" t:y="414" name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>abc</property>
+ <component t:x="290" t:y="18" name="rest" t:title="rest" t:color="yellow1">
+  <t:implementation.python script="nuvem/rest.py"/>
+  <service name="rest"/>
+  <reference target="list" name="list"/>
  </component>
- <component t:x="776" t:y="416" name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="list10" name="value"/>
-  <property>entry</property>
+ <component name="reverse" t:title="reverse" t:color="yellow1">
+  <t:implementation.python script="nuvem/reverse.py"/>
+  <service name="reverse"/>
+  <reference target="range" name="list"/>
  </component>
- <component t:x="911" t:y="416" name="property13" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text9" name="value"/>
-  <property>test</property>
+ <component t:x="628" t:y="20" name="search" t:title="search" t:color="yellow1">
+  <t:implementation.python script="nuvem/search.py"/>
+  <service name="search"/>
+  <reference target="name8" name="path"/>
+  <reference target="list3" name="list"/>
  </component>
- <service name="shuffle" promote="shuffle"/>
- <component t:x="350" t:y="373" name="shuffle" t:title="shuffle" t:color="yellow1">
+ <component t:x="223" t:y="368" name="shuffle" t:title="shuffle" t:color="yellow1">
   <t:implementation.python script="nuvem/shuffle_.py"/>
   <service name="shuffle"/>
   <reference target="range3" name="list"/>
  </component>
- <component t:x="565" t:y="389" name="number12" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>0</property>
+ <component 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"/>
+  </service>
+  <reference target="text" name="content"/>
  </component>
- <component t:x="560" t:y="417" name="number13" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>10</property>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xyz</property>
  </component>
- <component t:x="508" t:y="389" name="range3" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
-  <service name="range"/>
-  <reference target="number12" name="first"/>
-  <reference target="number13" name="last"/>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>bbb</property>
  </component>
- <component t:x="150" t:y="18" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>xyz</property>
+  <property>abc</property>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="42" t:y="35" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="text" name="content"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>def</property>
  </component>
- <component t:x="207" t:y="427" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>ccc</property>
  </component>
- <service name="reduce2" promote="reduce2"/>
- <component t:x="525" t:y="84" name="reduce2" t:title="reduce" t:color="yellow1">
-  <t:implementation.python script="nuvem/reduce_.py"/>
-  <service name="reduce"/>
-  <reference target="name6" name="item"/>
-  <reference target="name7" name="accum"/>
-  <reference target="add" name="transform"/>
-  <reference target="number14" name="init"/>
-  <reference target="range2" name="list"/>
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>BBB</property>
  </component>
- <component t:x="571" t:y="500" name="name7" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>i</property>
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>hello</property>
  </component>
- <component t:x="567" t:y="526" name="add" t:title="+" t:color="magenta1">
-  <t:implementation.python script="nuvem/add.py"/>
-  <service name="add">
-   <documentation>+</documentation>
-  </service>
-  <reference target="valueof2" name="value1"/>
-  <reference target="valueof3" name="value2"/>
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>CCC</property>
  </component>
- <component t:x="555" t:y="287" name="range2" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
-  <service name="range"/>
-  <reference target="number9" name="first"/>
-  <reference target="number10" name="last"/>
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>abc</property>
  </component>
- <component t:x="556" t:y="265" name="number14" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>0</property>
+ <component t:x="23" t:y="120" name="true" t:title="true" t:color="orange1">
+  <t:implementation.python script="nuvem/true_.py"/>
+  <service name="true"/>
  </component>
- <component t:x="552" t:y="146" name="name6" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
+ <component name="valueof" t:title="valueof" t:color="orange1">
+  <t: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"/>
+  <service name="valueof"/>
   <property>sum</property>
  </component>
- <component t:x="816" t:y="61" name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="list6" name="value"/>
-  <property>a</property>
+ <component name="valueof3" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>i</property>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html b/sca-cpp/trunk/modules/edit/apps/testvalues/app.html
deleted file mode 100644
index 9ac6e55434..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="value" class="text" style="position: absolute; top: 63px; left: 2px; ">
-  <SPAN>text</SPAN>
- </SPAN>
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
-  <H2>Test values and lists</H2>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html
new file mode 100644
index 0000000000..97889b7a9d
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test values and lists</H2>
+ </SPAN>
+ <SPAN id="value" class="text" style="position: absolute; top: 36px; left: 29px; ">
+  <SPAN>text</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 27e93dc15f..6b08e18f3b 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
@@ -17,132 +17,132 @@
  * 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://testwidgets" name="testwidgets">
- <component t:x="708" t:y="619" name="property" t:title="{propval} :" t:color="orange1">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="start" promote="start"/>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference 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="text9" name="value"/>
   <property>testpath2</property>
  </component>
- <component t:x="905" t:y="615" name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test path</property>
+ <component name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text" name="value"/>
+  <property>testh1</property>
  </component>
- <component t:x="413" t:y="315" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="property" name="value"/>
   <property>testpath1</property>
  </component>
- <component t:x="411" t:y="281" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text6" name="value"/>
   <property>testimg</property>
  </component>
- <component t:x="927" t:y="304" name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property>
- </component>
- <component t:x="410" t:y="247" name="property4" t:title="{propval} :" t:color="orange1">
+ <component name="property4" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text8" name="value"/>
   <property>testtext</property>
  </component>
- <component t:x="790" t:y="441" name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test text</property>
- </component>
- <component t:x="411" t:y="210" name="property5" t:title="{propval} :" t:color="orange1">
+ <component name="property5" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text4" name="value"/>
   <property>testlink</property>
  </component>
- <component t:x="842" t:y="340" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://tuscany.apache.org</property>
- </component>
- <component t:x="413" t:y="177" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property6" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text5" name="value"/>
   <property>testcheckbox</property>
  </component>
- <component t:x="790" t:y="336" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test checkbox</property>
- </component>
- <component t:x="411" t:y="136" name="property7" t:title="{propval} :" t:color="orange1">
+ <component name="property7" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text3" name="value"/>
   <property>testentry</property>
  </component>
- <component t:x="588" t:y="314" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test entry field</property>
- </component>
- <component t:x="401" t:y="102" name="property8" t:title="{propval} :" t:color="orange1">
+ <component name="property8" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text2" name="value"/>
   <property>testbutton</property>
  </component>
- <component t:x="775" t:y="212" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test button</property>
- </component>
- <component t:x="411" t:y="66" name="property9" t:title="{propval} :" t:color="orange1">
+ <component name="property9" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text7" name="value"/>
   <property>testsection</property>
  </component>
- <component t:x="780" t:y="147" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <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"/>
+  </service>
+  <reference target="list" name="content"/>
+ </component>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>test section</property>
+  <property>test header 1</property>
  </component>
- <component t:x="406" t:y="28" name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text" name="value"/>
-  <property>testh1</property>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test button</property>
  </component>
- <component t:x="748" t:y="92" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>test header 1</property>
+  <property>test entry field</property>
  </component>
- <component t:x="308" t:y="37" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="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 name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://tuscany.apache.org</property>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="208" t:y="18" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="list" name="content"/>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t: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"/>
+  <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"/>
+  <service name="text"/>
+  <property>test section</property>
+ </component>
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t: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"/>
+  <service name="text"/>
+  <property>test path</property>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html
deleted file mode 100644
index ce561f3a98..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="testbutton" class="button" style="position: absolute; top: 97px; left: 9px; ">
-  <INPUT type="button" value="button"/>
- </SPAN>
- <SPAN id="testsection" class="section" style="position: absolute; top: 52px; left: 10px; ">
-  <SPAN>section</SPAN>
- </SPAN>
- <SPAN id="testtext" class="text" style="position: absolute; top: 252px; left: 17px; ">
-  <SPAN>text</SPAN>
- </SPAN>
- <SPAN id="testcheckbox" class="checkbox" style="position: absolute; top: 183px; left: 11px; ">
-  <INPUT type="checkbox" value="checkbox"/>
-  <SPAN>checkbox</SPAN>
- </SPAN>
- <SPAN id="testlink" class="link" style="position: absolute; top: 217px; left: 17px; ">
-  <A href="link">
-   <SPAN>link</SPAN>
-  </A>
- </SPAN>
- <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 282px; left: 17px; ">
-  <SPAN>text</SPAN>
- </SPAN>
- <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; ">
-  <H1>Header1</H1>
- </SPAN>
- <SPAN id="testlink3" class="link" style="position: absolute; top: 225px; left: 263px; ">
-  <A href="http://www.apache.org">
-   <SPAN> Apache</SPAN>
-  </A>
- </SPAN>
- <SPAN id="testlink2" class="link" style="position: absolute; top: 189px; left: 263px; ">
-  <A href="http://www.apache.org/">
-   <SPAN>http://www.apache.org/</SPAN>
-  </A>
- </SPAN>
- <SPAN id="testimg" class="img" style="position: absolute; top: 90px; left: 263px; ">
-  <IMG src="/public/img.png"/>
- </SPAN>
- <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; ">
-  <INPUT type="text" value="field" size="20" autocapitalize="off"/>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html
new file mode 100644
index 0000000000..ff255ee45d
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html
@@ -0,0 +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.    
+-->
+<DIV id="page">
+ <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; ">
+  <H1>Header1</H1>
+ </SPAN>
+ <SPAN id="testsection" class="section" style="position: absolute; top: 45px; width: 100%; left: 11px; ">
+  <SPAN>section</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"/>
+ </SPAN>
+ <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; ">
+  <INPUT type="text" value="field" 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>
+ </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>
+ </SPAN>
+ <SPAN id="testlink" class="link" style="position: absolute; top: 216px; left: 11px; ">
+  <A href="link">
+   <SPAN>link</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>
+ </SPAN>
+ <SPAN id="testtext" class="text" style="position: absolute; top: 243px; left: 11px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 270px; left: 11px; ">
+  <SPAN>text</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 1fc61a4f22..1a14eec510 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
@@ -17,114 +17,114 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testwidgets2" name="testwidgets2">
- <component t:x="449" t:y="389" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.apache.org/</property>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="start" promote="start"/>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="735" t:y="335" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Apache</property>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text3" name="item" t:clonable="true"/>
+  <reference target="text4" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="645" t:y="457" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.cnn.com</property>
+ <component name="list4" t:title="list" t:color="yellow1">
+  <t: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"/>
+ </component>
+ <component name="number3" t:title="#" t:color="orange1">
+  <t: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"/>
+  <service name="number"/>
+  <property>2</property>
  </component>
- <component t:x="271" t:y="276" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text5" name="value"/>
   <property>testframe</property>
  </component>
- <component t:x="631" t:y="388" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text3" name="item" t:clonable="true"/>
-  <reference target="text4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="272" t:y="183" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="list3" name="value"/>
   <property>testlink</property>
  </component>
- <component t:x="270" t:y="147" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text2" name="value"/>
   <property>testhtml</property>
  </component>
- <component t:x="695" t:y="243" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>&lt;b&gt;test bold text&lt;/b&gt;</property>
- </component>
- <component t:x="271" t:y="0" name="property4" t:title="{propval} :" t:color="orange1">
+ <component name="property4" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text" name="value"/>
   <property>testlist1</property>
  </component>
- <component t:x="677" t:y="49" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test value</property>
- </component>
- <component t:x="271" t:y="34" name="property5" t:title="{propval} :" t:color="orange1">
+ <component name="property5" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="list4" name="value"/>
   <property>testlist2</property>
  </component>
- <component t:x="672" t:y="111" name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property6" name="item" t:clonable="true"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="709" t:y="109" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property6" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number3" name="value"/>
   <property>a</property>
  </component>
- <component t:x="780" t:y="107" name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>1</property>
- </component>
- <component t:x="781" t:y="137" name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>2</property>
- </component>
- <component t:x="710" t:y="142" name="property7" t:title="{propval} :" t:color="orange1">
+ <component name="property7" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number4" name="value"/>
   <property>b</property>
  </component>
- <component t:x="326" t:y="32" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="212" t:y="33" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
+ <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"/>
   </service>
   <reference target="list" name="content"/>
  </component>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t: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"/>
+  <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"/>
+  <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"/>
+  <service name="text"/>
+  <property>Apache</property>
+ </component>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.cnn.com</property>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
deleted file mode 100644
index b20cf24c02..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
-  <H2>Test widget components</H2>
- </SPAN>
- <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; left: 20px; ">
-  <TABLE class="datatable" style="width: 200px;">
-   <TBODY>
-    <TR>
-     <TD>table</TD>
-     <TD>...</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; left: 20px; ">
-  <TABLE class="datatable" style="width: 200px;">
-   <TBODY>
-    <TR>
-     <TD>table</TD>
-     <TD>...</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 20px; ">
-  <TABLE class="datatable" style="width: 200px;">
-   <TBODY>
-    <TR>
-     <TD>table</TD>
-     <TD>...</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="testhtml" class="text" style="position: absolute; top: 234px; left: 20px; ">
-  <SPAN>text</SPAN>
- </SPAN>
- <SPAN id="testlink" class="link" style="position: absolute; top: 270px; left: 20px; ">
-  <A href="/">
-   <SPAN>link</SPAN>
-  </A>
- </SPAN>
- <SPAN id="testframe" class="iframe" style="position: absolute; top: 306px; left: 20px; ">
-  <A href="/public/iframe.html">
-   <SPAN class="fakeframe">
-    <SPAN>frame ...</SPAN>
-   </SPAN>
-  </A>
- </SPAN>
- <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; ">
-  <SELECT>
-   <OPTION>select</OPTION>
-  </SELECT>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html
new file mode 100644
index 0000000000..2bf6593f02
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
+  <H2>Test widget components</H2>
+ </SPAN>
+ <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; left: 20px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>table</TD>
+     <TD>...</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; left: 20px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>table</TD>
+     <TD>...</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 20px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>table</TD>
+     <TD>...</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="testhtml" class="text" style="position: absolute; top: 234px; left: 20px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; ">
+  <SELECT>
+   <OPTION>select</OPTION>
+  </SELECT>
+ </SPAN>
+ <SPAN id="testlink" class="link" style="position: absolute; top: 270px; left: 20px; ">
+  <A href="/">
+   <SPAN>link</SPAN>
+  </A>
+ </SPAN>
+ <SPAN id="testframe" class="iframe" style="position: absolute; top: 306px; left: 20px; ">
+  <A href="/public/iframe.html">
+   <SPAN class="fakeframe">
+    <SPAN>frame ...</SPAN>
+   </SPAN>
+  </A>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
index fbc27c0bfe..1ab4d4a54f 100644
--- a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
@@ -22,25 +22,25 @@
   targetNamespace="http://control"
   name="palette">
         
-    <service name="appstart" promote="appstart"/>
-    <service name="appstop" promote="appstop"/>
+    <service name="start" promote="start"/>
+    <service name="stop" promote="stop"/>
     <service name="service" promote="service"/>
-    <service name="every" promote="every"/>
+    <service name="timer" promote="timer"/>
     <service name="geolocation" promote="geolocation"/>
     <service name="call" promote="call"/>
 
-    <component name="appstart" t:title="start" t:color="green1">
-        <t:implementation.python script="nuvem/appstart.py"/>
-        <service name="appstart" t:visible="false">
-            <t:binding.http uri="appstart"/>
+    <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="appstop" t:title="stop" t:color="green1">
-        <t:implementation.python script="nuvem/appstop.py"/>
-        <service name="appstop" t:visible="false">
-            <t:binding.http uri="appstop"/>
+    <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>
@@ -51,10 +51,10 @@
         <reference name="content"/>
     </component>
     
-    <component name="every" t:title="timer" t:color="green1">
-        <t:implementation.python script="nuvem/every.py"/>
-        <service name="every" t:visible="false">
-            <t:binding.http uri="every"/>
+    <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"/>
diff --git a/sca-cpp/trunk/modules/edit/store/all b/sca-cpp/trunk/modules/edit/store/all
new file mode 100644
index 0000000000..402b4260e4
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/store/all
@@ -0,0 +1 @@
+((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb")))
diff --git a/sca-cpp/trunk/modules/edit/store/myapps b/sca-cpp/trunk/modules/edit/store/myapps
deleted file mode 100644
index 7fd59364cf..0000000000
--- a/sca-cpp/trunk/modules/edit/store/myapps
+++ /dev/null
@@ -1 +0,0 @@
-((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "My online store") (id "shoppingcart")) (entry (title "Slice") (id "slice")))
diff --git a/sca-cpp/trunk/modules/edit/store/tests b/sca-cpp/trunk/modules/edit/store/tests
deleted file mode 100644
index 3872b753cd..0000000000
--- a/sca-cpp/trunk/modules/edit/store/tests
+++ /dev/null
@@ -1 +0,0 @@
-((entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb")))
-- 
cgit v1.2.3