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

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

2 files changed, 325 insertions, 375 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
index 74af00ee41..d81de55232 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
@@ -18,468 +18,427 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://nearme" name="nearme">
- <service name="location" promote="location"/>
- <component t:x="1" t:y="138" name="location" t:title="on location change" t:color="green1">
-  <t:implementation.python script="nuvem/location.py"/>
-  <service name="location" t:visible="false">
-   <t:binding.http uri="location"/>
-  </service>
-  <reference target="put" name="content"/>
- </component>
- <component t:x="827" t:y="143" name="filedb2" t:title="File database" t:color="green1">
+ <component xmlns="" t:x="811" t:y="384" name="filedb4" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="761" t:y="257" name="filedb3" t:title="File database" t:color="green1">
+ <component xmlns="" t:x="814" t:y="554" name="filedb5" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="779" t:y="386" name="get3" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb4" name="collection"/>
-  <reference target="param4" name="id"/>
+ <component xmlns="" t:x="169" t:y="168" name="user" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="811" t:y="384" name="filedb4" t:title="File database" t:color="green1">
+ <component xmlns="" t:x="792" t:y="284" name="filedb6" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="777" t:y="543" name="get4" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb5" name="collection"/>
-  <reference target="param5" name="id"/>
- </component>
- <component t:x="814" t:y="554" name="filedb5" t:title="File database" t:color="green1">
+ <component xmlns="" t:x="648" t:y="185" name="filedb7" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="773" t:y="193" name="get2" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb3" name="collection"/>
-  <reference target="param3" name="id"/>
- </component>
- <component t:x="720" t:y="585" name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name9" name="name"/>
-  <reference target="get4" name="value"/>
- </component>
- <component t:x="717" t:y="394" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="get3" name="value"/>
- </component>
- <component t:x="721" t:y="201" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name8" name="name"/>
-  <reference target="get2" name="value"/>
- </component>
- <component t:x="314" t:y="147" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>longitude</property>
+ <component xmlns="" t:x="898" t:y="284" name="filedb8" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="311" t:y="222" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>latitude</property>
+ <component xmlns="" t:x="675" t:y="394" name="filedb9" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="865" t:y="408" name="name7" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend2</property>
+ <component t:x="729" t:y="59" name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>/components/map</property>
  </component>
- <component t:x="866" t:y="527" name="name10" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend3</property>
+ <component xmlns="" t:x="387" t:y="32" name="user3" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="654" t:y="72" name="get" t:title="get" t:color="green1">
+ <component xmlns="" t:x="265" t:y="625" name="get4" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb2" name="collection"/>
-  <reference target="user2" name="id"/>
- </component>
- <component t:x="170" t:y="126" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text7" name="item" t:clonable="true"/>
-  <reference target="param2" name="item" t:clonable="true"/>
-  <reference target="param" name="item" t:clonable="true"/>
-  <reference target="now" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="page" promote="page"/>
- <component t:x="0" t:y="45" name="page" t:title="when page opens" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="pair13" name="content"/>
- </component>
- <component t:x="127" t:y="415" name="pair13" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name13" name="name"/>
-  <reference target="user3" name="value"/>
+  <reference target="filedb5" name="collection"/>
+  <reference target="param4" name="id"/>
  </component>
- <component t:x="169" t:y="416" name="name13" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>me</property>
+ <component xmlns="" t:x="268" t:y="540" name="get3" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb4" name="collection"/>
+  <reference target="param3" name="id"/>
  </component>
- <component t:x="169" t:y="144" name="filedb" t:title="File database" t:color="green1">
+ <component t:x="471" t:y="20" name="filedb10" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="162" t:y="77" name="user3" t:title="user" t:color="green1">
+ <component t:x="475" t:y="51" name="user5" t:title="user" t:color="green1">
   <t:implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user" t:visible="false"/>
  </component>
- <component t:x="214" t:y="259" name="param2" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <reference target="name3" name="name"/>
-  <property name="query" t:visible="false"/>
+ <component t:x="513" t:y="1" name="get9" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb10" name="collection"/>
+  <reference target="user5" name="id"/>
+ </component>
+ <component t:x="544" t:y="97" name="get10" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb11" name="collection"/>
+  <reference target="param5" name="id"/>
+ </component>
+ <component t:x="578" t:y="98" name="filedb11" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="215" t:y="296" name="param" t:title="?param" t:color="green1">
+ <component t:x="264" t:y="221" name="param10" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name2" name="name"/>
+  <property>latitude</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="217" t:y="231" name="text7" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>green</property>
- </component>
- <component t:x="216" t:y="329" name="now" t:title="now" t:color="orange1">
-  <t:implementation.python script="nuvem/now.py"/>
-  <service name="now"/>
- </component>
- <component t:x="169" t:y="168" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
- </component>
- <component t:x="796" t:y="196" name="user2" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
- </component>
- <component t:x="796" t:y="298" name="param3" t:title="?param" t:color="green1">
+ <component t:x="338" t:y="564" name="param3" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name4" name="name"/>
+  <property>friend2</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="794" t:y="409" name="param4" t:title="?param" t:color="green1">
+ <component t:x="340" t:y="631" name="param4" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name7" name="name"/>
+  <property>friend3</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="797" t:y="516" name="param5" t:title="?param" t:color="green1">
+ <component t:x="698" t:y="120" name="param5" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name10" name="name"/>
+  <property>friend1</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="130" t:y="138" name="put" t:title="put" t:color="green1">
-  <t:implementation.python script="nuvem/put.py"/>
-  <service name="put"/>
-  <reference target="filedb" name="collection"/>
-  <reference target="user" name="id"/>
-  <reference target="list" name="value"/>
- </component>
- <service name="every" promote="every"/>
- <component t:x="493" t:y="13" name="every" t:title="every n millisec" t:color="green1">
-  <t:implementation.python script="nuvem/every.py"/>
-  <service name="every" t:visible="false">
-   <t:binding.http uri="every"/>
-  </service>
-  <reference target="number" name="n"/>
-  <reference target="list2" name="content"/>
+ <component t:x="652" t:y="43" name="property11" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="get9" name="value"/>
+  <property>x</property>
  </component>
- <service name="map" promote="map"/>
- <component t:x="3" t:y="389" name="map" t:title="on {compname} widget" t:color="green1">
-  <t:implementation.python script="nuvem/widget.py"/>
-  <service name="widget" t:visible="false"/>
-  <reference target="googlemap" name="content"/>
+ <component t:x="652" t:y="115" name="property12" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="get10" name="value"/>
+  <property>1</property>
  </component>
- <component t:x="705" t:y="137" name="pair6" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name11" name="name"/>
-  <reference target="get" name="value"/>
+ <component t:x="653" t:y="193" name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="get3" name="value"/>
+  <property>2</property>
  </component>
- <component t:x="866" t:y="334" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend1</property>
+ <component t:x="655" t:y="261" name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="get4" name="value"/>
+  <property>3</property>
  </component>
- <component t:x="677" t:y="178" name="list5" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="pair6" name="item" t:clonable="true"/>
-  <reference target="pair4" name="item" t:clonable="true"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair5" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="785" t:y="175" name="append" t:title="+" t:color="yellow1">
+  <t:implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference target="params" name="first"/>
+  <reference target="call2" name="second"/>
  </component>
- <component t:x="619" t:y="103" name="params" t:title="?params" t:color="green1">
+ <component xmlns="" t:x="846" t:y="183" name="params" t:title="?params" t:color="green1">
   <t:implementation.python script="nuvem/params.py"/>
   <service name="params"/>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="561" t:y="55" name="name5" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>mapimg</property>
+ <component t:x="745" t:y="153" name="url" t:title="url" t:color="green1">
+  <t:implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference target="text2" name="address"/>
+  <reference target="append" name="args"/>
  </component>
- <component t:x="561" t:y="83" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text" name="pattern"/>
-  <reference target="params" name="values"/>
+ <component xmlns="" t:x="812" t:y="270" name="get6" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb7" name="collection"/>
+  <reference target="user4" name="id"/>
  </component>
- <component t:x="792" t:y="284" name="filedb6" t:title="File database" t:color="green1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+ <component t:x="743" t:y="270" name="last" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get6" name="list"/>
  </component>
- <component t:x="653" t:y="212" name="user4" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component xmlns="" t:x="802" t:y="353" name="get5" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb6" name="collection"/>
+  <reference target="param2" name="id"/>
  </component>
- <component t:x="648" t:y="185" name="filedb7" t:title="File database" t:color="green1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
+ <component xmlns="" t:x="802" t:y="423" name="get8" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb9" name="collection"/>
+  <reference target="param6" name="id"/>
+ </component>
+ <component xmlns="" t:x="800" t:y="495" name="get7" t:title="get" t:color="red1">
+  <t:implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference target="filedb8" name="collection"/>
+  <reference target="param7" name="id"/>
+ </component>
+ <component t:x="734" t:y="347" name="last2" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get5" name="list"/>
+ </component>
+ <component t:x="733" t:y="387" name="last3" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get8" name="list"/>
+ </component>
+ <component t:x="731" t:y="420" name="last4" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get7" name="list"/>
  </component>
- <component t:x="651" t:y="313" name="param6" t:title="?param" t:color="green1">
+ <component t:x="836" t:y="377" name="param2" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name15" name="name"/>
+  <property>friend1</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="897" t:y="309" name="param7" t:title="?param" t:color="green1">
+ <component t:x="836" t:y="457" name="param6" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name18" name="name"/>
+  <property>friend2</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="898" t:y="284" name="filedb8" t:title="File database" t:color="green1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="675" t:y="394" name="filedb9" t:title="File database" t:color="green1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="676" t:y="419" name="param8" t:title="?param" t:color="green1">
+ <component t:x="836" t:y="537" name="param7" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
-  <reference target="name16" name="name"/>
+  <property>friend3</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="569" t:y="366" name="pair8" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name14" name="name"/>
-  <reference target="first3" name="value"/>
+ <component xmlns="" t:x="258" t:y="167" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <component t:x="574" t:y="415" name="pair9" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name17" name="name"/>
-  <reference target="first4" name="value"/>
+ <component xmlns="" t:x="185" t:y="167" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text7" name="item" t:clonable="true"/>
+  <reference target="param10" name="item" t:clonable="true"/>
+  <reference target="param" name="item" t:clonable="true"/>
+  <reference target="now" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="729" t:y="311" name="name15" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend1</property>
+ <component t:x="193" t:y="855" name="property7" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last3" name="value"/>
+  <property>time2</property>
+ </component>
+ <component t:x="196" t:y="775" name="property8" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last2" name="value"/>
+  <property>time1</property>
+ </component>
+ <component t:x="198" t:y="1012" name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="url" name="value"/>
+  <property>mapimg</property>
  </component>
- <component t:x="730" t:y="417" name="name16" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend2</property>
+ <component t:x="197" t:y="695" name="property9" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last" name="value"/>
+  <property>mytime</property>
+ </component>
+ <component t:x="195" t:y="658" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="user3" name="value"/>
+  <property>me</property>
+ </component>
+ <component t:x="188" t:y="276" name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last4" name="value"/>
+  <property>time3</property>
  </component>
- <component t:x="730" t:y="531" name="name18" t:title="name" t:color="orange1">
+ <component t:x="528" t:y="412" name="name2" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>friend3</property>
+  <property>getlocs</property>
  </component>
- <component t:x="604" t:y="41" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
-  <reference target="pair7" name="item" t:clonable="true"/>
-  <reference target="pair3" name="item" t:clonable="true"/>
-  <reference target="pair8" name="item" t:clonable="true"/>
-  <reference target="pair9" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="447" t:y="411" name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name2" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="652" t:y="141" name="pair7" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name12" name="name"/>
-  <reference target="first" name="value"/>
+ <component t:x="225" t:y="61" name="call" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="652" t:y="241" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name6" name="name"/>
-  <reference target="first2" name="value"/>
+ <component xmlns="" t:x="181" t:y="63" name="googlemap" t:title="google map" t:color="red1">
+  <t:implementation.python script="nuvem/gmap.py"/>
+  <service name="googlemap"/>
+  <reference target="call" name="locations"/>
+  <reference name="s" t:visible="false">
+   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  </reference>
  </component>
- <component t:x="692" t:y="141" name="name12" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>myloc</property>
+ <service name="map" promote="map"/>
+ <component t:x="129" t:y="599" name="map" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="googlemap" name="content"/>
  </component>
- <component t:x="692" t:y="241" name="name6" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend1loc</property>
+ <component xmlns="" t:x="732" t:y="111" name="put" t:title="put" t:color="red1">
+  <t:implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference target="filedb" name="collection"/>
+  <reference target="user" name="id"/>
+  <reference target="list" name="value"/>
  </component>
- <component t:x="692" t:y="349" name="name14" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend2loc</property>
+ <service name="geolocation" promote="geolocation"/>
+ <component t:x="545" t:y="103" name="geolocation" t:title="location" t:color="green1">
+  <t:implementation.python script="nuvem/geolocation.py"/>
+  <service name="geolocation" t:visible="false">
+   <t:binding.http uri="geolocation"/>
+  </service>
+  <reference target="put" name="content"/>
  </component>
- <component t:x="692" t:y="457" name="name17" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>friend3loc</property>
+ <component t:x="751" t:y="357" name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property11" name="item" t:clonable="true"/>
+  <reference target="property12" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="272" t:y="489" name="name8" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>1</property>
+ <service name="getlocs" promote="getlocs"/>
+ <component t:x="551" t:y="334" name="getlocs" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list3" name="content"/>
  </component>
- <component t:x="272" t:y="597" name="name" t:title="name" t:color="orange1">
+ <component t:x="290" t:y="5" name="name3" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>2</property>
+  <property>nearme</property>
  </component>
- <component t:x="272" t:y="705" name="name9" t:title="name" t:color="orange1">
+ <component t:x="358" t:y="62" name="name" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>3</property>
+  <property>getlocs</property>
  </component>
- <component t:x="272" t:y="389" name="name11" t:title="name" t:color="orange1">
+ <component t:x="832" t:y="35" name="name4" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>X</property>
+  <property>nearme</property>
  </component>
- <component t:x="66" t:y="389" name="googlemap" t:title="google map" t:color="red1">
-  <t:implementation.python script="nuvem/gmap.py"/>
-  <service name="googlemap"/>
-  <reference target="list5" name="locations"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
-  </reference>
+ <service name="appstart2" promote="appstart2"/>
+ <component t:x="130" t:y="12" name="appstart2" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="call4" name="content"/>
  </component>
- <component t:x="763" t:y="168" name="reverse" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="get6" name="list"/>
+ <component t:x="196" t:y="8" name="call4" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name3" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="965" t:y="221" name="get6" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb7" name="collection"/>
-  <reference target="user4" name="id"/>
+ <component xmlns="" t:x="734" t:y="11" name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>5000</property>
  </component>
- <component t:x="765" t:y="279" name="reverse2" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="get5" name="list"/>
+ <component t:x="729" t:y="42" name="call3" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name4" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
  </component>
- <component t:x="912" t:y="228" name="get5" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb6" name="collection"/>
-  <reference target="param6" name="id"/>
+ <service name="every" promote="every"/>
+ <component t:x="543" t:y="8" name="every" t:title="timer" t:color="green1">
+  <t:implementation.python script="nuvem/every.py"/>
+  <service name="every" t:visible="false">
+   <t:binding.http uri="every"/>
+  </service>
+  <reference target="number" name="n"/>
+  <reference target="call3" name="content"/>
  </component>
- <component t:x="914" t:y="403" name="get7" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb8" name="collection"/>
-  <reference target="param7" name="id"/>
+ <component xmlns="" t:x="514" t:y="128" name="user4" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="767" t:y="526" name="reverse3" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="get7" name="list"/>
+ <component xmlns="" t:x="190" t:y="81" name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="property6" name="item" t:clonable="true"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="693" t:y="165" name="first" t:title="first item" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="reverse" name="list"/>
- </component>
- <component t:x="697" t:y="283" name="first2" t:title="first item" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="reverse2" name="list"/>
- </component>
- <component t:x="698" t:y="407" name="first3" t:title="first item" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="reverse4" name="list"/>
- </component>
- <component t:x="694" t:y="526" name="first4" t:title="first item" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="reverse3" name="list"/>
- </component>
- <component t:x="768" t:y="410" name="reverse4" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="get8" name="list"/>
+ <service name="nearme" promote="nearme"/>
+ <component t:x="128" t:y="70" name="nearme" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list2" name="content"/>
  </component>
- <component t:x="832" t:y="412" name="get8" t:title="get" t:color="green1">
-  <t:implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb9" name="collection"/>
-  <reference target="param8" name="id"/>
+ <component t:x="863" t:y="102" name="filedb" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component t:x="749" t:y="69" name="text" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>/components/map?friend1={friend1}&amp;friend2={friend2}&amp;friend3={friend3}</property>
+ <component t:x="691" t:y="215" name="param" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>longitude</property>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="652" t:y="41" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name5" name="name"/>
-  <reference target="format" name="value"/>
+ <component t:x="691" t:y="243" name="now" t:title="now" t:color="orange1">
+  <t:implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+  <reference target="text" name="format"/>
  </component>
- <component t:x="604" t:y="13" name="number" t:title="number" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>5000</property>
+ <component t:x="736" t:y="243" name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>%a %b %d, %I:%M %p</property>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.html b/sca-cpp/trunk/modules/edit/apps/nearme/app.html
index 32dd393d69..364a46a1c8 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/nearme/app.html
@@ -18,46 +18,37 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="mapimg" class="img" style="position: absolute; top: 268px; left: 2px; ">
-  <IMG src="https://nearme.sca-store.com:8453/components/map"/>
- </SPAN>
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0pt; left: 0px; ">
   <H2>Nearme</H2>
  </SPAN>
- <SPAN id="friend3" class="entry" style="position: absolute; top: 224px; left: 1px; ">
-  <INPUT type="text" value="field" size="20"/>
- </SPAN>
- <SPAN id="friend3loc" class="text" style="position: absolute; top: 228px; left: 174px; ">
-  <SPAN>last seen...</SPAN>
+ <SPAN id="me" class="h2" style="position: absolute; top: 0px; left: 101px; ">
+  <H2>me</H2>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 205px; left: 4px; ">
-  <SPAN>Friend 3:</SPAN>
+ <SPAN style="position: absolute; top: 81px; left: 2px; " class="entry" id="friend2">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
  </SPAN>
- <SPAN id="friend2" class="entry" style="position: absolute; top: 173px; left: 2px; ">
-  <INPUT type="text" value="field" size="20"/>
+ <SPAN style="position: absolute; top: 108px; left: 2px; " class="entry" id="friend3">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 152px; left: 4px; ">
-  <SPAN>Friend 2:</SPAN>
+ <SPAN style="position: absolute; top: 135px; left: 2px; " class="img" id="mapimg">
+  <IMG src="https://sca-store.com:8453/public/img.png"/>
  </SPAN>
- <SPAN id="friend2loc" class="text" style="position: absolute; top: 178px; left: 173px; ">
+ <SPAN style="position: absolute; top: 54px; left: 182px; " class="text" id="time1">
   <SPAN>last seen...</SPAN>
  </SPAN>
- <SPAN id="friend1" class="entry" style="position: absolute; top: 122px; left: 2px; ">
-  <INPUT type="text" value="field" size="20"/>
- </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 99px; left: 5px; ">
-  <SPAN>Friend 1:</SPAN>
- </SPAN>
- <SPAN id="friend1loc" class="text" style="position: absolute; top: 126px; left: 173px; ">
+ <SPAN style="position: absolute; top: 81px; left: 182px; " class="text" id="time2">
   <SPAN>last seen...</SPAN>
  </SPAN>
- <SPAN id="text" class="text" style="position: absolute; top: 71px; left: 4px; ">
-  <SPAN>Last seen:</SPAN>
+ <SPAN style="position: absolute; top: 108px; left: 182px; " class="text" id="time3">
+  <SPAN>last seen...</SPAN>
  </SPAN>
- <SPAN id="myloc" class="text" style="position: absolute; top: 69px; left: 173px; ">
+ <SPAN style="position: absolute; top: 0px; left: 182px; " class="text" id="mytime">
   <SPAN>updating...</SPAN>
  </SPAN>
- <SPAN id="me" class="section" style="position: absolute; top: 33px; left: 1px; ">
-  <SPAN>me</SPAN>
+ <SPAN style="position: absolute; top: 54px; left: 2px; " class="entry" id="friend1">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
+  <SPAN>My friends</SPAN>
  </SPAN>
 </DIV>