tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1126306 [3/5] - in /tuscany/sca-cpp/trunk/modules/edit: apps/me360/ apps/me360/htdocs/ apps/nearme/ apps/nearme/htdocs/ apps/new/ apps/new/htdocs/ apps/ourphotos/ apps/ourphotos/htdocs/ apps/shoppingcart/ apps/shoppingcart/htdocs/ apps/sli...
Date Mon, 23 May 2011 04:25:29 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=1126306&r1=1126305&r2=1126306&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 23 04:25:27 2011
@@ -17,7 +17,7 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="cos" promote="cos"/>
  <service name="eval" promote="eval"/>
  <service name="eval2" promote="eval2"/>
@@ -26,124 +26,124 @@
  <service name="if" promote="if"/>
  <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"/>
+ <component x="20" y="251" name="cos" title="cos" color="magenta1">
+  <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"/>
+ <component x="170" y="11" name="eval" title="expr" color="magenta1">
+  <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"/>
+ <component x="180" y="85" name="eval2" title="expr" color="magenta1">
+  <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"/>
+ <component x="156" y="267" name="exec" title="script" color="magenta1">
+  <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"/>
+ <component x="160" y="172" name="exec2" title="script" color="magenta1">
+  <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">
+ <component name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
- <component name="greater" t:title="gt" t:color="magenta1">
-  <t:implementation.python script="nuvem/greater.py"/>
+ <component name="greater" title="gt" color="magenta1">
+  <implementation.python script="nuvem/greater.py"/>
   <service name="greater"/>
   <reference target="number2" name="value1"/>
   <reference target="number" name="value2"/>
  </component>
- <component t:x="19" t:y="9" name="if" t:title="if" t:color="magenta1">
-  <t:implementation.python script="nuvem/if_.py"/>
+ <component x="19" y="9" name="if" title="if" color="magenta1">
+  <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"/>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component name="number2" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number2" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3</property>
  </component>
- <component name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number3" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component name="number5" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number5" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component name="number6" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number6" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0.5</property>
  </component>
- <component name="number7" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number7" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0.5</property>
  </component>
- <component t:x="24" t:y="158" name="random" t:title="rand" t:color="magenta1">
-  <t:implementation.python script="nuvem/random_.py"/>
+ <component x="24" y="158" name="random" title="rand" color="magenta1">
+  <implementation.python script="nuvem/random_.py"/>
   <service name="random"/>
  </component>
- <component t:x="21" t:y="198" name="sin" t:title="sin" t:color="magenta1">
-  <t:implementation.python script="nuvem/sin_.py"/>
+ <component x="21" y="198" name="sin" title="sin" color="magenta1">
+  <implementation.python script="nuvem/sin_.py"/>
   <service name="sin"/>
   <reference target="number6" name="x"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>greater than 5</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>not greater than 5</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>3.14116 * 5 * 5</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://people.apache.org/~jsdelfino/tuscany/test/surface.py</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>val = 3.14116 * ref.get(r) * ref.get(r)</property>
  </component>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Test logic components</H2>
  </SPAN>
 </DIV>

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=1126306&r1=1126305&r2=1126306&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 23 04:25:27 2011
@@ -17,190 +17,224 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="bingsearch" promote="bingsearch"/>
+ <service name="gaddress1" promote="gaddress1"/>
  <service name="get" promote="get"/>
+ <service name="ggeopos1" promote="ggeopos1"/>
  <service name="googlemap" promote="googlemap"/>
  <service name="googlemap2" promote="googlemap2"/>
  <service name="googlesearch" promote="googlesearch"/>
  <service name="weather" promote="weather"/>
  <service name="weather2" promote="weather2"/>
  <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"/>
+ <component x="336" y="48" name="bingsearch" title="bing" color="red1">
+  <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 name="s" visible="false">
+   <binding.http uri="http://www.bing.com/search"/>
   </reference>
  </component>
- <component t:x="20" t:y="300" name="get" t:title="get" t:color="green1">
+ <component x="650" y="20" name="gaddress1" title="address" color="red1">
+  <implementation.python script="nuvem/gaddress.py"/>
+  <service name="gaddress"/>
+  <reference target="text1" name="address"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
+  </reference>
+ </component>
+ <component x="20" y="300" name="get" title="get" color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text3" name="url"/>
  </component>
- <component t:x="347" t:y="106" name="googlemap" t:title="google map" t:color="red1">
-  <t:implementation.python script="nuvem/gmap.py"/>
+ <component x="650" y="80" name="ggeopos1" title="geo position" color="red1">
+  <implementation.python script="nuvem/ggeopos.py"/>
+  <service name="ggeopos"/>
+  <reference target="number1" name="latitude"/>
+  <reference target="number4" name="longitude"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/>
+  </reference>
+ </component>
+ <component x="347" y="106" name="googlemap" title="google map" color="red1">
+  <implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list2" name="locations"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component t:x="15" t:y="96" name="googlemap2" t:title="google map" t:color="red1">
-  <t:implementation.python script="nuvem/gmap.py"/>
+ <component x="15" y="96" name="googlemap2" title="google map" color="red1">
+  <implementation.python script="nuvem/gmap.py"/>
   <service name="googlemap"/>
   <reference target="list3" name="locations"/>
-  <reference name="s" t:visible="false">
-   <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/>
+  <reference name="s" visible="false">
+   <binding.http uri="http://maps.google.com/maps/api/staticmap"/>
   </reference>
  </component>
- <component t:x="18" t:y="0" name="googlesearch" t:title="google" t:color="red1">
-  <t:implementation.python script="nuvem/gsearch.py"/>
+ <component x="18" y="0" name="googlesearch" title="google" color="red1">
+  <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 name="s" visible="false">
+   <binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/>
   </reference>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="list" name="value"/>
+  <property>A</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="pair4" name="value"/>
+  <property>A</property>
+ </component>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="pair5" name="value"/>
+  <property>B</property>
+ </component>
+ <component name="list" title="list" color="yellow1">
+  <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"/>
+  <reference target="text4" name="item" clonable="true"/>
+  <reference target="number2" name="item" clonable="true"/>
+  <reference target="number3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <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"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number" title="#" color="orange1">
+  <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"/>
+ <component x="730" y="80" name="number1" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>37.507156</property>
+ </component>
+ <component name="number2" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>37.507156</property>
  </component>
- <component name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number3" title="#" color="orange1">
+  <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"/>
+ <component x="730" y="120" name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>-122.260526</property>
+ </component>
+ <component name="pair4" title="pair" color="yellow1">
+  <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"/>
+ <component name="pair5" title="pair" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
   <service name="pair"/>
   <reference target="text8" name="name"/>
   <reference target="text6" name="value"/>
  </component>
- <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 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 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 name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>apache tuscany</property>
  </component>
- <component name="text10" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component x="710" y="20" name="text1" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>San Carlos, CA</property>
+ </component>
+ <component name="text10" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>apache tuscany</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>94070</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <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>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>green</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>San Francisco, CA</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>San Carlos, CA</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>yellow</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>green</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>apache tuscany</property>
  </component>
- <component t:x="18" t:y="49" name="weather" t:title="weather" t:color="red1">
-  <t:implementation.python script="nuvem/gweather.py"/>
+ <component x="18" y="49" name="weather" title="weather" color="red1">
+  <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 name="ws" visible="false">
+   <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"/>
+ <component x="190" y="51" name="weather2" title="weather" color="red1">
+  <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 name="ws" visible="false">
+   <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"/>
+ <component x="204" y="5" name="yahoosearch" title="yahoo" color="red1">
+  <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 name="s" visible="false">
+   <binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/>
   </reference>
  </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
   <H1>Test search components</H1>
  </SPAN>
 </DIV>

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=1126306&r1=1126305&r2=1126306&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 23 04:25:27 2011
@@ -17,74 +17,74 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 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"/>
+ <component name="fbprofile" title="facebook profile" color="blue1">
+  <implementation.python script="nuvem/fbprofile.py"/>
   <service name="fbprofile"/>
   <reference target="text" name="id"/>
-  <reference name="fb" t:visible="false">
-   <t:binding.http uri="https://graph.facebook.com"/>
+  <reference name="fb" visible="false">
+   <binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component name="format" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text7" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="now" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="now" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <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"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="now" t:title="now" t:color="orange1">
-  <t:implementation.python script="nuvem/now.py"/>
+ <component name="now" title="now" color="orange1">
+  <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"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="twprofile" name="value"/>
   <property>twitprofile</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <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"/>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="twtimeline" name="value"/>
   <property>twittimeline</property>
  </component>
- <component name="property4" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item4" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="twfriends" name="value"/>
   <property>twitfriends</property>
  </component>
- <component name="property5" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item5" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="twfollowers" name="value"/>
   <property>twitfollowers</property>
  </component>
- <component t:x="34" t:y="286" name="sendgtalk" t:title="gtalk" t:color="blue1">
+ <component x="34" y="286" name="sendgtalk" title="gtalk" color="blue1">
   <implementation.cpp path="lib/chat" library="libchat-sender2"/>
   <service name="sendgtalk"/>
   <reference target="text8" name="jid"/>
@@ -92,88 +92,88 @@
   <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"/>
+ <component x="33" y="12" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="list3" name="content"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>100001053301307</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>Hello, the time is {0}</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xmppsca.1@gmail.com</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="twfollowers" title="twitter followers" color="blue1">
+  <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 name="tw" visible="false">
+   <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"/>
+ <component name="twfriends" title="twitter friends" color="blue1">
+  <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 name="tw" visible="false">
+   <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"/>
+ <component name="twprofile" title="twitter profile" color="blue1">
+  <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 name="tw" visible="false">
+   <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"/>
+ <component name="twtimeline" title="twitter timeline" color="blue1">
+  <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 name="tw" visible="false">
+   <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
   </reference>
  </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
   <H1>Test social components</H1>
  </SPAN>
 </DIV>

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=1126306&r1=1126305&r2=1126306&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 23 04:25:27 2011
@@ -17,7 +17,7 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="contains" promote="contains"/>
  <service name="format" promote="format"/>
  <service name="format2" promote="format2"/>
@@ -27,189 +27,189 @@
  <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"/>
+ <component x="19" y="7" name="contains" title="contains" color="magenta1">
+  <implementation.python script="nuvem/contains.py"/>
   <service name="contains"/>
   <reference target="text10" name="search"/>
   <reference target="text9" name="string"/>
  </component>
- <component t:x="176" t:y="115" name="format" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component x="176" y="115" name="format" title="format" color="magenta1">
+  <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text13" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <component t:x="369" t:y="141" name="format2" t:title="format" t:color="magenta1">
-  <t:implementation.python script="nuvem/format_.py"/>
+ <component x="369" y="141" name="format2" title="format" color="magenta1">
+  <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"/>
+ <component x="361" y="8" name="join" title="join" color="magenta1">
+  <implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text6" name="separator"/>
   <reference target="list2" name="list"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list" title="list" color="yellow1">
+  <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"/>
+  <reference target="text15" name="item" clonable="true"/>
+  <reference target="text16" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list2" title="list" color="yellow1">
+  <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"/>
+  <reference target="text7" name="item" clonable="true"/>
+  <reference target="text8" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list3" title="list" color="yellow1">
+  <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"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference name="item" 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"/>
+ <component x="20" y="226" name="lowercase" title="lower" color="magenta1">
+  <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"/>
+ <component x="142" y="252" name="parse" title="parse" color="magenta1">
+  <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"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <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"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <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"/>
+ <component x="175" y="6" name="replace" title="replace" color="magenta1">
+  <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>
- <component t:x="23" t:y="89" name="split" t:title="split" t:color="magenta1">
-  <t:implementation.python script="nuvem/split.py"/>
+ <component x="23" y="89" name="split" title="split" color="magenta1">
+  <implementation.python script="nuvem/split.py"/>
   <service name="split"/>
   <reference target="text11" name="separator"/>
   <reference target="text12" name="string"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component name="text10" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text10" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cd</property>
  </component>
- <component name="text11" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text11" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component name="text12" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text12" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcxdefxghi</property>
  </component>
- <component name="text13" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text13" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>The {0} brown {1}</property>
  </component>
- <component name="text14" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text14" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>The {a} brown {b}</property>
  </component>
- <component name="text15" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text15" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>quick</property>
  </component>
- <component name="text16" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text16" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>fox</property>
  </component>
- <component name="text17" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text17" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>quick</property>
  </component>
- <component name="text18" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text18" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>fox</property>
  </component>
- <component name="text19" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text19" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>city (.*) state (.*)</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>ABC</property>
  </component>
- <component name="text20" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text20" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>city San Francisco state CA</property>
  </component>
- <component name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcxdefxghi</property>
  </component>
- <component name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>y</property>
  </component>
- <component name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text6" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>def</property>
  </component>
- <component name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <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"/>
+ <component x="20" y="172" name="uppercase" title="upper" color="magenta1">
+  <implementation.python script="nuvem/uppercase.py"/>
   <service name="uppercase"/>
   <reference target="text" name="string"/>
  </component>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Test text processing components</H2>
  </SPAN>
 </DIV>

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=1126306&r1=1126305&r2=1126306&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 23 04:25:27 2011
@@ -17,105 +17,129 @@
  * 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" name="app" targetNamespace="http://app">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="email" promote="email"/>
  <service name="host" promote="host"/>
+ <service name="keychain1" promote="keychain1"/>
+ <service name="keychain2" promote="keychain2"/>
  <service name="params" promote="params"/>
  <service name="path" promote="path"/>
  <service name="realm" promote="realm"/>
  <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"/>
+ <component x="17" y="223" name="email" title="email" color="green1">
+  <implementation.python script="nuvem/email.py"/>
   <service name="email"/>
   <property name="email"/>
  </component>
- <component t:x="14" t:y="1" name="host" t:title="host" t:color="green1">
-  <t:implementation.python script="nuvem/host.py"/>
+ <component x="14" y="1" name="host" title="host" color="green1">
+  <implementation.python script="nuvem/host.py"/>
   <service name="host"/>
   <property name="host"/>
  </component>
- <component name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text4" name="value"/>
+  <property>parmx</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text5" name="value"/>
+  <property>parmy</property>
+ </component>
+ <component name="item3" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="number" name="value"/>
+  <property>parmn</property>
+ </component>
+ <component x="330" y="60" name="keychain1" title="keychain" color="green1">
+  <implementation.python script="nuvem/keychain.py"/>
+  <service name="keychain"/>
+  <reference target="text1" name="name"/>
+  <reference name="account" target="Accounts" visible="false"/>
+ </component>
+ <component x="330" y="10" name="keychain2" title="keychain" color="green1">
+  <implementation.python script="nuvem/keychain.py"/>
+  <service name="keychain"/>
+  <reference target="name1" name="name"/>
+  <reference name="account" target="Accounts" visible="false"/>
+ </component>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text2" name="item" t:clonable="true"/>
-  <reference target="text3" name="item" t:clonable="true"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text2" name="item" clonable="true"/>
+  <reference target="text3" name="item" clonable="true"/>
+  <reference target="item" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component x="400" y="10" name="name1" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>key2</property>
  </component>
- <component name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>123</property>
  </component>
- <component t:x="16" t:y="91" name="params" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
+ <component x="16" y="91" name="params" title="?params" color="green1">
+  <implementation.python script="nuvem/params.py"/>
   <service name="params"/>
   <property name="params"/>
  </component>
- <component t:x="17" t:y="48" name="path" t:title="path" t:color="green1">
-  <t:implementation.python script="nuvem/path.py"/>
+ <component x="17" y="48" name="path" title="path" color="green1">
+  <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 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 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="14" t:y="177" name="realm" t:title="realm" t:color="green1">
-  <t:implementation.python script="nuvem/realm.py"/>
+ <component x="14" y="177" name="realm" title="realm" color="green1">
+  <implementation.python script="nuvem/realm.py"/>
   <service name="realm"/>
   <property name="realm"/>
  </component>
- <component name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://sca-store.com/</property>
  </component>
- <component name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
+ <component x="400" y="10" name="text1" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>key2</property>
+ </component>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component x="120" y="10" name="url" title="url" color="green1">
+  <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"/>
+ <component x="16" y="134" name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user"/>
  </component>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,7 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Test url components</H2>
  </SPAN>
 </DIV>



Mime
View raw message