tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1098490 [4/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/testvalues/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite Mon May  2 05:58:47 2011
@@ -17,436 +17,436 @@
  * 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://testvalues" name="testvalues">
+<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="empty" promote="empty"/>
+ <service name="false" promote="false"/>
+ <service name="first" promote="first"/>
+ <service name="itemnb" promote="itemnb"/>
+ <service name="list8" promote="list8"/>
+ <service name="list9" promote="list9"/>
+ <service name="lookup" promote="lookup"/>
  <service name="name" promote="name"/>
- <component t:x="36" t:y="152" name="name" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>abc</property>
- </component>
+ <service name="nothing" promote="nothing"/>
+ <service name="reduce2" promote="reduce2"/>
+ <service name="rest" promote="rest"/>
+ <service name="search" promote="search"/>
+ <service name="shuffle" promote="shuffle"/>
+ <service name="start" promote="start"/>
  <service name="true" promote="true"/>
- <component t:x="34" t:y="204" name="true" t:title="true" t:color="orange1">
-  <t:implementation.python script="nuvem/true_.py"/>
-  <service name="true"/>
+ <component name="add" t:title="+" t:color="magenta1">
+  <t:implementation.python script="nuvem/add.py"/>
+  <service name="add">
+   <documentation>+</documentation>
+  </service>
+  <reference target="valueof2" name="value1"/>
+  <reference target="valueof3" name="value2"/>
  </component>
- <service name="false" promote="false"/>
- <component t:x="35" t:y="254" name="false" t:title="false" t:color="orange1">
+ <component t:x="17" t:y="269" name="empty" t:title="empty" t:color="yellow1">
+  <t:implementation.python script="nuvem/empty.py"/>
+  <service name="empty"/>
+ </component>
+ <component t:x="21" t:y="170" name="false" t:title="false" t:color="orange1">
   <t:implementation.python script="nuvem/false_.py"/>
   <service name="false"/>
  </component>
- <service name="lookup" promote="lookup"/>
- <component t:x="128" t:y="399" name="lookup" t:title="lookup" t:color="yellow1">
+ <component t:x="121" t:y="26" name="first" t:title="first" t:color="yellow1">
+  <t:implementation.python script="nuvem/first.py"/>
+  <service name="first"/>
+  <reference target="list7" name="list"/>
+ </component>
+ <component name="foreach" t:title="foreach" t:color="yellow1">
+  <t:implementation.python script="nuvem/map_.py"/>
+  <service name="foreach"/>
+  <reference target="name2" name="item"/>
+  <reference target="multiply" name="transform"/>
+  <reference target="reverse" name="list"/>
+ </component>
+ <component t:x="123" t:y="147" name="itemnb" t:title="item #" t:color="yellow1">
+  <t:implementation.python script="nuvem/itemnb.py"/>
+  <service name="itemnb"/>
+  <reference target="number8" name="index"/>
+  <reference target="foreach" name="list"/>
+ </component>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="number" name="item" t:clonable="true"/>
+  <reference target="number7" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list10" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property13" 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="property" name="item" t:clonable="true"/>
+  <reference target="property2" 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="property10" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list4" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="property6" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list5" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list6" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="list7" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <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="430" t:y="269" name="list8" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property11" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="407" t:y="354" name="list9" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property12" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="32" t:y="375" name="lookup" t:title="lookup" t:color="yellow1">
   <t:implementation.python script="nuvem/lookup.py"/>
   <service name="lookup"/>
   <reference target="name3" name="name"/>
   <reference target="list2" name="list"/>
  </component>
- <component t:x="283" t:y="351" name="name3" t:title="" t:color="orange1">
+ <component name="multiply" t:title="*" t:color="magenta1">
+  <t:implementation.python script="nuvem/multiply.py"/>
+  <service name="multiply">
+   <documentation>*</documentation>
+  </service>
+  <reference target="valueof" name="value1"/>
+  <reference target="number6" name="value2"/>
+ </component>
+ <component t:x="21" t:y="70" name="name" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>abc</property>
+ </component>
+ <component name="name2" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>nb</property>
+ </component>
+ <component name="name3" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>d</property>
  </component>
- <component t:x="433" t:y="37" name="range" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
-  <service name="range"/>
-  <reference target="number4" name="first"/>
-  <reference target="number5" name="last"/>
+ <component name="name6" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>sum</property>
  </component>
- <component t:x="378" t:y="48" name="number4" t:title="#" t:color="orange1">
+ <component name="name7" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>i</property>
+ </component>
+ <component name="name8" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>a.b</property>
+ </component>
+ <component t:x="19" t:y="219" name="nothing" t:title="nothing" t:color="orange1">
+  <t:implementation.python script="nuvem/nothing.py"/>
+  <service name="nothing"/>
+ </component>
+ <component name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>0</property>
+  <property>12</property>
  </component>
- <component t:x="378" t:y="90" name="number5" t:title="#" t:color="orange1">
+ <component name="number10" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <service name="first" promote="first"/>
- <component t:x="179" t:y="34" name="first" t:title="first" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
-  <service name="first"/>
-  <reference target="list7" name="list"/>
- </component>
- <service name="rest" promote="rest"/>
- <component t:x="362" t:y="35" name="rest" t:title="rest" t:color="yellow1">
-  <t:implementation.python script="nuvem/rest.py"/>
-  <service name="rest"/>
-  <reference target="list" name="list"/>
- </component>
- <service name="empty" promote="empty"/>
- <component t:x="29" t:y="362" name="empty" t:title="empty" t:color="yellow1">
-  <t:implementation.python script="nuvem/empty.py"/>
-  <service name="empty"/>
- </component>
- <service name="itemnb" promote="itemnb"/>
- <component t:x="123" t:y="147" name="itemnb" t:title="item #" t:color="yellow1">
-  <t:implementation.python script="nuvem/itemnb.py"/>
-  <service name="itemnb"/>
-  <reference target="number8" name="index"/>
-  <reference target="foreach" name="list"/>
- </component>
- <component t:x="208" t:y="187" name="number8" t:title="#" t:color="orange1">
+ <component name="number11" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>3</property>
- </component>
- <component t:x="225" t:y="293" name="name2" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>nb</property>
+  <property>123</property>
  </component>
- <component t:x="498" t:y="437" name="number9" t:title="#" t:color="orange1">
+ <component name="number12" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component t:x="547" t:y="403" name="number10" t:title="#" t:color="orange1">
+ <component name="number13" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <component t:x="226" t:y="373" name="number6" t:title="#" t:color="orange1">
+ <component name="number14" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>2</property>
- </component>
- <component t:x="533" t:y="265" name="valueof2" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>sum</property>
- </component>
- <component t:x="533" t:y="307" name="valueof3" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>i</property>
- </component>
- <component t:x="253" t:y="266" name="multiply" t:title="*" t:color="magenta1">
-  <t:implementation.python script="nuvem/multiply.py"/>
-  <service name="multiply">
-   <documentation>*</documentation>
-  </service>
-  <reference target="valueof" name="value1"/>
-  <reference target="number6" name="value2"/>
- </component>
- <component t:x="280" t:y="264" name="valueof" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>nb</property>
- </component>
- <component t:x="167" t:y="13" name="list7" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="number2" name="item" t:clonable="true"/>
-  <reference target="number3" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <property>0</property>
  </component>
- <component t:x="241" t:y="11" 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>123</property>
  </component>
- <component t:x="241" t:y="48" name="number3" t:title="#" t:color="orange1">
+ <component name="number3" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>456</property>
  </component>
- <service name="nothing" promote="nothing"/>
- <component t:x="33" t:y="304" name="nothing" t:title="nothing" t:color="orange1">
-  <t:implementation.python script="nuvem/nothing.py"/>
-  <service name="nothing"/>
+ <component name="number4" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
  </component>
- <component t:x="558" t:y="6" name="number" t:title="#" t:color="orange1">
+ <component name="number5" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
-  <property>12</property>
+  <property>10</property>
  </component>
- <component t:x="559" t:y="46" name="number7" t:title="#" t:color="orange1">
+ <component name="number6" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>2</property>
+ </component>
+ <component name="number7" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>34</property>
  </component>
- <component t:x="252" t:y="352" name="reverse" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="range" name="list"/>
+ <component name="number8" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3</property>
  </component>
- <component t:x="189" t:y="224" name="foreach" t:title="foreach" t:color="yellow1">
-  <t:implementation.python script="nuvem/map_.py"/>
-  <service name="foreach"/>
-  <reference target="name2" name="item"/>
-  <reference target="multiply" name="transform"/>
-  <reference target="reverse" name="list"/>
+ <component name="number9" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0</property>
  </component>
- <component t:x="834" t:y="61" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property10" name="item" t:clonable="true"/>
-  <reference target="property9" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text3" name="value"/>
+  <property>a</property>
  </component>
- <component t:x="833" t:y="32" name="name8" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>a.b</property>
+ <component name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="list6" name="value"/>
+  <property>a</property>
  </component>
- <service name="search" promote="search"/>
- <component t:x="734" t:y="33" name="search" t:title="search" t:color="yellow1">
-  <t:implementation.python script="nuvem/search.py"/>
-  <service name="search"/>
-  <reference target="name8" name="path"/>
-  <reference target="list3" name="list"/>
+ <component name="property11" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text7" name="value"/>
+  <property>entry</property>
  </component>
- <component t:x="264" t:y="429" name="property" t:title="{propval} :" t:color="orange1">
+ <component name="property12" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="text3" name="value"/>
-  <property>a</property>
+  <reference target="list10" name="value"/>
+  <property>entry</property>
  </component>
- <component t:x="470" t:y="441" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>abc</property>
+ <component name="property13" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text9" name="value"/>
+  <property>test</property>
  </component>
- <component t:x="267" t:y="460" 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="text4" name="value"/>
   <property>d</property>
  </component>
- <component t:x="480" t:y="517" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>def</property>
- </component>
- <component t:x="935" t:y="92" 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="text5" name="value"/>
   <property>ccc</property>
  </component>
- <component t:x="1255" t:y="126" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>ccc</property>
- </component>
- <component t:x="938" t:y="127" 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="text2" name="value"/>
   <property>b</property>
  </component>
- <component t:x="1229" t:y="179" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>bbb</property>
- </component>
- <component t:x="1037" t:y="559" name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>CCC</property>
- </component>
- <component t:x="1177" t:y="476" name="number11" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>123</property>
- </component>
- <component t:x="1230" t:y="253" name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>BBB</property>
- </component>
- <component t:x="1018" t:y="256" name="property7" 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="text6" name="value"/>
-  <property>b</property>
+  <reference target="text8" name="value"/>
+  <property>c</property>
  </component>
- <component t:x="1020" t:y="286" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property6" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number11" name="value"/>
   <property>c</property>
  </component>
- <component t:x="941" t:y="334" name="property5" t:title="{propval} :" t:color="orange1">
+ <component name="property7" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
-  <reference target="text8" name="value"/>
-  <property>c</property>
+  <reference target="text6" name="value"/>
+  <property>b</property>
  </component>
- <component t:x="941" t:y="227" name="property8" t:title="{propval} :" t:color="orange1">
+ <component name="property8" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="list4" name="value"/>
   <property>a</property>
  </component>
- <component t:x="1166" t:y="182" name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference target="property6" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="844" t:y="516" name="list5" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property8" name="item" t:clonable="true"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="972" t:y="531" name="list6" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="860" t:y="171" name="property9" t:title="{propval} :" t:color="orange1">
+ <component name="property9" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="list5" name="value"/>
   <property>x</property>
  </component>
- <component t:x="542" t:y="28" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="number" name="item" t:clonable="true"/>
-  <reference target="number7" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="list8" promote="list8"/>
- <component t:x="550" t:y="351" name="list8" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property11" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="627" t:y="410" name="text7" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>hello</property>
+ <component name="range" t:title="range" t:color="yellow1">
+  <t:implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference target="number4" name="first"/>
+  <reference target="number5" name="last"/>
  </component>
- <component t:x="529" t:y="410" name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text7" name="value"/>
-  <property>entry</property>
+ <component name="range2" t:title="range" t:color="yellow1">
+  <t:implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference target="number9" name="first"/>
+  <reference target="number10" name="last"/>
  </component>
- <service name="list9" promote="list9"/>
- <component t:x="408" t:y="458" name="list9" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property12" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="range3" t:title="range" t:color="yellow1">
+  <t:implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference target="number12" name="first"/>
+  <reference target="number13" name="last"/>
  </component>
- <component t:x="876" t:y="414" name="list10" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property13" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="437" t:y="24" name="reduce2" t:title="reduce" t:color="yellow1">
+  <t:implementation.python script="nuvem/reduce_.py"/>
+  <service name="reduce"/>
+  <reference target="name6" name="item"/>
+  <reference target="name7" name="accum"/>
+  <reference target="add" name="transform"/>
+  <reference target="number14" name="init"/>
+  <reference target="range2" name="list"/>
  </component>
- <component t:x="1013" t:y="414" name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>abc</property>
+ <component t:x="290" t:y="18" name="rest" t:title="rest" t:color="yellow1">
+  <t:implementation.python script="nuvem/rest.py"/>
+  <service name="rest"/>
+  <reference target="list" name="list"/>
  </component>
- <component t:x="776" t:y="416" name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="list10" name="value"/>
-  <property>entry</property>
+ <component name="reverse" t:title="reverse" t:color="yellow1">
+  <t:implementation.python script="nuvem/reverse.py"/>
+  <service name="reverse"/>
+  <reference target="range" name="list"/>
  </component>
- <component t:x="911" t:y="416" name="property13" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text9" name="value"/>
-  <property>test</property>
+ <component t:x="628" t:y="20" name="search" t:title="search" t:color="yellow1">
+  <t:implementation.python script="nuvem/search.py"/>
+  <service name="search"/>
+  <reference target="name8" name="path"/>
+  <reference target="list3" name="list"/>
  </component>
- <service name="shuffle" promote="shuffle"/>
- <component t:x="350" t:y="373" name="shuffle" t:title="shuffle" t:color="yellow1">
+ <component t:x="223" t:y="368" name="shuffle" t:title="shuffle" t:color="yellow1">
   <t:implementation.python script="nuvem/shuffle_.py"/>
   <service name="shuffle"/>
   <reference target="range3" name="list"/>
  </component>
- <component t:x="565" t:y="389" name="number12" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>0</property>
+ <component t:x="15" t:y="11" 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="text" name="content"/>
  </component>
- <component t:x="560" t:y="417" name="number13" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>10</property>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xyz</property>
  </component>
- <component t:x="508" t:y="389" name="range3" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
-  <service name="range"/>
-  <reference target="number12" name="first"/>
-  <reference target="number13" name="last"/>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>bbb</property>
  </component>
- <component t:x="150" t:y="18" name="text" 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>xyz</property>
+  <property>abc</property>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="42" 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="text" name="content"/>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>def</property>
  </component>
- <component t:x="207" t:y="427" name="list2" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>ccc</property>
  </component>
- <service name="reduce2" promote="reduce2"/>
- <component t:x="525" t:y="84" name="reduce2" t:title="reduce" t:color="yellow1">
-  <t:implementation.python script="nuvem/reduce_.py"/>
-  <service name="reduce"/>
-  <reference target="name6" name="item"/>
-  <reference target="name7" name="accum"/>
-  <reference target="add" name="transform"/>
-  <reference target="number14" name="init"/>
-  <reference target="range2" name="list"/>
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>BBB</property>
  </component>
- <component t:x="571" t:y="500" name="name7" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>i</property>
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>hello</property>
  </component>
- <component t:x="567" t:y="526" name="add" t:title="+" t:color="magenta1">
-  <t:implementation.python script="nuvem/add.py"/>
-  <service name="add">
-   <documentation>+</documentation>
-  </service>
-  <reference target="valueof2" name="value1"/>
-  <reference target="valueof3" name="value2"/>
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>CCC</property>
  </component>
- <component t:x="555" t:y="287" name="range2" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
-  <service name="range"/>
-  <reference target="number9" name="first"/>
-  <reference target="number10" name="last"/>
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>abc</property>
  </component>
- <component t:x="556" t:y="265" name="number14" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>0</property>
+ <component t:x="23" t:y="120" name="true" t:title="true" t:color="orange1">
+  <t:implementation.python script="nuvem/true_.py"/>
+  <service name="true"/>
  </component>
- <component t:x="552" t:y="146" name="name6" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
+ <component name="valueof" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>nb</property>
+ </component>
+ <component name="valueof2" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
   <property>sum</property>
  </component>
- <component t:x="816" t:y="61" name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="list6" name="value"/>
-  <property>a</property>
+ <component name="valueof3" t:title="valueof" t:color="orange1">
+  <t:implementation.python script="nuvem/valueof.py"/>
+  <service name="valueof"/>
+  <property>i</property>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html Mon May  2 05:58:47 2011
@@ -18,10 +18,10 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="value" class="text" style="position: absolute; top: 63px; left: 2px; ">
-  <SPAN>text</SPAN>
- </SPAN>
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Test values and lists</H2>
  </SPAN>
+ <SPAN id="value" class="text" style="position: absolute; top: 36px; left: 29px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite Mon May  2 05:58:47 2011
@@ -17,132 +17,132 @@
  * 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://testwidgets" name="testwidgets">
- <component t:x="708" t:y="619" name="property" t:title="{propval} :" t:color="orange1">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="start" promote="start"/>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property10" name="item" t:clonable="true"/>
+  <reference target="property9" name="item" t:clonable="true"/>
+  <reference target="property8" name="item" t:clonable="true"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference target="property6" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text9" name="value"/>
   <property>testpath2</property>
  </component>
- <component t:x="905" t:y="615" name="text9" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test path</property>
+ <component name="property10" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text" name="value"/>
+  <property>testh1</property>
  </component>
- <component t:x="413" t:y="315" 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="property" name="value"/>
   <property>testpath1</property>
  </component>
- <component t:x="411" t:y="281" 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="text6" name="value"/>
   <property>testimg</property>
  </component>
- <component t:x="927" t:y="304" name="text6" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property>
- </component>
- <component t:x="410" t:y="247" 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="text8" name="value"/>
   <property>testtext</property>
  </component>
- <component t:x="790" t:y="441" name="text8" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test text</property>
- </component>
- <component t:x="411" t:y="210" 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="text4" name="value"/>
   <property>testlink</property>
  </component>
- <component t:x="842" t:y="340" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://tuscany.apache.org</property>
- </component>
- <component t:x="413" t:y="177" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property6" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text5" name="value"/>
   <property>testcheckbox</property>
  </component>
- <component t:x="790" t:y="336" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test checkbox</property>
- </component>
- <component t:x="411" t:y="136" name="property7" t:title="{propval} :" t:color="orange1">
+ <component name="property7" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text3" name="value"/>
   <property>testentry</property>
  </component>
- <component t:x="588" t:y="314" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test entry field</property>
- </component>
- <component t:x="401" t:y="102" name="property8" t:title="{propval} :" t:color="orange1">
+ <component name="property8" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text2" name="value"/>
   <property>testbutton</property>
  </component>
- <component t:x="775" t:y="212" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test button</property>
- </component>
- <component t:x="411" t:y="66" name="property9" t:title="{propval} :" t:color="orange1">
+ <component name="property9" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text7" name="value"/>
   <property>testsection</property>
  </component>
- <component t:x="780" t:y="147" name="text7" t:title=" '{propval}'" t:color="orange1">
+ <component t:x="17" t:y="3" 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="list" name="content"/>
+ </component>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>test section</property>
+  <property>test header 1</property>
  </component>
- <component t:x="406" t:y="28" name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="text" name="value"/>
-  <property>testh1</property>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test button</property>
  </component>
- <component t:x="748" t:y="92" name="text" 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>test header 1</property>
+  <property>test entry field</property>
  </component>
- <component t:x="308" t:y="37" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property10" name="item" t:clonable="true"/>
-  <reference target="property9" name="item" t:clonable="true"/>
-  <reference target="property8" name="item" t:clonable="true"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference target="property6" name="item" t:clonable="true"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference target="property2" 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>http://tuscany.apache.org</property>
  </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="208" t:y="18" 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="list" name="content"/>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test checkbox</property>
+ </component>
+ <component name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property>
+ </component>
+ <component name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test section</property>
+ </component>
+ <component name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test text</property>
+ </component>
+ <component name="text9" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test path</property>
  </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html Mon May  2 05:58:47 2011
@@ -18,44 +18,44 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="testbutton" class="button" style="position: absolute; top: 97px; left: 9px; ">
-  <INPUT type="button" value="button"/>
+ <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; ">
+  <H1>Header1</H1>
  </SPAN>
- <SPAN id="testsection" class="section" style="position: absolute; top: 52px; left: 10px; ">
+ <SPAN id="testsection" class="section" style="position: absolute; top: 45px; width: 100%; left: 11px; ">
   <SPAN>section</SPAN>
  </SPAN>
- <SPAN id="testtext" class="text" style="position: absolute; top: 252px; left: 17px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="testimg" class="img" style="position: absolute; top: 90px; left: 263px; ">
+  <IMG src="/public/img.png"/>
+ </SPAN>
+ <SPAN id="testbutton" class="button" style="position: absolute; top: 99px; left: 11px; ">
+  <INPUT type="button" value="button" class="graybutton"/>
  </SPAN>
- <SPAN id="testcheckbox" class="checkbox" style="position: absolute; top: 183px; left: 11px; ">
+ <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; ">
+  <INPUT type="text" value="field" size="20" autocapitalize="off"/>
+ </SPAN>
+ <SPAN id="testcheckbox" class="checkbox" style="position: absolute; top: 180px; left: 11px; ">
   <INPUT type="checkbox" value="checkbox"/>
   <SPAN>checkbox</SPAN>
  </SPAN>
- <SPAN id="testlink" class="link" style="position: absolute; top: 217px; left: 17px; ">
+ <SPAN id="testlink2" class="link" style="position: absolute; top: 189px; left: 263px; ">
+  <A href="http://www.apache.org/">
+   <SPAN>http://www.apache.org/</SPAN>
+  </A>
+ </SPAN>
+ <SPAN id="testlink" class="link" style="position: absolute; top: 216px; left: 11px; ">
   <A href="link">
    <SPAN>link</SPAN>
   </A>
  </SPAN>
- <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 282px; left: 17px; ">
-  <SPAN>text</SPAN>
- </SPAN>
- <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; ">
-  <H1>Header1</H1>
- </SPAN>
  <SPAN id="testlink3" class="link" style="position: absolute; top: 225px; left: 263px; ">
   <A href="http://www.apache.org">
    <SPAN> Apache</SPAN>
   </A>
  </SPAN>
- <SPAN id="testlink2" class="link" style="position: absolute; top: 189px; left: 263px; ">
-  <A href="http://www.apache.org/">
-   <SPAN>http://www.apache.org/</SPAN>
-  </A>
- </SPAN>
- <SPAN id="testimg" class="img" style="position: absolute; top: 90px; left: 263px; ">
-  <IMG src="/public/img.png"/>
+ <SPAN id="testtext" class="text" style="position: absolute; top: 243px; left: 11px; ">
+  <SPAN>text</SPAN>
  </SPAN>
- <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; ">
-  <INPUT type="text" value="field" size="20" autocapitalize="off"/>
+ <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 270px; left: 11px; ">
+  <SPAN>text</SPAN>
  </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite Mon May  2 05:58:47 2011
@@ -17,114 +17,114 @@
  * 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://testwidgets2" name="testwidgets2">
- <component t:x="449" t:y="389" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.apache.org/</property>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="start" promote="start"/>
+ <component name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="735" t:y="335" name="text4" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Apache</property>
+ <component name="list3" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text3" name="item" t:clonable="true"/>
+  <reference target="text4" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="645" t:y="457" name="text5" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.cnn.com</property>
+ <component name="list4" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="property6" name="item" t:clonable="true"/>
+  <reference target="property7" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component name="number3" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>1</property>
+ </component>
+ <component name="number4" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>2</property>
  </component>
- <component t:x="271" t:y="276" 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="text5" name="value"/>
   <property>testframe</property>
  </component>
- <component t:x="631" t:y="388" name="list3" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="text3" name="item" t:clonable="true"/>
-  <reference target="text4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="272" t:y="183" 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="list3" name="value"/>
   <property>testlink</property>
  </component>
- <component t:x="270" t:y="147" 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="text2" name="value"/>
   <property>testhtml</property>
  </component>
- <component t:x="695" t:y="243" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>&lt;b&gt;test bold text&lt;/b&gt;</property>
- </component>
- <component t:x="271" t:y="0" 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="text" name="value"/>
   <property>testlist1</property>
  </component>
- <component t:x="677" t:y="49" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test value</property>
- </component>
- <component t:x="271" t:y="34" 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="list4" name="value"/>
   <property>testlist2</property>
  </component>
- <component t:x="672" t:y="111" name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property6" name="item" t:clonable="true"/>
-  <reference target="property7" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <component t:x="709" t:y="109" name="property6" t:title="{propval} :" t:color="orange1">
+ <component name="property6" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number3" name="value"/>
   <property>a</property>
  </component>
- <component t:x="780" t:y="107" name="number3" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>1</property>
- </component>
- <component t:x="781" t:y="137" name="number4" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>2</property>
- </component>
- <component t:x="710" t:y="142" name="property7" t:title="{propval} :" t:color="orange1">
+ <component name="property7" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number4" name="value"/>
   <property>b</property>
  </component>
- <component t:x="326" t:y="32" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="property4" name="item" t:clonable="true"/>
-  <reference target="property5" name="item" t:clonable="true"/>
-  <reference target="property3" name="item" t:clonable="true"/>
-  <reference target="property2" name="item" t:clonable="true"/>
-  <reference target="property" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
- </component>
- <service name="appstart" promote="appstart"/>
- <component t:x="212" t:y="33" 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"/>
+ <component t:x="13" t:y="8" 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="list" name="content"/>
  </component>
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test value</property>
+ </component>
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>&lt;b&gt;test bold text&lt;/b&gt;</property>
+ </component>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.apache.org/</property>
+ </component>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Apache</property>
+ </component>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.cnn.com</property>
+ </component>
 </composite>

Copied: tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html (from r1098489, tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html?p2=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html&p1=tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html&r1=1098489&r2=1098490&rev=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html Mon May  2 05:58:47 2011
@@ -22,7 +22,7 @@
   <H2>Test widget components</H2>
  </SPAN>
  <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; left: 20px; ">
-  <TABLE class="datatable" style="width: 200px;">
+  <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
      <TD>table</TD>
@@ -36,7 +36,7 @@
   </TABLE>
  </SPAN>
  <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; left: 20px; ">
-  <TABLE class="datatable" style="width: 200px;">
+  <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
      <TD>table</TD>
@@ -50,7 +50,7 @@
   </TABLE>
  </SPAN>
  <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 20px; ">
-  <TABLE class="datatable" style="width: 200px;">
+  <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
      <TD>table</TD>
@@ -66,6 +66,11 @@
  <SPAN id="testhtml" class="text" style="position: absolute; top: 234px; left: 20px; ">
   <SPAN>text</SPAN>
  </SPAN>
+ <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; ">
+  <SELECT>
+   <OPTION>select</OPTION>
+  </SELECT>
+ </SPAN>
  <SPAN id="testlink" class="link" style="position: absolute; top: 270px; left: 20px; ">
   <A href="/">
    <SPAN>link</SPAN>
@@ -78,9 +83,4 @@
    </SPAN>
   </A>
  </SPAN>
- <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; ">
-  <SELECT>
-   <OPTION>select</OPTION>
-  </SELECT>
- </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/control/palette.composite?rev=1098490&r1=1098489&r2=1098490&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/control/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/control/palette.composite Mon May  2 05:58:47 2011
@@ -22,25 +22,25 @@
   targetNamespace="http://control"
   name="palette">
         
-    <service name="appstart" promote="appstart"/>
-    <service name="appstop" promote="appstop"/>
+    <service name="start" promote="start"/>
+    <service name="stop" promote="stop"/>
     <service name="service" promote="service"/>
-    <service name="every" promote="every"/>
+    <service name="timer" promote="timer"/>
     <service name="geolocation" promote="geolocation"/>
     <service name="call" promote="call"/>
 
-    <component 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"/>
+    <component 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 name="content"/>
     </component>
     
-    <component name="appstop" t:title="stop" t:color="green1">
-        <t:implementation.python script="nuvem/appstop.py"/>
-        <service name="appstop" t:visible="false">
-            <t:binding.http uri="appstop"/>
+    <component name="stop" t:title="stop" t:color="green1">
+        <t:implementation.python script="nuvem/stop.py"/>
+        <service name="stop" t:visible="false">
+            <t:binding.http uri="stop"/>
         </service>
         <reference name="content"/>
     </component>
@@ -51,10 +51,10 @@
         <reference name="content"/>
     </component>
     
-    <component name="every" t:title="timer" t:color="green1">
-        <t:implementation.python script="nuvem/every.py"/>
-        <service name="every" t:visible="false">
-            <t:binding.http uri="every"/>
+    <component name="timer" t:title="timer" t:color="green1">
+        <t:implementation.python script="nuvem/timer.py"/>
+        <service name="timer" t:visible="false">
+            <t:binding.http uri="timer"/>
         </service>
         <reference name="n"/>
         <reference name="content"/>

Added: tuscany/sca-cpp/trunk/modules/edit/store/all
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/store/all?rev=1098490&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/store/all (added)
+++ tuscany/sca-cpp/trunk/modules/edit/store/all Mon May  2 05:58:47 2011
@@ -0,0 +1 @@
+((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb")))



Mime
View raw message