tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1098490 [1/4] - in /tuscany/sca-cpp/trunk/modules/edit: apps/buzzprofile/ apps/me360/ apps/me360/htdocs/ apps/nearme/ apps/nearme/htdocs/ apps/ourphotos/ apps/ourphotos/htdocs/ apps/shoppingcart/ apps/shoppingcart/htdocs/ apps/slice/ apps/...
Date Mon, 02 May 2011 05:58:49 GMT
Author: jsdelfino
Date: Mon May  2 05:58:47 2011
New Revision: 1098490

URL: http://svn.apache.org/viewvc?rev=1098490&view=rev
Log:
Reformat, sort and refactor test and sample apps.

Added:
    tuscany/sca-cpp/trunk/modules/edit/apps/me360/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/test/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html
      - copied, changed from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
    tuscany/sca-cpp/trunk/modules/edit/store/all
Removed:
    tuscany/sca-cpp/trunk/modules/edit/apps/buzzprofile/
    tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/test/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
    tuscany/sca-cpp/trunk/modules/edit/store/myapps
    tuscany/sca-cpp/trunk/modules/edit/store/tests
Modified:
    tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/slice/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/control/palette.composite

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.composite Mon May  2 05:58:47 2011
@@ -17,19 +17,23 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://me360" name="me360">
- <component t:x="635" t:y="232" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference name="item" t:clonable="true"/>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="buzz" promote="buzz"/>
+ <service name="start" promote="start"/>
+ <component t:x="15" t:y="218" name="buzz" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="get" name="content"/>
  </component>
- <component t:x="574" t:y="204" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text3" name="pattern"/>
-  <reference target="list" name="values"/>
+ <component name="bzprofile" t:title="buzz profile" t:color="blue1">
+  <t:implementation.python script="nuvem/bzprofile.py"/>
+  <service name="bzprofile"/>
+  <reference target="text4" name="id"/>
+  <reference name="bz" t:visible="false">
+   <t:binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
+  </reference>
  </component>
- <component t:x="453" t:y="45" name="fbprofile" t:title="facebook profile" t:color="blue1">
+ <component name="fbprofile" t:title="facebook profile" t:color="blue1">
   <t:implementation.python script="nuvem/fbprofile.py"/>
   <service name="fbprofile"/>
   <reference target="text" name="id"/>
@@ -37,20 +41,24 @@
    <t:binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component t:x="433" t:y="87" name="twprofile" t:title="twitter profile" t:color="blue1">
-  <t:implementation.python script="nuvem/twprofile.py"/>
-  <service name="twprofile"/>
-  <reference target="text2" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
-  </reference>
+ <component name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text3" name="pattern"/>
+  <reference target="list" name="values"/>
+ </component>
+ <component name="get" t:title="get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="format" name="url"/>
  </component>
- <component t:x="491" t:y="108" name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>buzz</property>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text5" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="242" t:y="23" name="list2" t:title="list" t:color="yellow1">
+ <component name="list2" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="property" name="item" t:clonable="true"/>
@@ -58,76 +66,62 @@
   <reference target="property3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="126" t:y="23" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="list2" name="content"/>
+ <component name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="fbprofile" name="value"/>
+  <property>fbprofile</property>
  </component>
- <component t:x="224" t:y="222" name="get" t:title="get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="format" name="url"/>
+ <component name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twprofile" name="value"/>
+  <property>twitprofile</property>
  </component>
- <service name="buzz" promote="buzz"/>
- <component name="buzz" t:x="127" t:y="220" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="get" name="content"/>
+ <component name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="bzprofile" name="value"/>
+  <property>buzzprofile</property>
+ </component>
+ <component t:x="15" t:y="32" name="start" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/start.py"/>
+  <service name="start" t:visible="false">
+   <t:binding.http uri="start"/>
+  </service>
+  <reference target="list2" name="content"/>
  </component>
- <component t:x="276" t:y="220" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
- </component>
- <service name="call" promote="call"/>
- <component t:x="583" t:y="156" name="call" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
- </component>
- <component t:x="306" t:y="111" name="bzprofile" t:title="buzz profile" t:color="blue1">
-  <t:implementation.python script="nuvem/bzprofile.py"/>
-  <service name="bzprofile"/>
-  <reference target="text4" name="id"/>
-  <reference name="bz" t:visible="false">
-   <t:binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
-  </reference>
+  <property>100001053301307</property>
  </component>
- <component t:x="398" t:y="25" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>100001053301307</property>
+  <property>jsdelfino</property>
  </component>
- <component t:x="213" t:y="23" name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="fbprofile" name="value"/>
-  <property>fbprofile</property>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
  </component>
- <component t:x="394" t:y="67" name="text2" t:title=" '{propval}'" t:color="orange1">
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="395" t:y="111" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="213" t:y="67" name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="twprofile" name="value"/>
-  <property>twitprofile</property>
- </component>
- <component t:x="213" t:y="111" name="property3" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="bzprofile" name="value"/>
-  <property>buzzprofile</property>
+ <component name="twprofile" t:title="twitter profile" t:color="blue1">
+  <t:implementation.python script="nuvem/twprofile.py"/>
+  <service name="twprofile"/>
+  <reference target="text2" name="id"/>
+  <reference name="tw" t:visible="false">
+   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
+  </reference>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/me360/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html Mon May  2 05:58:47 2011
@@ -18,16 +18,13 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Me360</H2>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
-  <SPAN>Facebook</SPAN>
- </SPAN>
  <SPAN id="section" class="section" style="position: absolute; top: 225px; width: 100%; left: 2px; ">
   <SPAN>Twitter</SPAN>
  </SPAN>
- <SPAN id="fbprofile" class="table" style="position: absolute; top: 54px; left: 2px; ">
+ <SPAN id="section" class="section" style="position: absolute; top: 1143px; width: 100%; left: 2px; ">
+  <SPAN>Buzz</SPAN>
+ </SPAN>
+ <SPAN id="buzzprofile" class="table" style="position: absolute; top: 1170px; left: 2px; ">
   <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
@@ -55,10 +52,13 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 1143px; width: 100%; left: 2px; ">
-  <SPAN>Buzz</SPAN>
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Me360</H2>
  </SPAN>
- <SPAN id="buzzprofile" class="table" style="position: absolute; top: 1170px; left: 2px; ">
+ <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
+  <SPAN>Facebook</SPAN>
+ </SPAN>
+ <SPAN id="fbprofile" class="table" style="position: absolute; top: 54px; left: 2px; ">
   <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite Mon May  2 05:58:47 2011
@@ -17,428 +17,428 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://nearme" name="nearme">
- <component xmlns="" t:x="811" t:y="384" name="filedb4" t:title="file" t:color="red1">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="geolocation" promote="geolocation"/>
+ <service name="getlocs" promote="getlocs"/>
+ <service name="map" promote="map"/>
+ <service name="nearme" promote="nearme"/>
+ <service name="start2" promote="start2"/>
+ <service name="timer" promote="timer"/>
+ <component name="append" t:title="+" t:color="yellow1">
+  <t:implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference target="params" name="first"/>
+  <reference target="call2" name="second"/>
+ </component>
+ <component name="call" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call2" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name2" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call3" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name4" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="call4" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name3" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component name="filedb" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="814" t:y="554" name="filedb5" t:title="file" t:color="red1">
+ <component name="filedb10" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="169" t:y="168" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component name="filedb11" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="792" t:y="284" name="filedb6" t:title="file" t:color="red1">
+ <component xmlns="" name="filedb4" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="648" t:y="185" name="filedb7" t:title="file" t:color="red1">
+ <component xmlns="" name="filedb5" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="898" t:y="284" name="filedb8" t:title="file" t:color="red1">
+ <component xmlns="" name="filedb6" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="675" t:y="394" name="filedb9" t:title="file" t:color="red1">
+ <component xmlns="" name="filedb7" t:title="file" t:color="red1">
   <t:implementation.python script="nuvem/filedb.py"/>
   <service name="filedb"/>
   <reference name="db" target="AppDataFileCache" t:visible="false"/>
   <property name="host" t:visible="false"/>
  </component>
- <component t:x="729" t:y="59" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>/components/map</property>
+ <component xmlns="" name="filedb8" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
  </component>
- <component xmlns="" t:x="387" t:y="32" name="user3" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
+ <component xmlns="" name="filedb9" t:title="file" t:color="red1">
+  <t:implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" t:visible="false"/>
+  <property name="host" t:visible="false"/>
+ </component>
+ <component t:x="389" t:y="111" name="geolocation" t:title="location" t:color="green1">
+  <t:implementation.python script="nuvem/geolocation.py"/>
+  <service name="geolocation" t:visible="false">
+   <t:binding.http uri="geolocation"/>
+  </service>
+  <reference target="put" name="content"/>
  </component>
- <component xmlns="" t:x="265" t:y="625" name="get4" t:title="get" t:color="red1">
+ <component name="get10" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb5" name="collection"/>
-  <reference target="param4" name="id"/>
+  <reference target="filedb11" name="collection"/>
+  <reference target="param5" name="id"/>
  </component>
- <component xmlns="" t:x="268" t:y="540" name="get3" t:title="get" t:color="red1">
+ <component xmlns="" name="get3" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb4" name="collection"/>
   <reference target="param3" name="id"/>
  </component>
- <component t:x="471" t:y="20" name="filedb10" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="475" t:y="51" name="user5" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user" t:visible="false"/>
- </component>
- <component t:x="513" t:y="1" name="get9" t:title="get" t:color="red1">
+ <component xmlns="" name="get4" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb10" name="collection"/>
-  <reference target="user5" name="id"/>
+  <reference target="filedb5" name="collection"/>
+  <reference target="param4" name="id"/>
  </component>
- <component t:x="544" t:y="97" name="get10" t:title="get" t:color="red1">
+ <component xmlns="" name="get5" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb11" name="collection"/>
-  <reference target="param5" name="id"/>
- </component>
- <component t:x="578" t:y="98" name="filedb11" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="264" t:y="221" name="param10" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>latitude</property>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="338" t:y="564" name="param3" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend2</property>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="340" t:y="631" name="param4" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend3</property>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="698" t:y="120" name="param5" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>friend1</property>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="652" t:y="43" name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="get9" name="value"/>
-  <property>x</property>
- </component>
- <component t:x="652" t:y="115" name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="get10" name="value"/>
-  <property>1</property>
- </component>
- <component t:x="653" t:y="193" name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="get3" name="value"/>
-  <property>2</property>
- </component>
- <component t:x="655" t:y="261" name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="get4" name="value"/>
-  <property>3</property>
- </component>
- <component t:x="785" t:y="175" name="append" t:title="+" t:color="yellow1">
-  <t:implementation.python script="nuvem/append.py"/>
-  <service name="append"/>
-  <reference target="params" name="first"/>
-  <reference target="call2" name="second"/>
- </component>
- <component xmlns="" t:x="846" t:y="183" name="params" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
-  <service name="params"/>
-  <property name="query" t:visible="false"/>
- </component>
- <component t:x="745" t:y="153" name="url" t:title="url" t:color="green1">
-  <t:implementation.python script="nuvem/url.py"/>
-  <service name="url"/>
-  <reference target="text2" name="address"/>
-  <reference target="append" name="args"/>
+  <reference target="filedb6" name="collection"/>
+  <reference target="param2" name="id"/>
  </component>
- <component xmlns="" t:x="812" t:y="270" name="get6" t:title="get" t:color="red1">
+ <component xmlns="" name="get6" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb7" name="collection"/>
   <reference target="user4" name="id"/>
  </component>
- <component t:x="743" t:y="270" name="last" t:title="last" t:color="yellow1">
-  <t:implementation.python script="nuvem/last.py"/>
-  <service name="last"/>
-  <reference target="get6" name="list"/>
- </component>
- <component xmlns="" t:x="802" t:y="353" name="get5" t:title="get" t:color="red1">
+ <component xmlns="" name="get7" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb6" name="collection"/>
-  <reference target="param2" name="id"/>
+  <reference target="filedb8" name="collection"/>
+  <reference target="param7" name="id"/>
  </component>
- <component xmlns="" t:x="802" t:y="423" name="get8" t:title="get" t:color="red1">
+ <component xmlns="" name="get8" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
   <reference target="filedb9" name="collection"/>
   <reference target="param6" name="id"/>
  </component>
- <component xmlns="" t:x="800" t:y="495" name="get7" t:title="get" t:color="red1">
+ <component name="get9" t:title="get" t:color="red1">
   <t:implementation.python script="nuvem/get.py"/>
   <service name="get"/>
-  <reference target="filedb8" name="collection"/>
-  <reference target="param7" name="id"/>
+  <reference target="filedb10" name="collection"/>
+  <reference target="user5" name="id"/>
  </component>
- <component t:x="734" t:y="347" name="last2" t:title="last" t:color="yellow1">
+ <component t:x="394" t:y="352" name="getlocs" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list3" name="content"/>
+ </component>
+ <component xmlns="" name="googlemap" t:title="google map" t:color="red1">
+  <t:implementation.python script="nuvem/gmap.py"/>
+  <service name="googlemap"/>
+  <reference target="call" name="locations"/>
+  <reference name="s" t:visible="false">
+   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  </reference>
+ </component>
+ <component name="last" t:title="last" t:color="yellow1">
+  <t:implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference target="get6" name="list"/>
+ </component>
+ <component name="last2" t:title="last" t:color="yellow1">
   <t:implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get5" name="list"/>
  </component>
- <component t:x="733" t:y="387" name="last3" t:title="last" t:color="yellow1">
+ <component name="last3" t:title="last" t:color="yellow1">
   <t:implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get8" name="list"/>
  </component>
- <component t:x="731" t:y="420" name="last4" t:title="last" t:color="yellow1">
+ <component name="last4" t:title="last" t:color="yellow1">
   <t:implementation.python script="nuvem/last.py"/>
   <service name="last"/>
   <reference target="get7" name="list"/>
  </component>
- <component t:x="836" t:y="377" name="param2" t:title="?param" t:color="green1">
+ <component xmlns="" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text7" name="item" t:clonable="true"/>
+  <reference target="param10" name="item" t:clonable="true"/>
+  <reference target="param" name="item" t:clonable="true"/>
+  <reference target="now" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component xmlns="" name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="property6" name="item" t:clonable="true"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property11" name="item" t:clonable="true"/>
+  <reference target="property12" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="42" t:y="616" name="map" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="googlemap" name="content"/>
+ </component>
+ <component name="name" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>getlocs</property>
+ </component>
+ <component name="name2" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>getlocs</property>
+ </component>
+ <component name="name3" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>nearme</property>
+ </component>
+ <component name="name4" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>nearme</property>
+ </component>
+ <component t:x="39" t:y="80" name="nearme" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="list2" name="content"/>
+ </component>
+ <component name="now" t:title="now" t:color="orange1">
+  <t:implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+  <reference target="text" name="format"/>
+ </component>
+ <component xmlns="" name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>5000</property>
+ </component>
+ <component name="param" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>longitude</property>
+  <property name="query" t:visible="false"/>
+ </component>
+ <component name="param10" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>latitude</property>
+  <property name="query" t:visible="false"/>
+ </component>
+ <component name="param2" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend1</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="836" t:y="457" name="param6" t:title="?param" t:color="green1">
+ <component name="param3" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend2</property>
   <property name="query" t:visible="false"/>
  </component>
- <component t:x="836" t:y="537" name="param7" t:title="?param" t:color="green1">
+ <component name="param4" t:title="?param" t:color="green1">
   <t:implementation.python script="nuvem/param.py"/>
   <service name="param"/>
   <property>friend3</property>
   <property name="query" t:visible="false"/>
  </component>
- <component xmlns="" t:x="258" t:y="167" name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>green</property>
+ <component name="param5" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>friend1</property>
+  <property name="query" t:visible="false"/>
  </component>
- <component xmlns="" t:x="185" t:y="167" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text7" name="item" t:clonable="true"/>
-  <reference target="param10" name="item" t:clonable="true"/>
-  <reference target="param" name="item" t:clonable="true"/>
-  <reference target="now" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="param6" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>friend2</property>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="193" t:y="855" name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="last3" name="value"/>
-  <property>time2</property>
+ <component name="param7" t:title="?param" t:color="green1">
+  <t:implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>friend3</property>
+  <property name="query" t:visible="false"/>
+ </component>
+ <component xmlns="" name="params" t:title="?params" t:color="green1">
+  <t:implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="query" t:visible="false"/>
  </component>
- <component t:x="196" t:y="775" name="property8" t:title="{propval} :" t:color="orange1">
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="last2" name="value"/>
-  <property>time1</property>
+  <reference target="user3" name="value"/>
+  <property>me</property>
  </component>
- <component t:x="198" t:y="1012" name="property10" t:title="{propval} :" t:color="orange1">
+ <component name="property10" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="url" name="value"/>
   <property>mapimg</property>
  </component>
- <component t:x="197" t:y="695" name="property9" t:title="{propval} :" t:color="orange1">
+ <component name="property11" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="last" name="value"/>
-  <property>mytime</property>
+  <reference target="get9" name="value"/>
+  <property>x</property>
  </component>
- <component t:x="195" t:y="658" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="property12" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="user3" name="value"/>
-  <property>me</property>
+  <reference target="get10" name="value"/>
+  <property>1</property>
  </component>
- <component t:x="188" t:y="276" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property4" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="last4" name="value"/>
-  <property>time3</property>
+  <reference target="get3" name="value"/>
+  <property>2</property>
  </component>
- <component t:x="528" t:y="412" name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>getlocs</property>
+ <component name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="get4" name="value"/>
+  <property>3</property>
  </component>
- <component t:x="447" t:y="411" name="call2" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name2" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property6" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last4" name="value"/>
+  <property>time3</property>
  </component>
- <component t:x="225" t:y="61" name="call" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="property7" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last3" name="value"/>
+  <property>time2</property>
  </component>
- <component xmlns="" t:x="181" t:y="63" name="googlemap" t:title="google map" t:color="red1">
-  <t:implementation.python script="nuvem/gmap.py"/>
-  <service name="googlemap"/>
-  <reference target="call" name="locations"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
-  </reference>
+ <component name="property8" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last2" name="value"/>
+  <property>time1</property>
  </component>
- <service name="map" promote="map"/>
- <component t:x="129" t:y="599" name="map" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="googlemap" name="content"/>
+ <component name="property9" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="last" name="value"/>
+  <property>mytime</property>
  </component>
- <component xmlns="" t:x="732" t:y="111" name="put" t:title="put" t:color="red1">
+ <component xmlns="" name="put" t:title="put" t:color="red1">
   <t:implementation.python script="nuvem/put.py"/>
   <service name="put"/>
   <reference target="filedb" name="collection"/>
   <reference target="user" name="id"/>
   <reference target="list" name="value"/>
  </component>
- <service name="geolocation" promote="geolocation"/>
- <component t:x="545" t:y="103" name="geolocation" t:title="location" t:color="green1">
-  <t:implementation.python script="nuvem/geolocation.py"/>
-  <service name="geolocation" t:visible="false">
-   <t:binding.http uri="geolocation"/>
-  </service>
-  <reference target="put" name="content"/>
- </component>
- <component t:x="751" t:y="357" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property11" name="item" t:clonable="true"/>
-  <reference target="property12" name="item" t:clonable="true"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="getlocs" promote="getlocs"/>
- <component t:x="551" t:y="334" name="getlocs" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="list3" name="content"/>
- </component>
- <component t:x="290" t:y="5" name="name3" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>nearme</property>
- </component>
- <component t:x="358" t:y="62" name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>getlocs</property>
- </component>
- <component t:x="832" t:y="35" name="name4" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>nearme</property>
- </component>
- <service name="appstart2" promote="appstart2"/>
- <component t:x="130" t:y="12" name="appstart2" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
+ <component t:x="40" t:y="21" name="start2" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/start.py"/>
+  <service name="start" t:visible="false">
+   <t:binding.http uri="start"/>
   </service>
   <reference target="call4" name="content"/>
  </component>
- <component t:x="196" t:y="8" name="call4" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name3" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>%a %b %d, %I:%M %p</property>
  </component>
- <component xmlns="" t:x="734" t:y="11" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>5000</property>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>/components/map</property>
  </component>
- <component t:x="729" t:y="42" name="call3" t:title="call" t:color="green1">
-  <t:implementation.python script="nuvem/call.py"/>
-  <service name="call"/>
-  <reference target="name4" name="name"/>
-  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ <component xmlns="" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <service name="every" promote="every"/>
- <component t:x="543" t:y="8" name="every" t:title="timer" t:color="green1">
-  <t:implementation.python script="nuvem/every.py"/>
-  <service name="every" t:visible="false">
-   <t:binding.http uri="every"/>
+ <component t:x="357" t:y="21" name="timer" t:title="timer" t:color="green1">
+  <t:implementation.python script="nuvem/timer.py"/>
+  <service name="timer" t:visible="false">
+   <t:binding.http uri="timer"/>
   </service>
   <reference target="number" name="n"/>
   <reference target="call3" name="content"/>
  </component>
- <component xmlns="" t:x="514" t:y="128" name="user4" t:title="user" t:color="green1">
+ <component name="url" t:title="url" t:color="green1">
+  <t:implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference target="text2" name="address"/>
+  <reference target="append" name="args"/>
+ </component>
+ <component xmlns="" name="user" t:title="user" t:color="green1">
   <t:implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user" t:visible="false"/>
  </component>
- <component xmlns="" t:x="190" t:y="81" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference target="property9" name="item" t:clonable="true"/>
-  <reference target="property8" name="item" t:clonable="true"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference target="property6" name="item" t:clonable="true"/>
-  <reference target="property10" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="nearme" promote="nearme"/>
- <component t:x="128" t:y="70" name="nearme" t:title="{compname}" t:color="green1">
-  <t:implementation.python script="nuvem/service.py"/>
-  <service name="service" t:visible="false"/>
-  <reference target="list2" name="content"/>
- </component>
- <component t:x="863" t:y="102" name="filedb" t:title="file" t:color="red1">
-  <t:implementation.python script="nuvem/filedb.py"/>
-  <service name="filedb"/>
-  <reference name="db" target="AppDataFileCache" t:visible="false"/>
-  <property name="host" t:visible="false"/>
- </component>
- <component t:x="691" t:y="215" name="param" t:title="?param" t:color="green1">
-  <t:implementation.python script="nuvem/param.py"/>
-  <service name="param"/>
-  <property>longitude</property>
-  <property name="query" t:visible="false"/>
+ <component xmlns="" name="user3" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="691" t:y="243" name="now" t:title="now" t:color="orange1">
-  <t:implementation.python script="nuvem/now.py"/>
-  <service name="now"/>
-  <reference target="text" name="format"/>
+ <component xmlns="" name="user4" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
- <component t:x="736" t:y="243" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>%a %b %d, %I:%M %p</property>
+ <component name="user5" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" t:visible="false"/>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html Mon May  2 05:58:47 2011
@@ -18,37 +18,37 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0pt; left: 0px; ">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Nearme</H2>
  </SPAN>
  <SPAN id="me" class="h2" style="position: absolute; top: 0px; left: 101px; ">
   <H2>me</H2>
  </SPAN>
- <SPAN style="position: absolute; top: 81px; left: 2px; " class="entry" id="friend2">
-  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+ <SPAN style="position: absolute; top: 0px; left: 182px; " class="text" id="mytime">
+  <SPAN>updating...</SPAN>
  </SPAN>
- <SPAN style="position: absolute; top: 108px; left: 2px; " class="entry" id="friend3">
-  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+ <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
+  <SPAN>My friends</SPAN>
  </SPAN>
- <SPAN style="position: absolute; top: 135px; left: 2px; " class="img" id="mapimg">
-  <IMG src="https://sca-store.com:8453/public/img.png"/>
+ <SPAN style="position: absolute; top: 54px; left: 2px; " class="entry" id="friend1">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
  </SPAN>
  <SPAN style="position: absolute; top: 54px; left: 182px; " class="text" id="time1">
   <SPAN>last seen...</SPAN>
  </SPAN>
+ <SPAN style="position: absolute; top: 81px; left: 2px; " class="entry" id="friend2">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+ </SPAN>
  <SPAN style="position: absolute; top: 81px; left: 182px; " class="text" id="time2">
   <SPAN>last seen...</SPAN>
  </SPAN>
+ <SPAN style="position: absolute; top: 108px; left: 2px; " class="entry" id="friend3">
+  <INPUT type="text" size="20" value="" autocapitalize="off"/>
+ </SPAN>
  <SPAN style="position: absolute; top: 108px; left: 182px; " class="text" id="time3">
   <SPAN>last seen...</SPAN>
  </SPAN>
- <SPAN style="position: absolute; top: 0px; left: 182px; " class="text" id="mytime">
-  <SPAN>updating...</SPAN>
- </SPAN>
- <SPAN style="position: absolute; top: 54px; left: 2px; " class="entry" id="friend1">
-  <INPUT type="text" size="20" value="" autocapitalize="off"/>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
-  <SPAN>My friends</SPAN>
+ <SPAN style="position: absolute; top: 135px; left: 2px; " class="img" id="mapimg">
+  <IMG src="https://sca-store.com:8453/public/img.png"/>
  </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite Mon May  2 05:58:47 2011
@@ -17,82 +17,57 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://ourphotos" name="ourphotos">
- <component t:x="191" t:y="433" name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>61049883@N06</property>
- </component>
- <component t:x="820" t:y="140" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component t:x="190" t:y="69" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="valueof2" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="430" t:y="52" name="name5" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>image</property>
- </component>
- <component t:x="524" t:y="108" name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>image</property>
- </component>
- <component t:x="659" t:y="141" name="shuffle" t:title="shuffle" t:color="yellow1">
-  <t:implementation.python script="nuvem/shuffle_.py"/>
-  <service name="shuffle"/>
-  <reference target="append" name="list"/>
- </component>
- <component t:x="565" t:y="373" name="append" t:title="+" t:color="yellow1">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="start" promote="start"/>
+ <component name="append" t:title="+" t:color="yellow1">
   <t:implementation.python script="nuvem/append.py"/>
   <service name="append"/>
   <reference target="values" name="first"/>
   <reference target="values2" name="second"/>
  </component>
- <component t:x="438" t:y="31" name="foreach2" t:title="foreach" t:color="yellow1">
+ <component name="flkalbum" t:title="flicker album" t:color="blue1">
+  <t:implementation.python script="nuvem/flkalbum.py"/>
+  <service name="flkalbum"/>
+  <reference target="text7" name="id"/>
+  <reference name="flk" t:visible="false">
+   <t:binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
+  </reference>
+ </component>
+ <component name="foreach2" t:title="foreach" t:color="yellow1">
   <t:implementation.python script="nuvem/map_.py"/>
   <service name="foreach"/>
   <reference target="name5" name="item"/>
   <reference target="format" name="transform"/>
   <reference target="shuffle" name="list"/>
  </component>
- <component t:x="501" t:y="59" name="format" t:title="format" t:color="magenta1">
+ <component name="format" t:title="format" t:color="magenta1">
   <t:implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text2" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <component t:x="318" t:y="26" name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="foreach2" name="value"/>
-  <property>images</property>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="valueof2" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="193" t:y="37" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="property" name="content"/>
+ <component name="name3" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>src</property>
  </component>
- <component t:x="553" t:y="52" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>&lt;img src=&quot;{0}&quot; width=&quot;320&quot;/&gt;</property>
+ <component name="name4" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>m</property>
  </component>
- <component t:x="586" t:y="148" name="name3" t:title="" t:color="orange1">
+ <component name="name5" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>src</property>
+  <property>image</property>
  </component>
- <component t:x="590" t:y="175" name="picalbum" t:title="picasa album" t:color="blue1">
+ <component name="picalbum" t:title="picasa album" t:color="blue1">
   <t:implementation.python script="nuvem/picalbum.py"/>
   <service name="picalbum"/>
   <reference target="text5" name="id"/>
@@ -100,39 +75,64 @@
    <t:binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
   </reference>
  </component>
- <component t:x="605" t:y="240" name="name4" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>m</property>
+ <component name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="foreach2" name="value"/>
+  <property>images</property>
  </component>
- <component t:x="606" t:y="265" name="flkalbum" t:title="flicker album" t:color="blue1">
-  <t:implementation.python script="nuvem/flkalbum.py"/>
-  <service name="flkalbum"/>
-  <reference target="text7" name="id"/>
-  <reference name="flk" t:visible="false">
-   <t:binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
-  </reference>
+ <component name="search" t:title="search" t:color="yellow1">
+  <t:implementation.python script="nuvem/search.py"/>
+  <service name="search"/>
+  <reference target="name3" name="path"/>
+  <reference target="picalbum" name="list"/>
+ </component>
+ <component name="search2" t:title="search" t:color="yellow1">
+  <t:implementation.python script="nuvem/search.py"/>
+  <service name="search"/>
+  <reference target="name4" name="path"/>
+  <reference target="flkalbum" name="list"/>
+ </component>
+ <component name="shuffle" t:title="shuffle" t:color="yellow1">
+  <t:implementation.python script="nuvem/shuffle_.py"/>
+  <service name="shuffle"/>
+  <reference target="append" name="list"/>
+ </component>
+ <component t:x="14" t:y="19" name="start" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/start.py"/>
+  <service name="start" t:visible="false">
+   <t:binding.http uri="start"/>
+  </service>
+  <reference target="property" name="content"/>
+ </component>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>&lt;img src=&quot;{0}&quot; width=&quot;320&quot;/&gt;</property>
+ </component>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
  </component>
- <component t:x="497" t:y="147" name="values" t:title="values" t:color="yellow1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>61049883@N06</property>
+ </component>
+ <component name="valueof2" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>image</property>
+ </component>
+ <component name="values" t:title="values" t:color="yellow1">
   <t:implementation.python script="nuvem/values.py"/>
   <service name="values"/>
   <reference target="search" name="list"/>
  </component>
- <component t:x="486" t:y="228" name="values2" t:title="values" t:color="yellow1">
+ <component name="values2" t:title="values" t:color="yellow1">
   <t:implementation.python script="nuvem/values.py"/>
   <service name="values"/>
   <reference target="search2" name="list"/>
  </component>
- <component t:x="542" t:y="223" name="search2" t:title="search" t:color="yellow1">
-  <t:implementation.python script="nuvem/search.py"/>
-  <service name="search"/>
-  <reference target="name4" name="path"/>
-  <reference target="flkalbum" name="list"/>
- </component>
- <component t:x="540" t:y="144" name="search" t:title="search" t:color="yellow1">
-  <t:implementation.python script="nuvem/search.py"/>
-  <service name="search"/>
-  <reference target="name3" name="path"/>
-  <reference target="picalbum" name="list"/>
- </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html Mon May  2 05:58:47 2011
@@ -18,10 +18,10 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 9px; left: 2px; ">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Our Photos</H2>
  </SPAN>
- <SPAN id="images" class="list" style="position: absolute; top: 45px; left: 2px; ">
+ <SPAN id="images" class="list" style="position: absolute; top: 27px; left: 2px; ">
   <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>



Mime
View raw message