Refactor sample app definitions into proper ATOM entries.

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

6 files changed, 673 insertions, 645 deletions

diff --git a/sca-cpp/trunk/hosting/server/data/apps/nearme/app.composite b/sca-cpp/trunk/hosting/server/data/apps/nearme/app.composite
index 51fc2791fb..0d25e1b533 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/nearme/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme/app.composite
@@ -17,428 +17,435 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
- <service name="getlocs" promote="getlocs"/>
- <service name="location" promote="location"/>
- <service name="map" promote="map"/>
- <service name="nearme" promote="nearme"/>
- <service name="start2" promote="start2"/>
- <service name="timer" promote="timer"/>
- <component name="append" title="+" color="yellow1">
-  <implementation.python script="nuvem/append.py"/>
-  <service name="append"/>
-  <reference target="params" name="first"/>
-  <reference target="call2" name="second"/>
- </component>
- <component x="130" y="530" name="call" title="call" color="green1">
-  <implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" visible="false"/>
- </component>
- <component name="call2" title="call" color="green1">
-  <implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name2" name="name"/>
-  <reference name="proxy" wiredByImpl="true" visible="false"/>
- </component>
- <component name="call3" title="call" color="green1">
-  <implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name4" name="name"/>
-  <reference name="proxy" wiredByImpl="true" visible="false"/>
- </component>
- <component name="call4" title="call" color="green1">
-  <implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name3" name="name"/>
-  <reference name="proxy" wiredByImpl="true" visible="false"/>
- </component>
- <component name="filedb" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component x="210" y="120" name="filedb1" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component name="filedb10" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component name="filedb11" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component xmlns="" name="filedb4" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component xmlns="" name="filedb5" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component xmlns="" name="filedb6" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component xmlns="" name="filedb8" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component xmlns="" name="filedb9" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component x="190" y="120" name="get1" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb1" name="collection"/>
-  <reference target="user4" name="id"/>
- </component>
- <component name="get10" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb11" name="collection"/>
-  <reference target="param5" name="id"/>
- </component>
- <component xmlns="" name="get3" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb4" name="collection"/>
-  <reference target="param3" name="id"/>
- </component>
- <component xmlns="" name="get4" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb5" name="collection"/>
-  <reference target="param4" name="id"/>
- </component>
- <component xmlns="" name="get5" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb6" name="collection"/>
-  <reference target="param2" name="id"/>
- </component>
- <component xmlns="" name="get7" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb8" name="collection"/>
-  <reference target="param7" name="id"/>
- </component>
- <component xmlns="" name="get8" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb9" name="collection"/>
-  <reference target="param6" name="id"/>
- </component>
- <component name="get9" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb10" name="collection"/>
-  <reference target="user5" name="id"/>
- </component>
- <component x="310" y="270" name="getlocs" title="{compname}" color="green1">
-  <implementation.python script="nuvem/service.py"/>
-  <service name="service" visible="false"/>
-  <reference target="list4" name="content"/>
- </component>
- <component x="80" y="610" name="gmap1" title="map" color="blue1">
-  <implementation.python script="nuvem/gmap.py"/>
-  <service name="gmap"/>
-  <reference target="call" name="locations"/>
-  <reference name="s" visible="false">
-   <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
-  </reference>
- </component>
- <component x="110" y="90" name="item" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="user3" name="value"/>
-  <property>me</property>
- </component>
- <component x="110" y="390" name="item10" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="url" name="value"/>
-  <property>mapimg</property>
- </component>
- <component x="660" y="350" name="item11" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="get9" name="value"/>
-  <property>x</property>
- </component>
- <component x="660" y="400" name="item12" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="get10" name="value"/>
-  <property>1</property>
- </component>
- <component x="660" y="460" name="item4" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="get3" name="value"/>
-  <property>2</property>
- </component>
- <component x="660" y="530" name="item5" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="get4" name="value"/>
-  <property>3</property>
- </component>
- <component x="110" y="330" name="item6" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="last4" name="value"/>
-  <property>time3</property>
- </component>
- <component x="110" y="260" name="item7" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="last3" name="value"/>
-  <property>time2</property>
- </component>
- <component x="100" y="200" name="item8" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="last2" name="value"/>
-  <property>time1</property>
- </component>
- <component x="100" y="120" name="item9" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="last" name="value"/>
-  <property>mytime</property>
- </component>
- <component name="last" title="last" color="yellow1">
-  <implementation.python script="nuvem/last.py"/>
-  <service name="last"/>
-  <reference target="get1" name="list"/>
- </component>
- <component name="last2" title="last" color="yellow1">
-  <implementation.python script="nuvem/last.py"/>
-  <service name="last"/>
-  <reference target="get5" name="list"/>
- </component>
- <component x="160" y="220" name="last3" title="last" color="yellow1">
-  <implementation.python script="nuvem/last.py"/>
-  <service name="last"/>
-  <reference target="get8" name="list"/>
- </component>
- <component name="last4" title="last" color="yellow1">
-  <implementation.python script="nuvem/last.py"/>
-  <service name="last"/>
-  <reference target="get7" name="list"/>
- </component>
- <component name="list1" title="list.." color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item" name="item" clonable="true"/>
-  <reference target="item9" name="item" clonable="true"/>
-  <reference target="item8" name="item" clonable="true"/>
-  <reference target="item7" name="item" clonable="true"/>
-  <reference target="item6" name="item" clonable="true"/>
-  <reference target="item10" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="list2" title="list.." color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text7" name="item" clonable="true"/>
-  <reference target="param10" name="item" clonable="true"/>
-  <reference target="param" name="item" clonable="true"/>
-  <reference target="now" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="list4" title="list.." color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item11" name="item" clonable="true"/>
-  <reference target="item12" name="item" clonable="true"/>
-  <reference target="item4" name="item" clonable="true"/>
-  <reference target="item5" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component x="310" y="80" name="location" title="location" color="green1">
-  <implementation.python script="nuvem/location.py"/>
-  <service name="location" visible="false">
-   <binding.http uri="location"/>
-  </service>
-  <reference target="put" name="content"/>
- </component>
- <component x="10" y="460" name="map" title="{compname}" color="green1">
-  <implementation.python script="nuvem/service.py"/>
-  <service name="service" visible="false"/>
-  <reference target="gmap1" name="content"/>
- </component>
- <component name="name" title="" color="orange1">
-  <implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>getlocs</property>
- </component>
- <component name="name2" title="" color="orange1">
-  <implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>getlocs</property>
- </component>
- <component name="name3" title="" color="orange1">
-  <implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>nearme</property>
- </component>
- <component name="name4" title="" color="orange1">
-  <implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>nearme</property>
- </component>
- <component x="10" y="60" name="nearme" title="{compname}" color="green1">
-  <implementation.python script="nuvem/service.py"/>
-  <service name="service" visible="false"/>
-  <reference target="list1" name="content"/>
- </component>
- <component x="500" y="250" name="now" title="now" color="orange1">
-  <implementation.python script="nuvem/now.py"/>
-  <service name="now"/>
-  <reference target="text" name="format"/>
- </component>
- <component xmlns="" name="number" title="#" color="orange1">
-  <implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>5000</property>
- </component>
- <component x="500" y="220" name="param" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>longitude</property>
-  <property name="query" visible="false"/>
- </component>
- <component x="500" y="200" name="param10" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>latitude</property>
-  <property name="query" visible="false"/>
- </component>
- <component name="param2" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend1</property>
-  <property name="query" visible="false"/>
- </component>
- <component name="param3" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend2</property>
-  <property name="query" visible="false"/>
- </component>
- <component name="param4" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend3</property>
-  <property name="query" visible="false"/>
- </component>
- <component name="param5" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend1</property>
-  <property name="query" visible="false"/>
- </component>
- <component name="param6" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend2</property>
-  <property name="query" visible="false"/>
- </component>
- <component name="param7" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend3</property>
-  <property name="query" visible="false"/>
- </component>
- <component xmlns="" name="params" title="?params" color="green1">
-  <implementation.python script="nuvem/params.py"/>
-  <service name="params"/>
-  <property name="query" visible="false"/>
- </component>
- <component xmlns="" name="put" title="put" color="pink1">
-  <implementation.python script="nuvem/put.py"/>
-  <service name="put"/>
-  <reference target="filedb" name="collection"/>
-  <reference target="user" name="id"/>
-  <reference target="list2" name="value"/>
- </component>
- <component x="10" y="10" name="start2" title="start" color="green1">
-  <implementation.python script="nuvem/start.py"/>
-  <service name="start" visible="false">
-   <binding.http uri="start"/>
-  </service>
-  <reference target="call4" name="content"/>
- </component>
- <component name="text" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>%a %b %d, %I:%M %p</property>
- </component>
- <component name="text2" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>/components/map</property>
- </component>
- <component xmlns="" x="500" y="170" name="text7" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>green</property>
- </component>
- <component x="310" y="10" name="timer" title="timer" color="green1">
-  <implementation.python script="nuvem/timer.py"/>
-  <service name="timer" visible="false">
-   <binding.http uri="timer"/>
-  </service>
-  <reference target="number" name="n"/>
-  <reference target="call3" name="content"/>
- </component>
- <component name="url" title="url" color="green1">
-  <implementation.python script="nuvem/url.py"/>
-  <service name="url"/>
-  <reference target="text2" name="address"/>
-  <reference target="append" name="args"/>
- </component>
- <component xmlns="" name="user" title="user" color="green1">
-  <implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" visible="false"/>
- </component>
- <component xmlns="" name="user3" title="user" color="green1">
-  <implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" visible="false"/>
- </component>
- <component xmlns="" x="210" y="150" name="user4" title="user" color="green1">
-  <implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" visible="false"/>
- </component>
- <component name="user5" title="user" color="green1">
-  <implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" visible="false"/>
- </component>
-</composite>
+<entry xmlns="http://www.w3.org/2005/Atom">
+ <title type="text">nearme</title>
+ <id>nearme</id>
+ <content type="application/xml">
+  <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+   <service name="getlocs" promote="getlocs"/>
+   <service name="location" promote="location"/>
+   <service name="map" promote="map"/>
+   <service name="nearme" promote="nearme"/>
+   <service name="start2" promote="start2"/>
+   <service name="timer" promote="timer"/>
+   <component name="append" title="+" color="yellow1">
+    <implementation.python script="nuvem/append.py"/>
+    <service name="append"/>
+    <reference target="params" name="first"/>
+    <reference target="call2" name="second"/>
+   </component>
+   <component x="130" y="530" name="call" title="call" color="green1">
+    <implementation.python script="nuvem/call.py"/>
+    <service name="call"/>
+    <reference target="name" name="name"/>
+    <reference name="proxy" wiredByImpl="true" visible="false"/>
+   </component>
+   <component name="call2" title="call" color="green1">
+    <implementation.python script="nuvem/call.py"/>
+    <service name="call"/>
+    <reference target="name2" name="name"/>
+    <reference name="proxy" wiredByImpl="true" visible="false"/>
+   </component>
+   <component name="call3" title="call" color="green1">
+    <implementation.python script="nuvem/call.py"/>
+    <service name="call"/>
+    <reference target="name4" name="name"/>
+    <reference name="proxy" wiredByImpl="true" visible="false"/>
+   </component>
+   <component name="call4" title="call" color="green1">
+    <implementation.python script="nuvem/call.py"/>
+    <service name="call"/>
+    <reference target="name3" name="name"/>
+    <reference name="proxy" wiredByImpl="true" visible="false"/>
+   </component>
+   <component name="filedb" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="AppDataFileCache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component x="210" y="120" name="filedb1" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="AppDataFileCache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component name="filedb10" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="AppDataFileCache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component name="filedb11" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="AppDataFileCache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component xmlns="" name="filedb4" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="AppDataFileCache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component xmlns="" name="filedb5" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="AppDataFileCache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component xmlns="" name="filedb6" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="AppDataFileCache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component xmlns="" name="filedb8" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="AppDataFileCache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component xmlns="" name="filedb9" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="AppDataFileCache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component x="190" y="120" name="get1" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb1" name="collection"/>
+    <reference target="user4" name="id"/>
+   </component>
+   <component name="get10" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb11" name="collection"/>
+    <reference target="param5" name="id"/>
+   </component>
+   <component xmlns="" name="get3" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb4" name="collection"/>
+    <reference target="param3" name="id"/>
+   </component>
+   <component xmlns="" name="get4" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb5" name="collection"/>
+    <reference target="param4" name="id"/>
+   </component>
+   <component xmlns="" name="get5" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb6" name="collection"/>
+    <reference target="param2" name="id"/>
+   </component>
+   <component xmlns="" name="get7" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb8" name="collection"/>
+    <reference target="param7" name="id"/>
+   </component>
+   <component xmlns="" name="get8" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb9" name="collection"/>
+    <reference target="param6" name="id"/>
+   </component>
+   <component name="get9" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb10" name="collection"/>
+    <reference target="user5" name="id"/>
+   </component>
+   <component x="310" y="270" name="getlocs" title="{compname}" color="green1">
+    <implementation.python script="nuvem/service.py"/>
+    <service name="service" visible="false"/>
+    <reference target="list4" name="content"/>
+   </component>
+   <component x="80" y="610" name="gmap1" title="map" color="blue1">
+    <implementation.python script="nuvem/gmap.py"/>
+    <service name="gmap"/>
+    <reference target="call" name="locations"/>
+    <reference name="s" visible="false">
+     <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+    </reference>
+   </component>
+   <component x="110" y="90" name="item" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="user3" name="value"/>
+    <property>me</property>
+   </component>
+   <component x="110" y="390" name="item10" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="url" name="value"/>
+    <property>mapimg</property>
+   </component>
+   <component x="660" y="350" name="item11" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="get9" name="value"/>
+    <property>x</property>
+   </component>
+   <component x="660" y="400" name="item12" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="get10" name="value"/>
+    <property>1</property>
+   </component>
+   <component x="660" y="460" name="item4" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="get3" name="value"/>
+    <property>2</property>
+   </component>
+   <component x="660" y="530" name="item5" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="get4" name="value"/>
+    <property>3</property>
+   </component>
+   <component x="110" y="330" name="item6" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="last4" name="value"/>
+    <property>time3</property>
+   </component>
+   <component x="110" y="260" name="item7" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="last3" name="value"/>
+    <property>time2</property>
+   </component>
+   <component x="100" y="200" name="item8" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="last2" name="value"/>
+    <property>time1</property>
+   </component>
+   <component x="100" y="120" name="item9" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="last" name="value"/>
+    <property>mytime</property>
+   </component>
+   <component name="last" title="last" color="yellow1">
+    <implementation.python script="nuvem/last.py"/>
+    <service name="last"/>
+    <reference target="get1" name="list"/>
+   </component>
+   <component name="last2" title="last" color="yellow1">
+    <implementation.python script="nuvem/last.py"/>
+    <service name="last"/>
+    <reference target="get5" name="list"/>
+   </component>
+   <component x="160" y="220" name="last3" title="last" color="yellow1">
+    <implementation.python script="nuvem/last.py"/>
+    <service name="last"/>
+    <reference target="get8" name="list"/>
+   </component>
+   <component name="last4" title="last" color="yellow1">
+    <implementation.python script="nuvem/last.py"/>
+    <service name="last"/>
+    <reference target="get7" name="list"/>
+   </component>
+   <component name="list1" title="list.." color="yellow1">
+    <implementation.python script="nuvem/list_.py"/>
+    <service name="list"/>
+    <reference target="item" name="item" clonable="true"/>
+    <reference target="item9" name="item" clonable="true"/>
+    <reference target="item8" name="item" clonable="true"/>
+    <reference target="item7" name="item" clonable="true"/>
+    <reference target="item6" name="item" clonable="true"/>
+    <reference target="item10" name="item" clonable="true"/>
+    <reference name="item" clonable="true"/>
+   </component>
+   <component name="list2" title="list.." color="yellow1">
+    <implementation.python script="nuvem/list_.py"/>
+    <service name="list"/>
+    <reference target="text7" name="item" clonable="true"/>
+    <reference target="param10" name="item" clonable="true"/>
+    <reference target="param" name="item" clonable="true"/>
+    <reference target="now" name="item" clonable="true"/>
+    <reference name="item" clonable="true"/>
+   </component>
+   <component name="list4" title="list.." color="yellow1">
+    <implementation.python script="nuvem/list_.py"/>
+    <service name="list"/>
+    <reference target="item11" name="item" clonable="true"/>
+    <reference target="item12" name="item" clonable="true"/>
+    <reference target="item4" name="item" clonable="true"/>
+    <reference target="item5" name="item" clonable="true"/>
+    <reference name="item" clonable="true"/>
+   </component>
+   <component x="310" y="80" name="location" title="location" color="green1">
+    <implementation.python script="nuvem/location.py"/>
+    <service name="location" visible="false">
+     <binding.http uri="location"/>
+    </service>
+    <reference target="put" name="content"/>
+   </component>
+   <component x="10" y="460" name="map" title="{compname}" color="green1">
+    <implementation.python script="nuvem/service.py"/>
+    <service name="service" visible="false"/>
+    <reference target="gmap1" name="content"/>
+   </component>
+   <component name="name" title="" color="orange1">
+    <implementation.python script="nuvem/name.py"/>
+    <service name="name"/>
+    <property>getlocs</property>
+   </component>
+   <component name="name2" title="" color="orange1">
+    <implementation.python script="nuvem/name.py"/>
+    <service name="name"/>
+    <property>getlocs</property>
+   </component>
+   <component name="name3" title="" color="orange1">
+    <implementation.python script="nuvem/name.py"/>
+    <service name="name"/>
+    <property>nearme</property>
+   </component>
+   <component name="name4" title="" color="orange1">
+    <implementation.python script="nuvem/name.py"/>
+    <service name="name"/>
+    <property>nearme</property>
+   </component>
+   <component x="10" y="60" name="nearme" title="{compname}" color="green1">
+    <implementation.python script="nuvem/service.py"/>
+    <service name="service" visible="false"/>
+    <reference target="list1" name="content"/>
+   </component>
+   <component x="500" y="250" name="now" title="now" color="orange1">
+    <implementation.python script="nuvem/now.py"/>
+    <service name="now"/>
+    <reference target="text" name="format"/>
+   </component>
+   <component xmlns="" name="number" title="#" color="orange1">
+    <implementation.python script="nuvem/number.py"/>
+    <service name="number"/>
+    <property>5000</property>
+   </component>
+   <component x="500" y="220" name="param" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>longitude</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component x="500" y="200" name="param10" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>latitude</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component name="param2" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>friend1</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component name="param3" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>friend2</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component name="param4" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>friend3</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component name="param5" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>friend1</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component name="param6" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>friend2</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component name="param7" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>friend3</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component xmlns="" name="params" title="?params" color="green1">
+    <implementation.python script="nuvem/params.py"/>
+    <service name="params"/>
+    <property name="query" visible="false"/>
+   </component>
+   <component xmlns="" name="put" title="put" color="pink1">
+    <implementation.python script="nuvem/put.py"/>
+    <service name="put"/>
+    <reference target="filedb" name="collection"/>
+    <reference target="user" name="id"/>
+    <reference target="list2" name="value"/>
+   </component>
+   <component x="10" y="10" name="start2" title="start" color="green1">
+    <implementation.python script="nuvem/start.py"/>
+    <service name="start" visible="false">
+     <binding.http uri="start"/>
+    </service>
+    <reference target="call4" name="content"/>
+   </component>
+   <component name="text" title=" '{propval}'" color="orange1">
+    <implementation.python script="nuvem/text.py"/>
+    <service name="text"/>
+    <property>%a %b %d, %I:%M %p</property>
+   </component>
+   <component name="text2" title=" '{propval}'" color="orange1">
+    <implementation.python script="nuvem/text.py"/>
+    <service name="text"/>
+    <property>/components/map</property>
+   </component>
+   <component xmlns="" x="500" y="170" name="text7" title=" '{propval}'" color="orange1">
+    <implementation.python script="nuvem/text.py"/>
+    <service name="text"/>
+    <property>green</property>
+   </component>
+   <component x="310" y="10" name="timer" title="timer" color="green1">
+    <implementation.python script="nuvem/timer.py"/>
+    <service name="timer" visible="false">
+     <binding.http uri="timer"/>
+    </service>
+    <reference target="number" name="n"/>
+    <reference target="call3" name="content"/>
+   </component>
+   <component name="url" title="url" color="green1">
+    <implementation.python script="nuvem/url.py"/>
+    <service name="url"/>
+    <reference target="text2" name="address"/>
+    <reference target="append" name="args"/>
+   </component>
+   <component xmlns="" name="user" title="user" color="green1">
+    <implementation.python script="nuvem/user.py"/>
+    <service name="user"/>
+    <property name="user" visible="false"/>
+   </component>
+   <component xmlns="" name="user3" title="user" color="green1">
+    <implementation.python script="nuvem/user.py"/>
+    <service name="user"/>
+    <property name="user" visible="false"/>
+   </component>
+   <component xmlns="" x="210" y="150" name="user4" title="user" color="green1">
+    <implementation.python script="nuvem/user.py"/>
+    <service name="user"/>
+    <property name="user" visible="false"/>
+   </component>
+   <component name="user5" title="user" color="green1">
+    <implementation.python script="nuvem/user.py"/>
+    <service name="user"/>
+    <property name="user" visible="false"/>
+   </component>
+  </composite>
+ </content>
+ <link href="nearme"/>
+</entry>
diff --git a/sca-cpp/trunk/hosting/server/data/apps/nearme/app.stats b/sca-cpp/trunk/hosting/server/data/apps/nearme/app.stats
index a072636788..5bc3a2ed3c 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/nearme/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme/app.stats
@@ -1 +1 @@
-((entry (title "nearme") (id "nearme")))
\ No newline at end of file
+((entry (title "nearme") (id "nearme") (author "admin@example.com") (updated "Jan 01, 2012") (content (stats (description "Sample app")))))
diff --git a/sca-cpp/trunk/hosting/server/data/apps/nearme/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/nearme/htdocs/app.html
index fba4b0464c..a7ac45d507 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/nearme/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme/htdocs/app.html
@@ -17,38 +17,45 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page">
- <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Nearme</H2>
- </SPAN>
- <SPAN id="me" class="h2" style="position: absolute; top: 0px; left: 101px; ">
-  <H2>=me</H2>
- </SPAN>
- <SPAN style="position: absolute; top: 0px; left: 182px; " class="text" id="mytime">
-  <SPAN>=mytime</SPAN>
- </SPAN>
- <SPAN id="page:section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
-  <SPAN>My friends</SPAN>
- </SPAN>
- <SPAN style="position: absolute; top: 54px; left: 2px; " class="entry" id="friend1">
-  <INPUT type="text" size="20" value="=friend1" autocapitalize="off"/>
- </SPAN>
- <SPAN style="position: absolute; top: 54px; left: 182px; " class="text" id="time1">
-  <SPAN>=time1</SPAN>
- </SPAN>
- <SPAN style="position: absolute; top: 81px; left: 2px; " class="entry" id="friend2">
-  <INPUT type="text" size="20" value="=friend2" autocapitalize="off"/>
- </SPAN>
- <SPAN style="position: absolute; top: 81px; left: 182px; " class="text" id="time2">
-  <SPAN>=time2</SPAN>
- </SPAN>
- <SPAN style="position: absolute; top: 108px; left: 2px; " class="entry" id="friend3">
-  <INPUT type="text" size="20" value="=friend3" autocapitalize="off"/>
- </SPAN>
- <SPAN style="position: absolute; top: 108px; left: 182px; " class="text" id="time3">
-  <SPAN>=time3</SPAN>
- </SPAN>
- <SPAN style="position: absolute; top: 135px; left: 2px; " class="img" id="mapimg">
-  <IMG src="/public/img.png"/>
- </SPAN>
-</DIV>
+<entry xmlns="http://www.w3.org/2005/Atom">
+ <title type="text">nearme</title>
+ <id>nearme</id>
+ <content type="application/xml">
+  <DIV id="page">
+   <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+    <H2>Nearme</H2>
+   </SPAN>
+   <SPAN id="me" class="h2" style="position: absolute; top: 0px; left: 101px; ">
+    <H2>=me</H2>
+   </SPAN>
+   <SPAN style="position: absolute; top: 0px; left: 182px; " class="text" id="mytime">
+    <SPAN>=mytime</SPAN>
+   </SPAN>
+   <SPAN id="page:section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
+    <SPAN>My friends</SPAN>
+   </SPAN>
+   <SPAN style="position: absolute; top: 54px; left: 2px; " class="entry" id="friend1">
+    <INPUT type="text" size="20" value="=friend1" autocapitalize="off"/>
+   </SPAN>
+   <SPAN style="position: absolute; top: 54px; left: 182px; " class="text" id="time1">
+    <SPAN>=time1</SPAN>
+   </SPAN>
+   <SPAN style="position: absolute; top: 81px; left: 2px; " class="entry" id="friend2">
+    <INPUT type="text" size="20" value="=friend2" autocapitalize="off"/>
+   </SPAN>
+   <SPAN style="position: absolute; top: 81px; left: 182px; " class="text" id="time2">
+    <SPAN>=time2</SPAN>
+   </SPAN>
+   <SPAN style="position: absolute; top: 108px; left: 2px; " class="entry" id="friend3">
+    <INPUT type="text" size="20" value="=friend3" autocapitalize="off"/>
+   </SPAN>
+   <SPAN style="position: absolute; top: 108px; left: 182px; " class="text" id="time3">
+    <SPAN>=time3</SPAN>
+   </SPAN>
+   <SPAN style="position: absolute; top: 135px; left: 2px; " class="img" id="mapimg">
+    <IMG src="/public/img.png"/>
+   </SPAN>
+  </DIV>
+ </content>
+ <link href="nearme"/>
+</entry>
diff --git a/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.composite b/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.composite
index 8038387e4a..cf41a420a5 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.composite
@@ -17,175 +17,182 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
- <service name="location" promote="location"/>
- <service name="start1" promote="start1"/>
- <service name="timer" promote="timer"/>
- <component x="250" y="230" name="append1" title="+" color="yellow1">
-  <implementation.python script="nuvem/append.py"/>
-  <service name="append"/>
-  <reference target="text5" name="first"/>
-  <reference target="get3" name="second"/>
- </component>
- <component x="250" y="330" name="append2" title="+" color="yellow1">
-  <implementation.python script="nuvem/append.py"/>
-  <service name="append"/>
-  <reference target="text6" name="first"/>
-  <reference target="get4" name="second"/>
- </component>
- <component x="120" y="10" name="filedb2" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="Cache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component x="410" y="260" name="filedb4" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="Cache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component x="400" y="370" name="filedb5" title="file" color="pink1">
-  <implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="Cache" visible="false"/>
-  <property name="host" visible="false"/>
- </component>
- <component x="270" y="260" name="get3" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb4" name="collection"/>
-  <reference target="text2" name="id"/>
- </component>
- <component x="270" y="350" name="get4" title="get" color="pink1">
-  <implementation.python script="nuvem/get.py"/>
-  <service name="get"/>
-  <reference target="filedb5" name="collection"/>
-  <reference target="text8" name="id"/>
- </component>
- <component x="200" y="230" name="gmap1" title="map" color="blue1">
-  <implementation.python script="nuvem/gmap.py"/>
-  <service name="gmap"/>
-  <reference target="list21" name="locations"/>
-  <reference name="s" visible="false">
-   <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
-  </reference>
- </component>
- <component x="150" y="230" name="htinline2" title="inline" color="white1">
-  <implementation.python script="nuvem/htinline.py"/>
-  <service name="htinline"/>
-  <reference target="gmap1" name="value"/>
- </component>
- <component x="40" y="150" name="item1" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="user1" name="value"/>
-  <property>me</property>
- </component>
- <component x="50" y="210" name="item10" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="htinline2" name="value"/>
-  <property>img</property>
- </component>
- <component x="290" y="90" name="item2" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="append1" name="value"/>
-  <property>S</property>
- </component>
- <component x="290" y="190" name="item3" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="append2" name="value"/>
-  <property>C</property>
- </component>
- <component x="190" y="240" name="list21" title="list" color="yellow1">
-  <implementation.python script="nuvem/pair.py"/>
-  <service name="list2"/>
-  <reference target="item2" name="first"/>
-  <reference target="item3" name="second"/>
- </component>
- <component x="100" y="110" name="list24" title="list" color="yellow1">
-  <implementation.python script="nuvem/pair.py"/>
-  <service name="list2"/>
-  <reference target="param10" name="first"/>
-  <reference target="param" name="second"/>
- </component>
- <component x="10" y="50" name="location" title="location" color="green1">
-  <implementation.python script="nuvem/location.py"/>
-  <service name="location" visible="false">
-   <binding.http uri="location"/>
-  </service>
-  <reference target="put1" name="content"/>
- </component>
- <component xmlns="" name="number" title="#" color="orange1">
-  <implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>10000</property>
- </component>
- <component x="280" y="90" name="param" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>longitude</property>
-  <property name="query" visible="false"/>
- </component>
- <component x="280" y="70" name="param10" title="?param" color="green1">
-  <implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>latitude</property>
-  <property name="query" visible="false"/>
- </component>
- <component x="70" y="60" name="put1" title="put" color="pink1">
-  <implementation.python script="nuvem/put.py"/>
-  <service name="put"/>
-  <reference target="filedb2" name="collection"/>
-  <reference target="user" name="id"/>
-  <reference target="list24" name="value"/>
- </component>
- <component x="10" y="10" name="start1" title="start" color="green1">
-  <implementation.python script="nuvem/start.py"/>
-  <service name="start" visible="false">
-   <binding.http uri="start"/>
-  </service>
-  <reference target="item1" name="content"/>
- </component>
- <component x="410" y="290" name="text2" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>john</property>
- </component>
- <component x="270" y="230" name="text5" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>blue</property>
- </component>
- <component x="270" y="320" name="text6" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>pink</property>
- </component>
- <component x="410" y="400" name="text8" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jane</property>
- </component>
- <component x="10" y="170" name="timer" title="timer" color="green1">
-  <implementation.python script="nuvem/timer.py"/>
-  <service name="timer" visible="false">
-   <binding.http uri="timer"/>
-  </service>
-  <reference target="number" name="n"/>
-  <reference target="item10" name="content"/>
- </component>
- <component xmlns="" x="120" y="30" name="user" title="user" color="green1">
-  <implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" visible="false"/>
- </component>
- <component x="80" y="20" name="user1" title="user" color="green1">
-  <implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" visible="false"/>
- </component>
-</composite>
+<entry xmlns="http://www.w3.org/2005/Atom">
+ <title type="text">nearme2</title>
+ <id>nearme2</id>
+ <content type="application/xml">
+  <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+   <service name="location" promote="location"/>
+   <service name="start1" promote="start1"/>
+   <service name="timer" promote="timer"/>
+   <component x="250" y="230" name="append1" title="+" color="yellow1">
+    <implementation.python script="nuvem/append.py"/>
+    <service name="append"/>
+    <reference target="text5" name="first"/>
+    <reference target="get3" name="second"/>
+   </component>
+   <component x="250" y="330" name="append2" title="+" color="yellow1">
+    <implementation.python script="nuvem/append.py"/>
+    <service name="append"/>
+    <reference target="text6" name="first"/>
+    <reference target="get4" name="second"/>
+   </component>
+   <component x="120" y="10" name="filedb2" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="Cache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component x="410" y="260" name="filedb4" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="Cache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component x="400" y="370" name="filedb5" title="file" color="pink1">
+    <implementation.python script="nuvem/filedb.py"/>
+    <service name="filedb"/>
+    <reference name="db" target="Cache" visible="false"/>
+    <property name="host" visible="false"/>
+   </component>
+   <component x="270" y="260" name="get3" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb4" name="collection"/>
+    <reference target="text2" name="id"/>
+   </component>
+   <component x="270" y="350" name="get4" title="get" color="pink1">
+    <implementation.python script="nuvem/get.py"/>
+    <service name="get"/>
+    <reference target="filedb5" name="collection"/>
+    <reference target="text8" name="id"/>
+   </component>
+   <component x="200" y="230" name="gmap1" title="map" color="blue1">
+    <implementation.python script="nuvem/gmap.py"/>
+    <service name="gmap"/>
+    <reference target="list21" name="locations"/>
+    <reference name="s" visible="false">
+     <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+    </reference>
+   </component>
+   <component x="150" y="230" name="htinline2" title="inline" color="white1">
+    <implementation.python script="nuvem/htinline.py"/>
+    <service name="htinline"/>
+    <reference target="gmap1" name="value"/>
+   </component>
+   <component x="40" y="150" name="item1" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="user1" name="value"/>
+    <property>me</property>
+   </component>
+   <component x="50" y="210" name="item10" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="htinline2" name="value"/>
+    <property>img</property>
+   </component>
+   <component x="290" y="90" name="item2" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="append1" name="value"/>
+    <property>S</property>
+   </component>
+   <component x="290" y="190" name="item3" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="append2" name="value"/>
+    <property>C</property>
+   </component>
+   <component x="190" y="240" name="list21" title="list" color="yellow1">
+    <implementation.python script="nuvem/pair.py"/>
+    <service name="list2"/>
+    <reference target="item2" name="first"/>
+    <reference target="item3" name="second"/>
+   </component>
+   <component x="100" y="110" name="list24" title="list" color="yellow1">
+    <implementation.python script="nuvem/pair.py"/>
+    <service name="list2"/>
+    <reference target="param10" name="first"/>
+    <reference target="param" name="second"/>
+   </component>
+   <component x="10" y="50" name="location" title="location" color="green1">
+    <implementation.python script="nuvem/location.py"/>
+    <service name="location" visible="false">
+     <binding.http uri="location"/>
+    </service>
+    <reference target="put1" name="content"/>
+   </component>
+   <component xmlns="" name="number" title="#" color="orange1">
+    <implementation.python script="nuvem/number.py"/>
+    <service name="number"/>
+    <property>10000</property>
+   </component>
+   <component x="280" y="90" name="param" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>longitude</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component x="280" y="70" name="param10" title="?param" color="green1">
+    <implementation.python script="nuvem/param.py"/>
+    <service name="param"/>
+    <property>latitude</property>
+    <property name="query" visible="false"/>
+   </component>
+   <component x="70" y="60" name="put1" title="put" color="pink1">
+    <implementation.python script="nuvem/put.py"/>
+    <service name="put"/>
+    <reference target="filedb2" name="collection"/>
+    <reference target="user" name="id"/>
+    <reference target="list24" name="value"/>
+   </component>
+   <component x="10" y="10" name="start1" title="start" color="green1">
+    <implementation.python script="nuvem/start.py"/>
+    <service name="start" visible="false">
+     <binding.http uri="start"/>
+    </service>
+    <reference target="item1" name="content"/>
+   </component>
+   <component x="410" y="290" name="text2" title=" '{propval}'" color="orange1">
+    <implementation.python script="nuvem/text.py"/>
+    <service name="text"/>
+    <property>john</property>
+   </component>
+   <component x="270" y="230" name="text5" title=" '{propval}'" color="orange1">
+    <implementation.python script="nuvem/text.py"/>
+    <service name="text"/>
+    <property>blue</property>
+   </component>
+   <component x="270" y="320" name="text6" title=" '{propval}'" color="orange1">
+    <implementation.python script="nuvem/text.py"/>
+    <service name="text"/>
+    <property>pink</property>
+   </component>
+   <component x="410" y="400" name="text8" title=" '{propval}'" color="orange1">
+    <implementation.python script="nuvem/text.py"/>
+    <service name="text"/>
+    <property>jane</property>
+   </component>
+   <component x="10" y="170" name="timer" title="timer" color="green1">
+    <implementation.python script="nuvem/timer.py"/>
+    <service name="timer" visible="false">
+     <binding.http uri="timer"/>
+    </service>
+    <reference target="number" name="n"/>
+    <reference target="item10" name="content"/>
+   </component>
+   <component xmlns="" x="120" y="30" name="user" title="user" color="green1">
+    <implementation.python script="nuvem/user.py"/>
+    <service name="user"/>
+    <property name="user" visible="false"/>
+   </component>
+   <component x="80" y="20" name="user1" title="user" color="green1">
+    <implementation.python script="nuvem/user.py"/>
+    <service name="user"/>
+    <property name="user" visible="false"/>
+   </component>
+  </composite>
+ </content>
+ <link href="nearme2"/>
+</entry>
diff --git a/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.stats b/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.stats
index 9eb239d22c..c6d99481ae 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.stats
@@ -1 +1 @@
-((entry (title "nearme2") (id "nearme2")))
+((entry (title "nearme2") (id "nearme2") (author "admin@example.com") (updated "Jan 01, 2012") (content (stats (description "Sample app")))))
diff --git a/sca-cpp/trunk/hosting/server/data/apps/nearme2/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/nearme2/htdocs/app.html
index a4c407a7a4..6e7cb49f94 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/nearme2/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme2/htdocs/app.html
@@ -17,14 +17,21 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page">
- <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
-  <H1>Hello</H1>
- </SPAN>
- <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 56px; ">
-  <H1>=me</H1>
- </SPAN>
- <SPAN id="img" class="img" style="position: absolute; top: 36px; left: 2px; ">
-  <IMG src="/public/img.png"/>
- </SPAN>
-</DIV>
+<entry xmlns="http://www.w3.org/2005/Atom">
+ <title type="text">nearme2</title>
+ <id>nearme2</id>
+ <content type="application/xml">
+  <DIV id="page">
+   <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+    <H1>Hello</H1>
+   </SPAN>
+   <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 56px; ">
+    <H1>=me</H1>
+   </SPAN>
+   <SPAN id="img" class="img" style="position: absolute; top: 36px; left: 2px; ">
+    <IMG src="/public/img.png"/>
+   </SPAN>
+  </DIV>
+ </content>
+ <link href="nearme2"/>
+</entry>