tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1126306 [4/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/testvalues/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite?rev=1126306&r1=1126305&r2=1126306&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 23 04:25:27 2011
@@ -17,339 +17,353 @@
  * 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="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"/>
  <service name="nothing" promote="nothing"/>
  <service name="reduce2" promote="reduce2"/>
  <service name="rest" promote="rest"/>
- <service name="search" promote="search"/>
+ <service name="second" promote="second"/>
  <service name="shuffle" promote="shuffle"/>
  <service name="start" promote="start"/>
  <service name="true" promote="true"/>
- <component name="add" t:title="+" t:color="magenta1">
-  <t:implementation.python script="nuvem/add.py"/>
+ <service name="values" promote="values"/>
+ <service name="values2" promote="values2"/>
+ <component name="add" title="+" color="magenta1">
+  <implementation.python script="nuvem/add.py"/>
   <service name="add">
    <documentation>+</documentation>
   </service>
   <reference target="valueof2" name="value1"/>
   <reference target="valueof3" name="value2"/>
  </component>
- <component t:x="17" t:y="269" name="empty" t:title="empty" t:color="yellow1">
-  <t:implementation.python script="nuvem/empty.py"/>
+ <component x="17" y="269" name="empty" title="empty" color="yellow1">
+  <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"/>
+ <component x="21" y="170" name="false" title="false" color="orange1">
+  <implementation.python script="nuvem/false_.py"/>
   <service name="false"/>
  </component>
- <component t:x="121" t:y="26" name="first" t:title="first" t:color="yellow1">
-  <t:implementation.python script="nuvem/first.py"/>
+ <component x="121" y="26" name="first" title="first" color="yellow1">
+  <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"/>
+ <component name="foreach" title="foreach" color="yellow1">
+  <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"/>
+ <component x="123" y="147" name="itemnb" title="item #" color="yellow1">
+  <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"/>
+ <component name="list" title="list" color="yellow1">
+  <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"/>
+  <reference target="number" name="item" clonable="true"/>
+  <reference target="number7" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list10" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list10" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property13" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item13" 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 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 target="item14" 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="property10" name="item" t:clonable="true"/>
-  <reference target="property9" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item10" name="item" clonable="true"/>
+  <reference target="item9" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list4" title="list" color="yellow1">
+  <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"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference target="item6" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list5" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list5" title="list" color="yellow1">
+  <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"/>
+  <reference target="item8" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list6" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list6" title="list" color="yellow1">
+  <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"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list7" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list7" title="list" color="yellow1">
+  <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"/>
+  <reference target="number2" name="item" clonable="true"/>
+  <reference target="number3" name="item" clonable="true"/>
+  <reference name="item" 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"/>
+ <component x="430" y="269" name="list8" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property11" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item11" name="item" clonable="true"/>
+  <reference name="item" 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"/>
+ <component x="407" y="354" name="list9" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="property12" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="item12" name="item" clonable="true"/>
+  <reference name="item" 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"/>
+ <component name="lookup" title="lookup" color="yellow1">
+  <implementation.python script="nuvem/lookup.py"/>
   <service name="lookup"/>
   <reference target="name3" name="name"/>
   <reference target="list2" name="list"/>
  </component>
- <component name="multiply" t:title="*" t:color="magenta1">
-  <t:implementation.python script="nuvem/multiply.py"/>
+ <component name="multiply" title="*" color="magenta1">
+  <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"/>
+ <component x="21" y="70" name="name" title="" color="orange1">
+  <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"/>
+ <component name="name2" title="" color="orange1">
+  <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"/>
+ <component name="name3" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>d</property>
  </component>
- <component name="name6" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name6" title="" color="orange1">
+  <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>sum</property>
  </component>
- <component name="name7" t:title="" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
+ <component name="name7" title="" color="orange1">
+  <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"/>
+ <component name="name8" title="" color="orange1">
+  <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"/>
+ <component x="19" y="219" name="nothing" title="nothing" color="orange1">
+  <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"/>
+ <component name="number" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>12</property>
  </component>
- <component name="number10" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number10" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <component name="number11" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number11" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>123</property>
  </component>
- <component name="number12" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number12" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component name="number13" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number13" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>10</property>
  </component>
- <component name="number14" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number14" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</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>123</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>456</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>0</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>10</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>2</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>34</property>
  </component>
- <component name="number8" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number8" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3</property>
  </component>
- <component name="number9" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
+ <component name="number9" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </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="text3" name="value"/>
   <property>a</property>
  </component>
- <component name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item10" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list6" name="value"/>
   <property>a</property>
  </component>
- <component name="property11" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item11" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text7" name="value"/>
   <property>entry</property>
  </component>
- <component name="property12" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item12" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list10" name="value"/>
   <property>entry</property>
  </component>
- <component name="property13" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item13" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text9" name="value"/>
   <property>test</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item14" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text10" name="value"/>
+  <property>d</property>
+ </component>
+ <component name="item15" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text11" name="value"/>
+  <property>x</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text4" name="value"/>
   <property>d</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="text5" name="value"/>
   <property>ccc</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="text2" name="value"/>
   <property>b</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="text8" name="value"/>
   <property>c</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number11" name="value"/>
   <property>c</property>
  </component>
- <component name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item7" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text6" name="value"/>
   <property>b</property>
  </component>
- <component name="property8" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item8" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list4" name="value"/>
   <property>a</property>
  </component>
- <component name="property9" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item9" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="list5" name="value"/>
   <property>x</property>
  </component>
- <component name="range" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
+ <component name="range" title="range" color="yellow1">
+  <implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
   <reference target="number4" name="first"/>
   <reference target="number5" name="last"/>
  </component>
- <component name="range2" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
+ <component name="range2" title="range" color="yellow1">
+  <implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
   <reference target="number9" name="first"/>
   <reference target="number10" name="last"/>
  </component>
- <component name="range3" t:title="range" t:color="yellow1">
-  <t:implementation.python script="nuvem/range_.py"/>
+ <component name="range3" title="range" color="yellow1">
+  <implementation.python script="nuvem/range_.py"/>
   <service name="range"/>
   <reference target="number12" name="first"/>
   <reference target="number13" name="last"/>
  </component>
- <component t:x="437" t:y="24" name="reduce2" t:title="reduce" t:color="yellow1">
-  <t:implementation.python script="nuvem/reduce_.py"/>
+ <component x="437" y="24" name="reduce2" title="reduce" color="yellow1">
+  <implementation.python script="nuvem/reduce_.py"/>
   <service name="reduce"/>
   <reference target="name6" name="item"/>
   <reference target="name7" name="accum"/>
@@ -357,96 +371,121 @@
   <reference target="number14" name="init"/>
   <reference target="range2" name="list"/>
  </component>
- <component t:x="290" t:y="18" name="rest" t:title="rest" t:color="yellow1">
-  <t:implementation.python script="nuvem/rest.py"/>
+ <component x="290" y="18" name="rest" title="rest" color="yellow1">
+  <implementation.python script="nuvem/rest.py"/>
   <service name="rest"/>
   <reference target="list" name="list"/>
  </component>
- <component name="reverse" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
+ <component name="reverse" title="reverse" color="yellow1">
+  <implementation.python script="nuvem/reverse.py"/>
   <service name="reverse"/>
   <reference target="range" name="list"/>
  </component>
- <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"/>
+ <component name="select" title="select" color="yellow1">
+  <implementation.python script="nuvem/select.py"/>
+  <service name="select"/>
   <reference target="name8" name="path"/>
   <reference target="list3" name="list"/>
  </component>
- <component t:x="223" t:y="368" name="shuffle" t:title="shuffle" t:color="yellow1">
-  <t:implementation.python script="nuvem/shuffle_.py"/>
+ <component x="1026" y="233" name="second" title="second" color="yellow1">
+  <implementation.python script="nuvem/second.py"/>
+  <service name="second"/>
+  <reference target="item15" name="list"/>
+ </component>
+ <component x="223" y="368" name="shuffle" title="shuffle" color="yellow1">
+  <implementation.python script="nuvem/shuffle_.py"/>
   <service name="shuffle"/>
   <reference target="range3" name="list"/>
  </component>
- <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"/>
+ <component x="15" y="11" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
   </service>
   <reference target="text" 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>xyz</property>
  </component>
- <component name="text2" 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>xyz</property>
+ </component>
+ <component name="text11" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>y</property>
+ </component>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>bbb</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>abc</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>def</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>ccc</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>BBB</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</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>CCC</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>abc</property>
  </component>
- <component t:x="23" t:y="120" name="true" t:title="true" t:color="orange1">
-  <t:implementation.python script="nuvem/true_.py"/>
+ <component x="23" y="120" name="true" title="true" color="orange1">
+  <implementation.python script="nuvem/true_.py"/>
   <service name="true"/>
  </component>
- <component name="valueof" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof" title="valueof" color="orange1">
+  <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"/>
+ <component name="valueof2" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>sum</property>
  </component>
- <component name="valueof3" t:title="valueof" t:color="orange1">
-  <t:implementation.python script="nuvem/valueof.py"/>
+ <component name="valueof3" title="valueof" color="orange1">
+  <implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
   <property>i</property>
  </component>
+ <component x="1020" y="31" name="values" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference target="lookup" name="list"/>
+ </component>
+ <component x="639" y="12" name="values2" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference target="select" name="list"/>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,10 +18,10 @@
  * 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 values and lists</H2>
  </SPAN>
  <SPAN id="value" class="text" style="position: absolute; top: 36px; left: 29px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=value</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=1126306&r1=1126305&r2=1126306&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 23 04:25:27 2011
@@ -17,131 +17,131 @@
  * 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="start" promote="start"/>
- <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="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="item10" name="item" clonable="true"/>
+  <reference target="item9" name="item" clonable="true"/>
+  <reference target="item8" name="item" clonable="true"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference target="item6" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="item" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text9" name="value"/>
   <property>testpath2</property>
  </component>
- <component name="property10" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item10" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text" name="value"/>
   <property>testh1</property>
  </component>
- <component name="property2" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
-  <reference target="property" name="value"/>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="item" name="value"/>
   <property>testpath1</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="text6" name="value"/>
   <property>testimg</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="text8" name="value"/>
   <property>testtext</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="text4" name="value"/>
   <property>testlink</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text5" name="value"/>
   <property>testcheckbox</property>
  </component>
- <component name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item7" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text3" name="value"/>
   <property>testentry</property>
  </component>
- <component name="property8" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item8" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text2" name="value"/>
   <property>testbutton</property>
  </component>
- <component name="property9" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item9" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="text7" name="value"/>
   <property>testsection</property>
  </component>
- <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"/>
+ <component x="17" y="3" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <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"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test header 1</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>test button</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>test entry field</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>http://tuscany.apache.org</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>test checkbox</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>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"/>
+ <component name="text7" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text8" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test path</property>
  </component>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html Mon May 23 04:25:27 2011
@@ -19,43 +19,43 @@
 -->
 <DIV id="page">
  <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; ">
-  <H1>Header1</H1>
+  <H1>=testh1</H1>
  </SPAN>
  <SPAN id="testsection" class="section" style="position: absolute; top: 45px; width: 100%; left: 11px; ">
-  <SPAN>section</SPAN>
+  <SPAN>=testsection</SPAN>
  </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"/>
+  <INPUT type="button" value="=testbutton" class="graybutton"/>
  </SPAN>
  <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; ">
-  <INPUT type="text" value="field" size="20" autocapitalize="off"/>
+  <INPUT type="text" value="=testentry" 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>
+  <INPUT type="checkbox" value="=testcheckbox"/>
+  <SPAN>=testcheckbox</SPAN>
  </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 href="=testlink2">
+   <SPAN>=testlink2</SPAN>
   </A>
  </SPAN>
  <SPAN id="testlink" class="link" style="position: absolute; top: 216px; left: 11px; ">
-  <A href="link">
-   <SPAN>link</SPAN>
+  <A href="=testlink">
+   <SPAN>=testlink</SPAN>
   </A>
  </SPAN>
  <SPAN id="testlink3" class="link" style="position: absolute; top: 225px; left: 263px; ">
-  <A href="http://www.apache.org">
-   <SPAN> Apache</SPAN>
+  <A href="=testlink3">
+   <SPAN>=testlink3</SPAN>
   </A>
  </SPAN>
  <SPAN id="testtext" class="text" style="position: absolute; top: 243px; left: 11px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=testtext</SPAN>
  </SPAN>
  <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 270px; left: 11px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=testpath1.testpath2</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=1126306&r1=1126305&r2=1126306&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 23 04:25:27 2011
@@ -17,113 +17,113 @@
  * 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="start" promote="start"/>
- <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="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"/>
+  <reference target="item4" name="item" clonable="true"/>
+  <reference target="item5" name="item" clonable="true"/>
+  <reference target="item3" name="item" clonable="true"/>
+  <reference target="item2" name="item" 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="text3" name="item" t:clonable="true"/>
-  <reference target="text4" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+  <reference target="text3" name="item" clonable="true"/>
+  <reference target="text4" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </component>
- <component name="list4" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
+ <component name="list4" title="list" color="yellow1">
+  <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"/>
+  <reference target="item6" name="item" clonable="true"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
  </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>1</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>2</property>
  </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="text5" name="value"/>
   <property>testframe</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="list3" name="value"/>
   <property>testlink</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="text2" name="value"/>
   <property>testhtml</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="text" name="value"/>
   <property>testlist1</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="list4" name="value"/>
   <property>testlist2</property>
  </component>
- <component name="property6" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item6" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number3" name="value"/>
   <property>a</property>
  </component>
- <component name="property7" t:title="{propval} :" t:color="orange1">
-  <t:implementation.python script="nuvem/assoc.py"/>
-  <service name="property"/>
+ <component name="item7" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
   <reference target="number4" name="value"/>
   <property>b</property>
  </component>
- <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"/>
+ <component x="13" y="8" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <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"/>
+ <component name="text" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text2" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text3" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text4" title=" '{propval}'" color="orange1">
+  <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"/>
+ <component name="text5" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://www.cnn.com</property>
  </component>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html Mon May 23 04:25:27 2011
@@ -18,14 +18,14 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
+ <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
   <H2>Test widget components</H2>
  </SPAN>
- <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; left: 20px; ">
-  <TABLE class="datatable" style="width: 100%; ">
+ <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; width: 100%; left: 20px; ">
+  <TABLE class="datatable" style="width: 100%;">
    <TBODY>
     <TR>
-     <TD>table</TD>
+     <TD>=testlist1</TD>
      <TD>...</TD>
     </TR>
     <TR>
@@ -35,11 +35,11 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; left: 20px; ">
-  <TABLE class="datatable" style="width: 100%; ">
+ <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; width: 100%; left: 20px; ">
+  <TABLE class="datatable" style="width: 100%;">
    <TBODY>
     <TR>
-     <TD>table</TD>
+     <TD>=testlist2</TD>
      <TD>...</TD>
     </TR>
     <TR>
@@ -49,11 +49,11 @@
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 20px; ">
-  <TABLE class="datatable" style="width: 100%; ">
+ <SPAN id="b" class="table" style="position: absolute; top: 180px; width: 100%; left: 20px; ">
+  <TABLE class="datatable" style="width: 100%;">
    <TBODY>
     <TR>
-     <TD>table</TD>
+     <TD>=b</TD>
      <TD>...</TD>
     </TR>
     <TR>
@@ -64,16 +64,16 @@
   </TABLE>
  </SPAN>
  <SPAN id="testhtml" class="text" style="position: absolute; top: 234px; left: 20px; ">
-  <SPAN>text</SPAN>
+  <SPAN>=testhtml</SPAN>
  </SPAN>
  <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; ">
   <SELECT>
-   <OPTION>select</OPTION>
+   <OPTION>=testselect</OPTION>
   </SELECT>
  </SPAN>
  <SPAN id="testlink" class="link" style="position: absolute; top: 270px; left: 20px; ">
-  <A href="/">
-   <SPAN>link</SPAN>
+  <A href="=testlink">
+   <SPAN>=testlink</SPAN>
   </A>
  </SPAN>
  <SPAN id="testframe" class="iframe" style="position: absolute; top: 306px; left: 20px; ">

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=1126306&r1=1126305&r2=1126306&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 23 04:25:27 2011
@@ -1,78 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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://control"
-  name="palette">
-        
-    <service name="start" promote="start"/>
-    <service name="stop" promote="stop"/>
-    <service name="service" promote="service"/>
-    <service name="timer" promote="timer"/>
-    <service name="geolocation" promote="geolocation"/>
-    <service name="call" promote="call"/>
-
-    <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="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>
-    
-    <component name="service" t:title="{compname}" t:color="green1">
-        <t:implementation.python script="nuvem/service.py"/>
-        <service name="service" t:visible="false"/>
-        <reference name="content"/>
-    </component>
-    
-    <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"/>
-    </component>
-    
-    <component name="geolocation" t:title="location" t:color="green1">
-        <t:implementation.python script="nuvem/geolocation.py"/>
-        <service name="geolocation" t:visible="false">
-            <t:binding.http uri="geolocation"/>
-        </service>
-        <reference name="content"/>
-    </component>
-    
-    <component name="call" t:title="call" t:color="green1">
-        <t:implementation.python script="nuvem/call.py"/>
-        <service name="call"/>
-        <reference name="name"/>
-        <reference name="proxy" wiredByImpl="true" t:visible="false"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="call" promote="call"/>
+ <service name="location" promote="location"/>
+ <service name="service" promote="service"/>
+ <service name="start" promote="start"/>
+ <service name="stop" promote="stop"/>
+ <service name="timer" promote="timer"/>
+ <component x="90" y="70" name="call" title="call" color="green1">
+  <implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference name="name"/>
+  <reference name="proxy" wiredByImpl="true" visible="false"/>
+ </component>
+ <component x="90" y="120" name="location" title="location" color="green1">
+  <implementation.python script="nuvem/location.py"/>
+  <service name="location" visible="false">
+   <binding.http uri="location"/>
+  </service>
+  <reference name="content"/>
+ </component>
+ <component x="160" y="70" name="service" title="{compname}" color="green1">
+  <implementation.python script="nuvem/service.py"/>
+  <service name="service" visible="false"/>
+  <reference name="content"/>
+ </component>
+ <component x="90" y="10" name="start" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
+  </service>
+  <reference name="content"/>
+ </component>
+ <component x="150" y="10" name="stop" title="stop" color="green1">
+  <implementation.python script="nuvem/stop.py"/>
+  <service name="stop" visible="false">
+   <binding.http uri="stop"/>
+  </service>
+  <reference name="content"/>
+ </component>
+ <component x="210" y="10" name="timer" title="timer" color="green1">
+  <implementation.python script="nuvem/timer.py"/>
+  <service name="timer" visible="false">
+   <binding.http uri="timer"/>
+  </service>
+  <reference name="n"/>
+  <reference name="content"/>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/database/palette.composite Mon May 23 04:25:27 2011
@@ -1,84 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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://database"
-  name="palette">
-        
-    <service name="filedb" promote="filedb"/>
-    <service name="nosqldb" promote="nosqldb"/>
-    <service name="sqldb" promote="sqldb"/>
-    <service name="get" promote="get"/>
-    <service name="post" promote="post"/>
-    <service name="put" promote="put"/>
-    <service name="delete" promote="delete"/>
-
-    <component name="filedb" t:title="file" t:color="red1">
-        <t:implementation.python script="nuvem/filedb.py"/>
-        <service name="filedb"/>
-        <reference name="db" target="AppDataFileCache" t:visible="false"/>
-        <property name="host" t:visible="false"/>
-    </component>
-    
-    <component name="nosqldb" t:title="index **" t:color="red1">
-        <t:implementation.python script="nuvem/nosqldb.py"/>
-        <service name="nosqldb"/>
-        <reference name="db" target="AppDataNoSQLCache" t:visible="false"/>
-        <property name="host" t:visible="false"/>
-    </component>
-    
-    <component name="sqldb" t:title="sql **" t:color="red1">
-        <t:implementation.python script="nuvem/sqldb.py"/>
-        <service name="sqldb"/>
-        <reference name="db" target="AppDataSQLCache" t:visible="false"/>
-        <property name="host" t:visible="false"/>
-    </component>
-    
-    <component name="get" t:title="get" t:color="red1">
-        <t:implementation.python script="nuvem/get.py"/>
-        <service name="get"/>
-        <reference name="collection"/>
-        <reference name="id"/>
-    </component>
-    
-    <component name="post" t:title="post" t:color="red1">
-        <t:implementation.python script="nuvem/post.py"/>
-        <service name="post"/>
-        <reference name="collection"/>
-        <reference name="id"/>
-        <reference name="value"/>
-    </component>
-    
-    <component name="put" t:title="put" t:color="red1">
-        <t:implementation.python script="nuvem/put.py"/>
-        <service name="put"/>
-        <reference name="collection"/>
-        <reference name="id"/>
-        <reference name="value"/>
-    </component>
-    
-    <component name="delete" t:title="delete" t:color="red1">
-        <t:implementation.python script="nuvem/delete.py"/>
-        <service name="delete"/>
-        <reference name="collection"/>
-        <reference name="id"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="delete" promote="delete"/>
+ <service name="filedb" promote="filedb"/>
+ <service name="get" promote="get"/>
+ <service name="nosqldb" promote="nosqldb"/>
+ <service name="post" promote="post"/>
+ <service name="put" promote="put"/>
+ <service name="sqldb" promote="sqldb"/>
+ <component x="230" y="60" name="delete" title="delete" color="red1">
+  <implementation.python script="nuvem/delete.py"/>
+  <service name="delete"/>
+  <reference name="collection"/>
+  <reference name="id"/>
+ </component>
+ <component x="90" y="10" name="filedb" title="file" color="red1">
+  <implementation.python script="nuvem/filedb.py"/>
+  <service name="filedb"/>
+  <reference name="db" target="AppDataFileCache" visible="false"/>
+  <property name="host" visible="false"/>
+ </component>
+ <component x="90" y="60" name="get" title="get" color="red1">
+  <implementation.python script="nuvem/get.py"/>
+  <service name="get"/>
+  <reference name="collection"/>
+  <reference name="id"/>
+ </component>
+ <component x="150" y="10" name="nosqldb" title="index **" color="red1">
+  <implementation.python script="nuvem/nosqldb.py"/>
+  <service name="nosqldb"/>
+  <reference name="db" target="AppDataNoSQLCache" visible="false"/>
+  <property name="host" visible="false"/>
+ </component>
+ <component x="90" y="130" name="post" title="post" color="red1">
+  <implementation.python script="nuvem/post.py"/>
+  <service name="post"/>
+  <reference name="collection"/>
+  <reference name="id"/>
+  <reference name="value"/>
+ </component>
+ <component x="160" y="60" name="put" title="put" color="red1">
+  <implementation.python script="nuvem/put.py"/>
+  <service name="put"/>
+  <reference name="collection"/>
+  <reference name="id"/>
+  <reference name="value"/>
+ </component>
+ <component x="240" y="10" name="sqldb" title="sql **" color="red1">
+  <implementation.python script="nuvem/sqldb.py"/>
+  <service name="sqldb"/>
+  <reference name="db" target="AppDataSQLCache" visible="false"/>
+  <property name="host" visible="false"/>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/http/palette.composite Mon May 23 04:25:27 2011
@@ -1,107 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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://http"
-  name="palette">
-        
-    <service name="host" promote="host"/>
-    <service name="path" promote="path"/>
-    <service name="params" promote="params"/>
-    <service name="param" promote="param"/>
-    <service name="user" promote="user"/>
-    <service name="email" promote="email"/>
-    <service name="url" promote="url"/>
-    <service name="get" promote="get"/>
-    <service name="post" promote="post"/>
-    <service name="put" promote="put"/>
-    <service name="delete" promote="delete"/>
-
-    <component name="host" t:title="host" t:color="green1">
-        <t:implementation.python script="nuvem/host.py"/>
-        <service name="host"/>
-        <property name="host" t:visible="false"></property>
-    </component>
-    
-    <component name="path" t:title="path" t:color="green1">
-        <t:implementation.python script="nuvem/path.py"/>
-        <service name="path"/>
-        <property name="path" t:visible="false"></property>
-    </component>
-    
-    <component name="params" t:title="?params" t:color="green1">
-        <t:implementation.python script="nuvem/params.py"/>
-        <service name="params"/>
-        <property name="query" t:visible="false"></property>
-    </component>
-    
-    <component name="param" t:title="?param" t:color="green1">
-        <t:implementation.python script="nuvem/param.py"/>
-        <service name="param"/>
-        <property name="name">x</property>
-        <property name="query" t:visible="false"></property>
-    </component>
-    
-    <component name="user" t:title="user" t:color="green1">
-        <t:implementation.python script="nuvem/user.py"/>
-        <service name="user"/>
-        <property name="user" t:visible="false"></property>
-    </component>
-    
-    <component name="email" t:title="email" t:color="green1">
-        <t:implementation.python script="nuvem/email.py"/>
-        <service name="email"/>
-        <property name="email" t:visible="false"></property>
-    </component>
-    
-    <component name="url" t:title="url" t:color="green1">
-        <t:implementation.python script="nuvem/url.py"/>
-        <service name="url"/>
-        <reference name="address"/>
-        <reference name="args"/>
-    </component>
-    
-    <component name="get" t:title="get" t:color="green1">
-        <implementation.cpp path="lib/http" library="libhttpget"/>
-        <service name="get"/>
-        <reference name="url"/>
-    </component>
-    
-    <component name="post" t:title="post **" t:color="green1">
-        <implementation.cpp path="lib/http" library="libhttppost"/>
-        <service name="post"/>
-        <reference name="url"/>
-        <reference name="content"/>
-    </component>
-    
-    <component name="put" t:title="put **" t:color="green1">
-        <implementation.cpp path="lib/http" library="libhttpput"/>
-        <service name="put"/>
-        <reference name="url"/>
-        <reference name="content"/>
-    </component>
-    
-    <component name="delete" t:title="delete" t:color="green1">
-        <implementation.cpp path="lib/http" library="libhttpdelete"/>
-        <service name="delete"/>
-        <reference name="url"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="delete" promote="delete"/>
+ <service name="email" promote="email"/>
+ <service name="get" promote="get"/>
+ <service name="host" promote="host"/>
+ <service name="keychain" promote="keychain"/>
+ <service name="param" promote="param"/>
+ <service name="params" promote="params"/>
+ <service name="path" promote="path"/>
+ <service name="post" promote="post"/>
+ <service name="put" promote="put"/>
+ <service name="url" promote="url"/>
+ <service name="user" promote="user"/>
+ <component x="180" y="230" name="delete" title="delete" color="green1">
+  <implementation.cpp path="lib/http" library="libhttpdelete"/>
+  <service name="delete"/>
+  <reference name="url"/>
+ </component>
+ <component x="160" y="110" name="email" title="email" color="green1">
+  <implementation.python script="nuvem/email.py"/>
+  <service name="email"/>
+  <property name="email" visible="false"/>
+ </component>
+ <component x="150" y="160" name="get" title="get" color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference name="url"/>
+ </component>
+ <component x="90" y="10" name="host" title="host" color="green1">
+  <implementation.python script="nuvem/host.py"/>
+  <service name="host"/>
+  <property name="host" visible="false"/>
+ </component>
+ <component x="230" y="110" name="keychain" title="keychain" color="green1">
+  <implementation.python script="nuvem/keychain.py"/>
+  <service name="keychain"/>
+  <reference name="name"/>
+  <reference name="account" target="Accounts" visible="false"/>
+ </component>
+ <component x="180" y="60" name="param" title="?param" color="green1">
+  <implementation.python script="nuvem/param.py"/>
+  <service name="param"/>
+  <property>x</property>
+  <property name="query" visible="false"/>
+ </component>
+ <component x="90" y="60" name="params" title="?params" color="green1">
+  <implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="query" visible="false"/>
+ </component>
+ <component x="160" y="10" name="path" title="path" color="green1">
+  <implementation.python script="nuvem/path.py"/>
+  <service name="path"/>
+  <property name="path" visible="false"/>
+ </component>
+ <component x="90" y="230" name="post" title="post **" color="green1">
+  <implementation.cpp path="lib/http" library="libhttppost"/>
+  <service name="post"/>
+  <reference name="url"/>
+  <reference name="content"/>
+ </component>
+ <component x="220" y="160" name="put" title="put **" color="green1">
+  <implementation.cpp path="lib/http" library="libhttpput"/>
+  <service name="put"/>
+  <reference name="url"/>
+  <reference name="content"/>
+ </component>
+ <component x="90" y="160" name="url" title="url" color="green1">
+  <implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference name="address"/>
+  <reference name="args"/>
+ </component>
+ <component x="90" y="110" name="user" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite Mon May 23 04:25:27 2011
@@ -1,137 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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://lists"
-  name="palette">
-        
-    <service name="pair" promote="pair"/>
-    <service name="list" promote="list"/>
-    <service name="first" promote="first"/>
-    <service name="rest" promote="rest"/>
-    <service name="second" promote="second"/>
-    <service name="last" promote="last"/>
-    <service name="empty" promote="empty"/>
-    <service name="insert" promote="insert"/>
-    <service name="append" promote="append"/>
-    <service name="itemnb" promote="itemnb"/>
-    <service name="lookup" promote="lookup"/>
-    <service name="search" promote="search"/>
-    <service name="names" promote="names"/>
-    <service name="values" promote="values"/>
-    <service name="range" promote="range"/>
-
-    <component name="pair" t:title="pair" t:color="yellow1">
-        <t:implementation.python script="nuvem/pair.py"/>
-        <service name="pair"/>
-        <reference name="name"/>
-        <reference name="value"/>
-    </component>
-    
-    <component name="list" t:title="list" t:color="yellow1">
-        <t:implementation.python script="nuvem/list_.py"/>
-        <service name="list"/>
-        <reference name="item" t:clonable="true"/>
-    </component>
-    
-    <component name="first" t:title="first" t:color="yellow1">
-        <t:implementation.python script="nuvem/first.py"/>
-        <service name="first"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="rest" t:title="rest" t:color="yellow1">
-        <t:implementation.python script="nuvem/rest.py"/>
-        <service name="rest"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="second" t:title="second" t:color="yellow1">
-        <t:implementation.python script="nuvem/second.py"/>
-        <service name="second"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="last" t:title="last" t:color="yellow1">
-        <t:implementation.python script="nuvem/last.py"/>
-        <service name="last"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="empty" t:title="empty" t:color="yellow1">
-        <t:implementation.python script="nuvem/empty.py"/>
-        <service name="empty"/>
-    </component>
-    
-    <component name="insert" t:title="insert" t:color="yellow1">
-        <t:implementation.python script="nuvem/insert.py"/>
-        <service name="insert"/>
-        <reference name="value"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="append" t:title="+" t:color="yellow1">
-        <t:implementation.python script="nuvem/append.py"/>
-        <service name="append"/>
-        <reference name="first"/>
-        <reference name="second"/>
-    </component>
-    
-    <component name="itemnb" t:title="item #" t:color="yellow1">
-        <t:implementation.python script="nuvem/itemnb.py"/>
-        <service name="itemnb"/>
-        <reference name="index"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="lookup" t:title="lookup" t:color="yellow1">
-        <t:implementation.python script="nuvem/lookup.py"/>
-        <service name="lookup"/>
-        <reference name="name"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="search" t:title="search" t:color="yellow1">
-        <t:implementation.python script="nuvem/search.py"/>
-        <service name="search"/>
-        <reference name="path"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="names" t:title="names" t:color="yellow1">
-        <t:implementation.python script="nuvem/names.py"/>
-        <service name="names"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="values" t:title="values" t:color="yellow1">
-        <t:implementation.python script="nuvem/values.py"/>
-        <service name="values"/>
-        <reference name="list"/>
-    </component>
-    
-    <component name="range" t:title="range" t:color="yellow1">
-        <t:implementation.python script="nuvem/range_.py"/>
-        <service name="range"/>
-        <reference name="first"/>
-        <reference name="last"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="append" promote="append"/>
+ <service name="empty" promote="empty"/>
+ <service name="first" promote="first"/>
+ <service name="insert" promote="insert"/>
+ <service name="itemnb" promote="itemnb"/>
+ <service name="last" promote="last"/>
+ <service name="list" promote="list"/>
+ <service name="lookup" promote="lookup"/>
+ <service name="names" promote="names"/>
+ <service name="pair" promote="pair"/>
+ <service name="range" promote="range"/>
+ <service name="rest" promote="rest"/>
+ <service name="second" promote="second"/>
+ <service name="select" promote="select"/>
+ <service name="values" promote="values"/>
+ <component x="170" y="70" name="append" title="+" color="yellow1">
+  <implementation.python script="nuvem/append.py"/>
+  <service name="append"/>
+  <reference name="first"/>
+  <reference name="second"/>
+ </component>
+ <component x="230" y="10" name="empty" title="empty" color="yellow1">
+  <implementation.python script="nuvem/empty.py"/>
+  <service name="empty"/>
+ </component>
+ <component x="90" y="140" name="first" title="first" color="yellow1">
+  <implementation.python script="nuvem/first.py"/>
+  <service name="first"/>
+  <reference name="list"/>
+ </component>
+ <component x="90" y="70" name="insert" title="insert" color="yellow1">
+  <implementation.python script="nuvem/insert.py"/>
+  <service name="insert"/>
+  <reference name="value"/>
+  <reference name="list"/>
+ </component>
+ <component x="230" y="140" name="itemnb" title="item #" color="yellow1">
+  <implementation.python script="nuvem/itemnb.py"/>
+  <service name="itemnb"/>
+  <reference name="index"/>
+  <reference name="list"/>
+ </component>
+ <component x="160" y="190" name="last" title="last" color="yellow1">
+  <implementation.python script="nuvem/last.py"/>
+  <service name="last"/>
+  <reference name="list"/>
+ </component>
+ <component x="90" y="13" name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component x="90" y="240" name="lookup" title="lookup" color="yellow1">
+  <implementation.python script="nuvem/lookup.py"/>
+  <service name="lookup"/>
+  <reference name="name"/>
+  <reference name="list"/>
+ </component>
+ <component x="90" y="310" name="names" title="names" color="yellow1">
+  <implementation.python script="nuvem/names.py"/>
+  <service name="names"/>
+  <reference name="list"/>
+ </component>
+ <component x="160" y="10" name="pair" title="pair" color="yellow1">
+  <implementation.python script="nuvem/pair.py"/>
+  <service name="pair"/>
+  <reference name="name"/>
+  <reference name="value"/>
+ </component>
+ <component x="230" y="70" name="range" title="range" color="yellow1">
+  <implementation.python script="nuvem/range_.py"/>
+  <service name="range"/>
+  <reference name="first"/>
+  <reference name="last"/>
+ </component>
+ <component x="90" y="190" name="rest" title="rest" color="yellow1">
+  <implementation.python script="nuvem/rest.py"/>
+  <service name="rest"/>
+  <reference name="list"/>
+ </component>
+ <component x="150" y="140" name="second" title="second" color="yellow1">
+  <implementation.python script="nuvem/second.py"/>
+  <service name="second"/>
+  <reference name="list"/>
+ </component>
+ <component x="170" y="240" name="select" title="select" color="yellow1">
+  <implementation.python script="nuvem/select.py"/>
+  <service name="select"/>
+  <reference name="path"/>
+  <reference name="list"/>
+ </component>
+ <component x="170" y="310" name="values" title="values" color="yellow1">
+  <implementation.python script="nuvem/values.py"/>
+  <service name="values"/>
+  <reference name="list"/>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite?rev=1126306&r1=1126305&r2=1126306&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite Mon May 23 04:25:27 2011
@@ -1,82 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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://logic"
-  name="palette">
-        
-    <service name="if" promote="if"/>
-    <service name="and" promote="and"/>
-    <service name="or" promote="or"/>
-    <service name="not" promote="not"/>
-    <service name="equals" promote="equals"/>
-    <service name="greater" promote="greater"/>
-    <service name="lesser" promote="lesser"/>
-
-    <component name="if" t:title="if" t:color="magenta1">
-        <t:implementation.python script="nuvem/if_.py"/>
-        <service name="if"/>
-        <reference name="condition"/>
-        <reference name="then"/>
-        <reference name="else"/>
-    </component>
-    
-    <component name="and" t:title="and" t:color="magenta1">
-        <t:implementation.python script="nuvem/and_.py"/>
-        <service name="and"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="or" t:title="or" t:color="magenta1">
-        <t:implementation.python script="nuvem/or_.py"/>
-        <service name="or"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="not" t:title="not" t:color="magenta1">
-        <t:implementation.python script="nuvem/not_.py"/>
-        <service name="not"/>
-        <reference name="value"/>
-    </component>
-    
-    <component name="equals" t:title="=" t:color="magenta1">
-        <t:implementation.python script="nuvem/equals.py"/>
-        <service name="equals"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="greater" t:title="gt" t:color="magenta1">
-        <t:implementation.python script="nuvem/greater.py"/>
-        <service name="greater"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
-    <component name="lesser" t:title="lt" t:color="magenta1">
-        <t:implementation.python script="nuvem/lesser.py"/>
-        <service name="lesser"/>
-        <reference name="value1"/>
-        <reference name="value2"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="and" promote="and"/>
+ <service name="equals" promote="equals"/>
+ <service name="greater" promote="greater"/>
+ <service name="if" promote="if"/>
+ <service name="lesser" promote="lesser"/>
+ <service name="not" promote="not"/>
+ <service name="or" promote="or"/>
+ <component x="140" y="10" name="and" title="and" color="magenta1">
+  <implementation.python script="nuvem/and_.py"/>
+  <service name="and"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="90" y="100" name="equals" title="=" color="magenta1">
+  <implementation.python script="nuvem/equals.py"/>
+  <service name="equals"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="210" y="100" name="greater" title="gt" color="magenta1">
+  <implementation.python script="nuvem/greater.py"/>
+  <service name="greater"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="90" y="10" name="if" title="if" color="magenta1">
+  <implementation.python script="nuvem/if_.py"/>
+  <service name="if"/>
+  <reference name="condition"/>
+  <reference name="then"/>
+  <reference name="else"/>
+ </component>
+ <component x="150" y="100" name="lesser" title="lt" color="magenta1">
+  <implementation.python script="nuvem/lesser.py"/>
+  <service name="lesser"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
+ <component x="260" y="10" name="not" title="not" color="magenta1">
+  <implementation.python script="nuvem/not_.py"/>
+  <service name="not"/>
+  <reference name="value"/>
+ </component>
+ <component x="200" y="10" name="or" title="or" color="magenta1">
+  <implementation.python script="nuvem/or_.py"/>
+  <service name="or"/>
+  <reference name="value1"/>
+  <reference name="value2"/>
+ </component>
 </composite>



Mime
View raw message