tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1098490 [3/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
Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite Mon May  2 05:58:47 2011
@@ -17,134 +17,134 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testlogic" name="testlogic">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="cos" promote="cos"/>
+ <service name="eval" promote="eval"/>
+ <service name="eval2" promote="eval2"/>
+ <service name="exec" promote="exec"/>
+ <service name="exec2" promote="exec2"/>
  <service name="if" promote="if"/>
- <component t:x="22" t:y="45" name="if" t:title="if" t:color="magenta1">
-  <t:implementation.python script="nuvem/if_.py"/>
-  <service name="if"/>
-  <reference target="greater" name="condition"/>
-  <reference target="text" name="then"/>
-  <reference target="text2" name="else"/>
+ <service name="random" promote="random"/>
+ <service name="sin" promote="sin"/>
+ <component t:x="20" t:y="251" name="cos" t:title="cos" t:color="magenta1">
+  <t:implementation.python script="nuvem/cos_.py"/>
+  <service name="cos"/>
+  <reference target="number7" name="x"/>
+ </component>
+ <component t:x="170" t:y="11" name="eval" t:title="expr" t:color="magenta1">
+  <t:implementation.python script="nuvem/eval_.py"/>
+  <service name="eval"/>
+  <reference target="text3" name="py"/>
+  <reference name="ref"/>
+ </component>
+ <component t:x="180" t:y="85" name="eval2" t:title="expr" t:color="magenta1">
+  <t:implementation.python script="nuvem/eval_.py"/>
+  <service name="eval"/>
+  <reference target="text4" name="py"/>
+  <reference target="number3" name="ref"/>
+ </component>
+ <component t:x="156" t:y="267" name="exec" t:title="script" t:color="magenta1">
+  <t:implementation.python script="nuvem/exec_.py"/>
+  <service name="exec"/>
+  <reference target="get" name="py"/>
+  <reference target="number4" name="ref"/>
+ </component>
+ <component t:x="160" t:y="172" name="exec2" t:title="script" t:color="magenta1">
+  <t:implementation.python script="nuvem/exec_.py"/>
+  <service name="exec"/>
+  <reference target="text6" name="py"/>
+  <reference target="number5" name="ref"/>
+ </component>
+ <component name="get" t:title="get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="text5" name="url"/>
  </component>
- <component t:x="75" t:y="24" name="greater" t:title="gt" t:color="magenta1">
+ <component name="greater" t:title="gt" t:color="magenta1">
   <t:implementation.python script="nuvem/greater.py"/>
   <service name="greater"/>
   <reference target="number2" name="value1"/>
   <reference target="number" name="value2"/>
  </component>
- <component t:x="118" t:y="66" name="number" t:title="#" t:color="orange1">
+ <component t:x="19" t:y="9" name="if" t:title="if" t:color="magenta1">
+  <t:implementation.python script="nuvem/if_.py"/>
+  <service name="if"/>
+  <reference target="greater" name="condition"/>
+  <reference target="text" name="then"/>
+  <reference target="text2" name="else"/>
+ </component>
+ <component name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component t:x="78" t:y="118" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>greater than 5</property>
- </component>
- <component t:x="76" t:y="162" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>not greater than 5</property>
- </component>
- <component t:x="88" t:y="25" name="number2" t:title="#" t:color="orange1">
+ <component name="number2" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3</property>
  </component>
- <service name="eval" promote="eval"/>
- <component t:x="235" t:y="46" name="eval" t:title="expr" t:color="magenta1">
-  <t:implementation.python script="nuvem/eval_.py"/>
-  <service name="eval"/>
-  <reference target="text3" name="py"/>
-  <reference name="ref"/>
+ <component name="number3" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>5</property>
  </component>
- <service name="eval2" promote="eval2"/>
- <component t:x="454" t:y="46" name="eval2" t:title="expr" t:color="magenta1">
-  <t:implementation.python script="nuvem/eval_.py"/>
-  <service name="eval"/>
-  <reference target="text4" name="py"/>
-  <reference target="number3" name="ref"/>
+ <component name="number4" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>5</property>
  </component>
- <component t:x="350" t:y="160" name="number3" t:title="#" t:color="orange1">
+ <component name="number5" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <service name="exec" promote="exec"/>
- <component t:x="234" t:y="233" name="exec" t:title="script" t:color="magenta1">
-  <t:implementation.python script="nuvem/exec_.py"/>
-  <service name="exec"/>
-  <reference target="get" name="py"/>
-  <reference target="number4" name="ref"/>
+ <component name="number6" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0.5</property>
  </component>
- <component t:x="357" t:y="289" name="number4" t:title="#" t:color="orange1">
+ <component name="number7" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>5</property>
+  <property>0.5</property>
  </component>
- <component t:x="358" t:y="267" name="get" t:title="get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="text5" name="url"/>
+ <component t:x="24" t:y="158" name="random" t:title="rand" t:color="magenta1">
+  <t:implementation.python script="nuvem/random_.py"/>
+  <service name="random"/>
  </component>
- <service name="exec2" promote="exec2"/>
- <component t:x="236" t:y="146" name="exec2" t:title="script" t:color="magenta1">
-  <t:implementation.python script="nuvem/exec_.py"/>
-  <service name="exec"/>
-  <reference target="text6" name="py"/>
-  <reference target="number5" name="ref"/>
+ <component t:x="21" t:y="198" name="sin" t:title="sin" t:color="magenta1">
+  <t:implementation.python script="nuvem/sin_.py"/>
+  <service name="sin"/>
+  <reference target="number6" name="x"/>
  </component>
- <component t:x="350" t:y="37" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>3.14116 * 5 * 5</property>
+  <property>greater than 5</property>
  </component>
- <component t:x="350" t:y="130" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>3.14116 * ref.get(r) * ref.get(r)</property>
+  <property>not greater than 5</property>
  </component>
- <component t:x="359" t:y="286" name="number5" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>5</property>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>3.14116 * 5 * 5</property>
  </component>
- <component t:x="357" t:y="245" name="text6" t:title=" '{propval}'" t:color="orange1">
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>val = 3.14116 * ref.get(r) * ref.get(r)</property>
+  <property>3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
- <component t:x="423" t:y="365" name="text5" t:title=" '{propval}'" t:color="orange1">
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://people.apache.org/~jsdelfino/tuscany/test/surface.py</property>
  </component>
- <service name="random" promote="random"/>
- <component t:x="43" t:y="208" name="random" t:title="rand" t:color="magenta1">
-  <t:implementation.python script="nuvem/random_.py"/>
-  <service name="random"/>
- </component>
- <service name="sin" promote="sin"/>
- <component t:x="44" t:y="258" name="sin" t:title="sin" t:color="magenta1">
-  <t:implementation.python script="nuvem/sin_.py"/>
-  <service name="sin"/>
-  <reference target="number6" name="x"/>
- </component>
- <component t:x="70" t:y="258" name="number6" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>0.5</property>
- </component>
- <service name="cos" promote="cos"/>
- <component t:x="40" t:y="316" name="cos" t:title="cos" t:color="magenta1">
-  <t:implementation.python script="nuvem/cos_.py"/>
-  <service name="cos"/>
-  <reference target="number7" name="x"/>
- </component>
- <component t:x="81" t:y="316" name="number7" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>0.5</property>
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>val = 3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
    (empty)

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite Mon May  2 05:58:47 2011
@@ -17,57 +17,29 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testsearch" name="testsearch">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="bingsearch" promote="bingsearch"/>
+ <service name="get" promote="get"/>
+ <service name="googlemap" promote="googlemap"/>
+ <service name="googlemap2" promote="googlemap2"/>
  <service name="googlesearch" promote="googlesearch"/>
- <component t:x="91" t:y="20" name="googlesearch" t:title="google" t:color="red1">
-  <t:implementation.python script="nuvem/gsearch.py"/>
-  <service name="googlesearch"/>
-  <reference target="text" name="query"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
-  </reference>
- </component>
  <service name="weather" promote="weather"/>
- <component t:x="92" t:y="70" name="weather" t:title="weather" t:color="red1">
-  <t:implementation.python script="nuvem/gweather.py"/>
-  <service name="weather"/>
-  <reference target="number" name="zip"/>
-  <reference name="ws" t:visible="false">
-   <t:binding.http uri="http://www.google.com/ig/api"/>
-  </reference>
- </component>
- <component t:x="141" t:y="95" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>94070</property>
- </component>
  <service name="weather2" promote="weather2"/>
- <component t:x="333" t:y="73" name="weather2" t:title="weather" t:color="red1">
-  <t:implementation.python script="nuvem/gweather.py"/>
-  <service name="weather"/>
-  <reference target="text2" name="zip"/>
-  <reference name="ws" t:visible="false">
-   <t:binding.http uri="http://www.google.com/ig/api"/>
+ <service name="yahoosearch" promote="yahoosearch"/>
+ <component t:x="336" t:y="48" name="bingsearch" t:title="bing" t:color="red1">
+  <t:implementation.python script="nuvem/bsearch.py"/>
+  <service name="bingsearch"/>
+  <reference target="text10" name="query"/>
+  <reference name="s" t:visible="false">
+   <t:binding.http uri="http://www.bing.com/search"/>
   </reference>
  </component>
- <component t:x="141" t:y="162" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>94070</property>
- </component>
- <service name="get" promote="get"/>
- <component t:x="43" t:y="348" name="get" t:title="get" t:color="green1">
+ <component t:x="20" t:y="300" name="get" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="141" t:y="234" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://maps.google.com/maps/api/staticmap?center=Brooklyn+Bridge,New+York,NY&amp;zoom=14&amp;size=512x512&amp;maptype=roadmap%20&amp;markers=color:blue|label:S|40.702147,-74.015794&amp;markers=color:green|label:G|40.711614,-74.012318%20&amp;markers=color:red|color:red|label:C|40.718217,-73.998284&amp;sensor=false</property>
- </component>
- <service name="googlemap" promote="googlemap"/>
- <component t:x="492" t:y="143" name="googlemap" t:title="google map" t:color="red1">
+ <component t:x="347" t:y="106" name="googlemap" t:title="google map" t:color="red1">
   <t:implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list2" name="locations"/>
@@ -75,8 +47,7 @@
    <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <service name="googlemap2" promote="googlemap2"/>
- <component t:x="90" t:y="144" name="googlemap2" t:title="google map" t:color="red1">
+ <component t:x="15" t:y="96" name="googlemap2" t:title="google map" t:color="red1">
   <t:implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list3" name="locations"/>
@@ -84,123 +55,152 @@
    <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component t:x="300" t:y="391" name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>-122.260526</property>
+ <component t:x="18" t:y="0" name="googlesearch" t:title="google" t:color="red1">
+  <t:implementation.python script="nuvem/gsearch.py"/>
+  <service name="googlesearch"/>
+  <reference target="text" name="query"/>
+  <reference name="s" t:visible="false">
+   <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
+  </reference>
  </component>
- <component t:x="303" t:y="659" name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>green</property>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text4" name="item" t:clonable="true"/>
+  <reference target="number2" name="item" t:clonable="true"/>
+  <reference target="number3" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="300" t:y="335" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>green</property>
+ <component name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="300" t:y="363" name="number2" t:title="#" t:color="orange1">
+ <component name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>94070</property>
+ </component>
+ <component name="number2" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>37.507156</property>
  </component>
- <component t:x="164" t:y="307" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="number3" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>-122.260526</property>
+ </component>
+ <component name="pair4" t:title="pair" t:color="yellow1">
+  <t:implementation.python script="nuvem/pair.py"/>
+  <service name="pair"/>
+  <reference target="text7" name="name"/>
+  <reference target="text5" name="value"/>
+ </component>
+ <component name="pair5" t:title="pair" t:color="yellow1">
+  <t:implementation.python script="nuvem/pair.py"/>
+  <service name="pair"/>
+  <reference target="text8" name="name"/>
+  <reference target="text6" name="value"/>
  </component>
- <component t:x="202" t:y="308" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="list" name="value"/>
   <property>A</property>
  </component>
- <component t:x="640" t:y="423" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text4" name="item" t:clonable="true"/>
-  <reference target="number2" name="item" t:clonable="true"/>
-  <reference target="number3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="208" t:y="532" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="pair4" name="value"/>
   <property>A</property>
  </component>
- <component t:x="512" t:y="485" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="text7" name="name"/>
-  <reference target="text5" name="value"/>
- </component>
- <component t:x="208" t:y="604" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="pair5" name="value"/>
   <property>B</property>
  </component>
- <component t:x="527" t:y="579" name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="text8" name="name"/>
-  <reference target="text6" name="value"/>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>apache tuscany</property>
  </component>
- <component t:x="315" t:y="212" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text10" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>yellow</property>
+  <property>apache tuscany</property>
  </component>
- <component t:x="315" t:y="240" name="text5" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>San Francisco, CA</property>
+  <property>94070</property>
  </component>
- <component t:x="315" t:y="312" name="text6" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>San Carlos, CA</property>
+  <property>http://maps.google.com/maps/api/staticmap?center=Brooklyn+Bridge,New+York,NY&amp;zoom=14&amp;size=512x512&amp;maptype=roadmap%20&amp;markers=color:blue|label:S|40.702147,-74.015794&amp;markers=color:green|label:G|40.711614,-74.012318%20&amp;markers=color:red|color:red|label:C|40.718217,-73.998284&amp;sensor=false</property>
  </component>
- <component t:x="161" t:y="212" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <service name="yahoosearch" promote="yahoosearch"/>
- <component t:x="333" t:y="22" name="yahoosearch" t:title="yahoo" t:color="red1">
-  <t:implementation.python script="nuvem/ysearch.py"/>
-  <service name="yahoosearch"/>
-  <reference target="text9" name="query"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
-  </reference>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>San Francisco, CA</property>
  </component>
- <component t:x="682" t:y="231" name="text9" t:title=" '{propval}'" t:color="orange1">
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>apache tuscany</property>
+  <property>San Carlos, CA</property>
  </component>
- <component t:x="173" t:y="31" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>apache tuscany</property>
+  <property>yellow</property>
+ </component>
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>green</property>
  </component>
- <component t:x="774" t:y="54" name="text10" t:title=" '{propval}'" t:color="orange1">
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>apache tuscany</property>
  </component>
- <service name="bingsearch" promote="bingsearch"/>
- <component t:x="569" t:y="22" name="bingsearch" t:title="bing" t:color="red1">
-  <t:implementation.python script="nuvem/bsearch.py"/>
-  <service name="bingsearch"/>
-  <reference target="text10" name="query"/>
+ <component t:x="18" t:y="49" name="weather" t:title="weather" t:color="red1">
+  <t:implementation.python script="nuvem/gweather.py"/>
+  <service name="weather"/>
+  <reference target="number" name="zip"/>
+  <reference name="ws" t:visible="false">
+   <t:binding.http uri="http://www.google.com/ig/api"/>
+  </reference>
+ </component>
+ <component t:x="190" t:y="51" name="weather2" t:title="weather" t:color="red1">
+  <t:implementation.python script="nuvem/gweather.py"/>
+  <service name="weather"/>
+  <reference target="text2" name="zip"/>
+  <reference name="ws" t:visible="false">
+   <t:binding.http uri="http://www.google.com/ig/api"/>
+  </reference>
+ </component>
+ <component t:x="204" t:y="5" name="yahoosearch" t:title="yahoo" t:color="red1">
+  <t:implementation.python script="nuvem/ysearch.py"/>
+  <service name="yahoosearch"/>
+  <reference target="text9" name="query"/>
   <reference name="s" t:visible="false">
-   <t:binding.http uri="http://www.bing.com/search"/>
+   <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
   </reference>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
    (empty)

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite Mon May  2 05:58:47 2011
@@ -17,60 +17,10 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testsocial" name="testsocial">
- <component t:x="485" t:y="164" name="twtimeline" t:title="twitter timeline" t:color="blue1">
-  <t:implementation.python script="nuvem/twtimeline.py"/>
-  <service name="twtimeline"/>
-  <reference target="text2" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
-  </reference>
- </component>
- <component t:x="477" t:y="201" name="twfriends" t:title="twitter friends" t:color="blue1">
-  <t:implementation.python script="nuvem/twfriends.py"/>
-  <service name="twfriends"/>
-  <reference target="text4" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
-  </reference>
- </component>
- <component t:x="488" t:y="254" name="twfollowers" t:title="twitter followers" t:color="blue1">
-  <t:implementation.python script="nuvem/twfollowers.py"/>
-  <service name="twfollowers"/>
-  <reference target="text5" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
-  </reference>
- </component>
- <component t:x="589" t:y="71" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>100001053301307</property>
- </component>
- <component t:x="252" t:y="308" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component t:x="745" t:y="149" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component t:x="493" t:y="132" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component t:x="334" t:y="462" name="twprofile" t:title="twitter profile" t:color="blue1">
-  <t:implementation.python script="nuvem/twprofile.py"/>
-  <service name="twprofile"/>
-  <reference target="text3" name="id"/>
-  <reference name="tw" t:visible="false">
-   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
-  </reference>
- </component>
- <component t:x="626" t:y="77" name="fbprofile" t:title="facebook profile" t:color="blue1">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="sendgtalk" promote="sendgtalk"/>
+ <service name="start" promote="start"/>
+ <component name="fbprofile" t:title="facebook profile" t:color="blue1">
   <t:implementation.python script="nuvem/fbprofile.py"/>
   <service name="fbprofile"/>
   <reference target="text" name="id"/>
@@ -78,102 +28,152 @@
    <t:binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component t:x="662" t:y="220" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
+ <component name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text7" name="pattern"/>
+  <reference target="list" name="values"/>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="204" t:y="35" name="appstart" t:title="start" t:color="green1">
-  <t:implementation.python script="nuvem/appstart.py"/>
-  <service name="appstart" t:visible="false">
-   <t:binding.http uri="appstart"/>
-  </service>
-  <reference target="list3" name="content"/>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="now" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="393" t:y="35" name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="fbprofile" name="value"/>
-  <property>name</property>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="393" t:y="79" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="now" t:title="now" t:color="orange1">
+  <t:implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+ </component>
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="twprofile" name="value"/>
   <property>twitprofile</property>
  </component>
- <component t:x="393" t:y="123" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="fbprofile" name="value"/>
+  <property>name</property>
+ </component>
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="twtimeline" name="value"/>
   <property>twittimeline</property>
  </component>
- <component t:x="393" t:y="167" name="property4" t:title="{propval} :" t:color="orange1">
+ <component name="property4" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="twfriends" name="value"/>
   <property>twitfriends</property>
  </component>
- <component t:x="393" t:y="211" name="property5" t:title="{propval} :" t:color="orange1">
+ <component name="property5" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="twfollowers" name="value"/>
   <property>twitfollowers</property>
  </component>
- <component t:x="318" t:y="35" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="34" t:y="286" name="sendgtalk" t:title="gtalk" t:color="blue1">
+  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+  <service name="sendgtalk"/>
+  <reference target="text8" name="jid"/>
+  <reference target="text9" name="pass"/>
+  <reference target="text6" name="to"/>
+  <reference target="format" name="msg"/>
+ </component>
+ <component t:x="33" t:y="12" name="start" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/start.py"/>
+  <service name="start" t:visible="false">
+   <t:binding.http uri="start"/>
+  </service>
+  <reference target="list3" name="content"/>
  </component>
- <component t:x="460" t:y="358" name="text6" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>xmppsca.2@gmail.com</property>
+  <property>100001053301307</property>
  </component>
- <component t:x="582" t:y="431" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>Hello, the time is {0}</property>
+  <property>jsdelfino</property>
  </component>
- <component t:x="623" t:y="452" name="now" t:title="now" t:color="orange1">
-  <t:implementation.python script="nuvem/now.py"/>
-  <service name="now"/>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
  </component>
- <component t:x="575" t:y="447" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="now" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
  </component>
- <component t:x="461" t:y="380" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text7" name="pattern"/>
-  <reference target="list" name="values"/>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
  </component>
- <service name="sendgtalk" promote="sendgtalk"/>
- <component t:x="410" t:y="318" name="sendgtalk" t:title="gtalk" t:color="blue1">
-  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
-  <service name="sendgtalk"/>
-  <reference target="text8" name="jid"/>
-  <reference target="text9" name="pass"/>
-  <reference target="text6" name="to"/>
-  <reference target="format" name="msg"/>
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.2@gmail.com</property>
+ </component>
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Hello, the time is {0}</property>
  </component>
- <component t:x="460" t:y="318" name="text8" t:title=" '{propval}'" t:color="orange1">
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmppsca.1@gmail.com</property>
  </component>
- <component t:x="460" t:y="346" name="text9" t:title=" '{propval}'" t:color="orange1">
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmpp4sca</property>
  </component>
+ <component name="twfollowers" t:title="twitter followers" t:color="blue1">
+  <t:implementation.python script="nuvem/twfollowers.py"/>
+  <service name="twfollowers"/>
+  <reference target="text5" name="id"/>
+  <reference name="tw" t:visible="false">
+   <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
+  </reference>
+ </component>
+ <component name="twfriends" t:title="twitter friends" t:color="blue1">
+  <t:implementation.python script="nuvem/twfriends.py"/>
+  <service name="twfriends"/>
+  <reference target="text4" name="id"/>
+  <reference name="tw" t:visible="false">
+   <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
+  </reference>
+ </component>
+ <component name="twprofile" t:title="twitter profile" t:color="blue1">
+  <t:implementation.python script="nuvem/twprofile.py"/>
+  <service name="twprofile"/>
+  <reference target="text3" name="id"/>
+  <reference name="tw" t:visible="false">
+   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
+  </reference>
+ </component>
+ <component name="twtimeline" t:title="twitter timeline" t:color="blue1">
+  <t:implementation.python script="nuvem/twtimeline.py"/>
+  <service name="twtimeline"/>
+  <reference target="text2" name="id"/>
+  <reference name="tw" t:visible="false">
+   <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
+  </reference>
+ </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
    (empty)

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite Mon May  2 05:58:47 2011
@@ -17,200 +17,200 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testtext" name="testtext">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
  <service name="contains" promote="contains"/>
- <component t:x="34" t:y="33" name="contains" t:title="contains" t:color="magenta1">
+ <service name="format" promote="format"/>
+ <service name="format2" promote="format2"/>
+ <service name="join" promote="join"/>
+ <service name="lowercase" promote="lowercase"/>
+ <service name="parse" promote="parse"/>
+ <service name="replace" promote="replace"/>
+ <service name="split" promote="split"/>
+ <service name="uppercase" promote="uppercase"/>
+ <component t:x="19" t:y="7" name="contains" t:title="contains" t:color="magenta1">
   <t:implementation.python script="nuvem/contains.py"/>
   <service name="contains"/>
   <reference target="text10" name="search"/>
   <reference target="text9" name="string"/>
  </component>
- <service name="split" promote="split"/>
- <component t:x="34" t:y="140" name="split" t:title="split" t:color="magenta1">
-  <t:implementation.python script="nuvem/split.py"/>
-  <service name="split"/>
-  <reference target="text11" name="separator"/>
-  <reference target="text12" name="string"/>
+ <component t:x="176" t:y="115" name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text13" name="pattern"/>
+  <reference target="list" name="values"/>
  </component>
- <service name="join" promote="join"/>
- <component t:x="420" t:y="25" name="join" t:title="join" t:color="magenta1">
+ <component t:x="369" t:y="141" name="format2" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text14" name="pattern"/>
+  <reference target="list3" name="values"/>
+ </component>
+ <component t:x="361" t:y="8" name="join" t:title="join" t:color="magenta1">
   <t:implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text6" name="separator"/>
   <reference target="list2" name="list"/>
  </component>
- <service name="replace" promote="replace"/>
- <component t:x="204" t:y="27" name="replace" t:title="replace" t:color="magenta1">
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text15" name="item" t:clonable="true"/>
+  <reference target="text16" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list2" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text7" name="item" t:clonable="true"/>
+  <reference target="text8" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="20" t:y="226" name="lowercase" t:title="lower" t:color="magenta1">
+  <t:implementation.python script="nuvem/lowercase.py"/>
+  <service name="lowercase"/>
+  <reference target="text2" name="string"/>
+ </component>
+ <component t:x="142" t:y="252" name="parse" t:title="parse" t:color="magenta1">
+  <t:implementation.python script="nuvem/parse.py"/>
+  <service name="parse"/>
+  <reference target="text19" name="regexp"/>
+  <reference target="text20" name="string"/>
+ </component>
+ <component name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text17" name="value"/>
+  <property>a</property>
+ </component>
+ <component name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text18" name="value"/>
+  <property>b</property>
+ </component>
+ <component t:x="175" t:y="6" name="replace" t:title="replace" t:color="magenta1">
   <t:implementation.python script="nuvem/replace.py"/>
   <service name="replace"/>
   <reference target="text4" name="from"/>
   <reference target="text5" name="to"/>
   <reference target="text3" name="string"/>
  </component>
- <service name="lowercase" promote="lowercase"/>
- <component t:x="34" t:y="297" name="lowercase" t:title="lower" t:color="magenta1">
-  <t:implementation.python script="nuvem/lowercase.py"/>
-  <service name="lowercase"/>
-  <reference target="text2" name="string"/>
- </component>
- <service name="uppercase" promote="uppercase"/>
- <component t:x="35" t:y="236" name="uppercase" t:title="upper" t:color="magenta1">
-  <t:implementation.python script="nuvem/uppercase.py"/>
-  <service name="uppercase"/>
-  <reference target="text" name="string"/>
+ <component t:x="23" t:y="89" name="split" t:title="split" t:color="magenta1">
+  <t:implementation.python script="nuvem/split.py"/>
+  <service name="split"/>
+  <reference target="text11" name="separator"/>
+  <reference target="text12" name="string"/>
  </component>
- <component t:x="391" t:y="223" name="text" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component t:x="391" t:y="150" name="text2" t:title=" '{propval}'" t:color="orange1">
+ <component name="text10" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>ABC</property>
+  <property>cd</property>
  </component>
- <component t:x="376" t:y="81" name="text3" t:title=" '{propval}'" t:color="orange1">
+ <component name="text11" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abcxdefxghi</property>
+  <property>x</property>
  </component>
- <component t:x="377" t:y="20" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component name="text12" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>x</property>
+  <property>abcxdefxghi</property>
  </component>
- <component t:x="376" t:y="63" name="text5" t:title=" '{propval}'" t:color="orange1">
+ <component name="text13" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>y</property>
+  <property>The {0} brown {1}</property>
  </component>
- <component t:x="107" t:y="56" name="text9" t:title=" '{propval}'" t:color="orange1">
+ <component name="text14" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abcdef</property>
+  <property>The {a} brown {b}</property>
  </component>
- <component t:x="107" t:y="14" name="text10" t:title=" '{propval}'" t:color="orange1">
+ <component name="text15" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>cd</property>
+  <property>quick</property>
  </component>
- <component t:x="587" t:y="20" name="text6" t:title=" '{propval}'" t:color="orange1">
+ <component name="text16" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>x</property>
+  <property>fox</property>
  </component>
- <component t:x="85" t:y="156" name="text11" t:title=" '{propval}'" t:color="orange1">
+ <component name="text17" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>x</property>
+  <property>quick</property>
  </component>
- <component t:x="89" t:y="193" name="text12" t:title=" '{propval}'" t:color="orange1">
+ <component name="text18" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abcxdefxghi</property>
- </component>
- <component t:x="583" t:y="60" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text7" name="item" t:clonable="true"/>
-  <reference target="text8" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <property>fox</property>
  </component>
- <component t:x="662" t:y="61" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component name="text19" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>abc</property>
+  <property>city (.*) state (.*)</property>
  </component>
- <component t:x="655" t:y="98" name="text8" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>def</property>
- </component>
- <service name="format" promote="format"/>
- <component t:x="220" t:y="170" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text13" name="pattern"/>
-  <reference target="list" name="values"/>
- </component>
- <service name="format2" promote="format2"/>
- <component t:x="444" t:y="164" name="format2" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
-  <service name="format"/>
-  <reference target="text14" name="pattern"/>
-  <reference target="list3" name="values"/>
+  <property>ABC</property>
  </component>
- <component t:x="365" t:y="194" name="text13" t:title=" '{propval}'" t:color="orange1">
+ <component name="text20" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>The {0} brown {1}</property>
- </component>
- <component t:x="369" t:y="238" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text15" name="item" t:clonable="true"/>
-  <reference target="text16" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <property>city San Francisco state CA</property>
  </component>
- <component t:x="444" t:y="236" name="text15" t:title=" '{propval}'" t:color="orange1">
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>quick</property>
+  <property>abcxdefxghi</property>
  </component>
- <component t:x="438" t:y="274" name="text16" t:title=" '{propval}'" t:color="orange1">
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>fox</property>
+  <property>x</property>
  </component>
- <component t:x="599" t:y="198" name="text14" t:title=" '{propval}'" t:color="orange1">
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>The {a} brown {b}</property>
- </component>
- <component t:x="603" t:y="239" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="parse" promote="parse"/>
- <component t:x="218" t:y="325" name="parse" t:title="parse" t:color="magenta1">
-  <t:implementation.python script="nuvem/parse.py"/>
-  <service name="parse"/>
-  <reference target="text19" name="regexp"/>
-  <reference target="text20" name="string"/>
+  <property>y</property>
  </component>
- <component t:x="89" t:y="428" name="text20" t:title=" '{propval}'" t:color="orange1">
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>city San Francisco state CA</property>
+  <property>x</property>
  </component>
- <component t:x="89" t:y="388" name="text19" t:title=" '{propval}'" t:color="orange1">
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>city (.*) state (.*)</property>
- </component>
- <component t:x="589" t:y="215" name="property" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text17" name="value"/>
-  <property>a</property>
+  <property>abc</property>
  </component>
- <component t:x="840" t:y="241" name="text17" t:title=" '{propval}'" t:color="orange1">
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>quick</property>
- </component>
- <component t:x="586" t:y="254" name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text18" name="value"/>
-  <property>b</property>
+  <property>def</property>
  </component>
- <component t:x="837" t:y="299" name="text18" t:title=" '{propval}'" t:color="orange1">
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>fox</property>
+  <property>abcdef</property>
+ </component>
+ <component t:x="20" t:y="172" name="uppercase" t:title="upper" t:color="magenta1">
+  <t:implementation.python script="nuvem/uppercase.py"/>
+  <service name="uppercase"/>
+  <reference target="text" name="string"/>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
    (empty)

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite Mon May  2 05:58:47 2011
@@ -17,56 +17,25 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testurl" name="testurl">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="email" promote="email"/>
  <service name="host" promote="host"/>
- <component t:x="40" t:y="30" name="host" t:title="host" t:color="green1">
-  <t:implementation.python script="nuvem/host.py"/>
-  <service name="host"/>
-  <property name="host"/>
- </component>
- <service name="path" promote="path"/>
- <component t:x="39" t:y="81" name="path" t:title="path" t:color="green1">
-  <t:implementation.python script="nuvem/path.py"/>
-  <service name="path"/>
-  <property name="path"/>
- </component>
  <service name="params" promote="params"/>
- <component t:x="41" t:y="133" name="params" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
-  <service name="params"/>
-  <property name="params"/>
- </component>
- <service name="user" promote="user"/>
- <component t:x="37" t:y="198" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user"/>
- </component>
+ <service name="path" promote="path"/>
  <service name="realm" promote="realm"/>
- <component t:x="35" t:y="254" name="realm" t:title="realm" t:color="green1">
-  <t:implementation.python script="nuvem/realm.py"/>
-  <service name="realm"/>
-  <property name="realm"/>
- </component>
- <service name="email" promote="email"/>
- <component t:x="35" t:y="316" name="email" t:title="email" t:color="green1">
+ <service name="url" promote="url"/>
+ <service name="user" promote="user"/>
+ <component t:x="17" t:y="223" name="email" t:title="email" t:color="green1">
   <t:implementation.python script="nuvem/email.py"/>
   <service name="email"/>
   <property name="email"/>
  </component>
- <service name="url" promote="url"/>
- <component t:x="162" t:y="36" name="url" t:title="url" t:color="green1">
-  <t:implementation.python script="nuvem/url.py"/>
-  <service name="url"/>
-  <reference target="text" name="address"/>
-  <reference target="list" name="args"/>
- </component>
- <component t:x="240" t:y="27" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://sca-store.com/</property>
+ <component t:x="14" t:y="1" name="host" t:title="host" t:color="green1">
+  <t:implementation.python script="nuvem/host.py"/>
+  <service name="host"/>
+  <property name="host"/>
  </component>
- <component t:x="242" t:y="58" name="list" t:title="list" t:color="yellow1">
+ <component name="list" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="text2" name="item" t:clonable="true"/>
@@ -76,47 +45,78 @@
   <reference target="property3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="280" t:y="61" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test</property>
+ <component name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>123</property>
  </component>
- <component t:x="282" t:y="90" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>path</property>
+ <component t:x="16" t:y="91" name="params" t:title="?params" t:color="green1">
+  <t:implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="params"/>
  </component>
- <component t:x="277" t:y="108" name="property" t:title="{propval} :" t:color="orange1">
+ <component t:x="17" t:y="48" name="path" t:title="path" t:color="green1">
+  <t:implementation.python script="nuvem/path.py"/>
+  <service name="path"/>
+  <property name="path"/>
+ </component>
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text4" name="value"/>
   <property>parmx</property>
  </component>
- <component t:x="276" t:y="169" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text5" name="value"/>
   <property>parmy</property>
  </component>
- <component t:x="271" t:y="224" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number" name="value"/>
   <property>parmn</property>
  </component>
- <component t:x="385" t:y="228" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>123</property>
+ <component t:x="14" t:y="177" name="realm" t:title="realm" t:color="green1">
+  <t:implementation.python script="nuvem/realm.py"/>
+  <service name="realm"/>
+  <property name="realm"/>
  </component>
- <component t:x="386" t:y="169" name="text5" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>yy</property>
+  <property>http://sca-store.com/</property>
  </component>
- <component t:x="386" t:y="110" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test</property>
+ </component>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>path</property>
+ </component>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xx</property>
  </component>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>yy</property>
+ </component>
+ <component t:x="117" t:y="14" name="url" t:title="url" t:color="green1">
+  <t:implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference target="text" name="address"/>
+  <reference target="list" name="args"/>
+ </component>
+ <component t:x="16" t:y="134" name="user" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user"/>
+ </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
    (empty)



Mime
View raw message