tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1094208 [3/4] - in /tuscany/sca-cpp/trunk/modules/edit: apps/buzzprofile/ apps/me360/ apps/nearme/ apps/ourphotos/ apps/shoppingcart/ apps/slice/ apps/test/ apps/testdb/ apps/testevents/ apps/testhttp/ apps/testlogic/ apps/testsearch/ apps...
Date Sun, 17 Apr 2011 22:14:00 GMT
Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite?rev=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite Sun Apr 17 22:13:58 2011
@@ -18,33 +18,7 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testsocial" name="testsocial">
- <service name="page" promote="page"/>
- <component t:x="68" t:y="4" name="page" t:title="when page opened" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="me360" name="content"/>
- </component>
- <component t:x="262" t:y="152" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="twprofile" name="value"/>
- </component>
- <component t:x="311" t:y="148" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>twprofile</property>
- </component>
- <component t:x="128" t:y="12" name="me360" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
-  <reference target="list3" name="value"/>
- </component>
- <service name="twtimeline" promote="twtimeline"/>
- <component t:x="366" t:y="233" name="twtimeline" t:title="twitter timeline" t:color="blue1">
+ <component t:x="485" t:y="164" name="twtimeline" t:title="twitter timeline" t:color="blue1">
   <t:implementation.python script="nuvem/twtimeline.py"/>
   <service name="twtimeline"/>
   <reference target="text2" name="id"/>
@@ -52,13 +26,7 @@
    <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/>
   </reference>
  </component>
- <component t:x="256" t:y="367" name="text5" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <service name="twfriends" promote="twfriends"/>
- <component t:x="367" t:y="288" name="twfriends" t:title="twitter friends" t:color="blue1">
+ <component t:x="477" t:y="201" name="twfriends" t:title="twitter friends" t:color="blue1">
   <t:implementation.python script="nuvem/twfriends.py"/>
   <service name="twfriends"/>
   <reference target="text4" name="id"/>
@@ -66,8 +34,7 @@
    <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/>
   </reference>
  </component>
- <service name="twfollowers" promote="twfollowers"/>
- <component t:x="369" t:y="344" name="twfollowers" t:title="twitter followers" t:color="blue1">
+ <component t:x="488" t:y="254" name="twfollowers" t:title="twitter followers" t:color="blue1">
   <t:implementation.python script="nuvem/twfollowers.py"/>
   <service name="twfollowers"/>
   <reference target="text5" name="id"/>
@@ -75,27 +42,27 @@
    <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/>
   </reference>
  </component>
- <component t:x="337" t:y="15" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>me360</property>
- </component>
- <component t:x="589" t:y="71" name="text" t:title="text" t:color="orange1">
+ <component t:x="589" t:y="71" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>100001053301307</property>
  </component>
- <component t:x="252" t:y="308" name="text4" t:title="text" t:color="orange1">
+ <component t:x="252" t:y="308" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
+ </component>
+ <component t:x="745" t:y="149" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="745" t:y="149" name="text2" t:title="text" t:color="orange1">
+ <component t:x="493" t:y="132" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="376" t:y="164" name="twprofile" t:title="twitter profile" t:color="blue1">
+ <component t:x="334" t:y="462" name="twprofile" t:title="twitter profile" t:color="blue1">
   <t:implementation.python script="nuvem/twprofile.py"/>
   <service name="twprofile"/>
   <reference target="text3" name="id"/>
@@ -103,35 +70,110 @@
    <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
   </reference>
  </component>
- <component t:x="493" t:y="132" name="text3" t:title="text" t:color="orange1">
+ <component t:x="626" t:y="77" name="fbprofile" t:title="facebook profile" t:color="blue1">
+  <t:implementation.python script="nuvem/fbprofile.py"/>
+  <service name="fbprofile"/>
+  <reference target="text" name="id"/>
+  <reference name="fb" t:visible="false">
+   <t:binding.http uri="https://graph.facebook.com"/>
+  </reference>
+ </component>
+ <component t:x="662" t:y="220" name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
- <component t:x="284" t:y="32" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="204" t:y="35" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="list3" name="content"/>
+ </component>
+ <component t:x="393" t:y="35" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
   <reference target="fbprofile" name="value"/>
+  <property>name</property>
+ </component>
+ <component t:x="393" t:y="79" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twprofile" name="value"/>
+  <property>twitprofile</property>
+ </component>
+ <component t:x="393" t:y="123" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twtimeline" name="value"/>
+  <property>twittimeline</property>
+ </component>
+ <component t:x="393" t:y="167" name="property4" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twfriends" name="value"/>
+  <property>twitfriends</property>
+ </component>
+ <component t:x="393" t:y="211" name="property5" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twfollowers" name="value"/>
+  <property>twitfollowers</property>
  </component>
- <component t:x="236" t:y="32" name="list3" t:title="list" t:color="yellow1">
+ <component t:x="318" t:y="35" name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference target="property4" name="item" t:clonable="true"/>
+  <reference target="property5" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="324" t:y="32" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>fbprofile</property>
+ <component t:x="460" t:y="358" name="text6" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.2@gmail.com</property>
  </component>
- <component t:x="324" t:y="60" name="fbprofile" t:title="facebook profile" t:color="blue1">
-  <t:implementation.python script="nuvem/fbprofile.py"/>
-  <service name="fbprofile"/>
-  <reference target="text" name="id"/>
-  <reference name="fb" t:visible="false">
-   <t:binding.http uri="https://graph.facebook.com"/>
-  </reference>
+ <component t:x="582" t:y="431" name="text7" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Hello, the time is {0}</property>
+ </component>
+ <component t:x="623" t:y="452" name="now" t:title="now" t:color="orange1">
+  <t:implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+ </component>
+ <component t:x="575" t:y="447" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="now" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="461" t:y="380" name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text7" name="pattern"/>
+  <reference target="list" name="values"/>
+ </component>
+ <service name="sendgtalk" promote="sendgtalk"/>
+ <component t:x="410" t:y="318" name="sendgtalk" t:title="gtalk" t:color="blue1">
+  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+  <service name="sendgtalk"/>
+  <reference target="text8" name="jid"/>
+  <reference target="text9" name="pass"/>
+  <reference target="text6" name="to"/>
+  <reference target="format" name="msg"/>
+ </component>
+ <component t:x="460" t:y="318" name="text8" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmppsca.1@gmail.com</property>
+ </component>
+ <component t:x="460" t:y="346" name="text9" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xmpp4sca</property>
  </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html?rev=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html Sun Apr 17 22:13:58 2011
@@ -18,41 +18,7 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="twprofile" class="table" style="position: absolute; top: 314px; left: 3px; ">
-  <TABLE class="datatable">
-   <TBODY>
-    <TR>
-     <TD>name</TD>
-     <TD>value</TD>
-    </TR>
-    <TR>
-     <TD>name</TD>
-     <TD>value</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="h1" class="h1" style="position: absolute; top: 6px; left: 0px; ">
-  <H1>My social profiles</H1>
- </SPAN>
- <SPAN id="fbsection" class="section" style="position: absolute; top: 51px; left: 3px; ">
-  <SPAN>Facebook profile</SPAN>
- </SPAN>
- <SPAN id="fbprofile" class="table" style="position: absolute; top: 88px; left: 3px; ">
-  <TABLE class="datatable">
-   <TBODY>
-    <TR>
-     <TD>name</TD>
-     <TD>value</TD>
-    </TR>
-    <TR>
-     <TD>name</TD>
-     <TD>value</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 281px; left: 0px; ">
-  <SPAN>Twitter profile</SPAN>
+ <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; ">
+  <H1>Test social components</H1>
  </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite?rev=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite Sun Apr 17 22:13:58 2011
@@ -26,21 +26,21 @@
   <reference target="text9" name="string"/>
  </component>
  <service name="split" promote="split"/>
- <component t:x="36" t:y="152" name="split" t:title="split" t:color="magenta1">
+ <component t:x="34" t:y="140" name="split" t:title="split" t:color="magenta1">
   <t:implementation.python script="nuvem/split.py"/>
   <service name="split"/>
   <reference target="text11" name="separator"/>
   <reference target="text12" name="string"/>
  </component>
  <service name="join" promote="join"/>
- <component t:x="488" t:y="25" name="join" t:title="join" t:color="magenta1">
+ <component t:x="420" t:y="25" name="join" t:title="join" t:color="magenta1">
   <t:implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text6" name="separator"/>
   <reference target="list2" name="list"/>
  </component>
  <service name="replace" promote="replace"/>
- <component t:x="220" t:y="31" name="replace" t:title="replace" t:color="magenta1">
+ <component t:x="204" t:y="27" name="replace" t:title="replace" t:color="magenta1">
   <t:implementation.python script="nuvem/replace.py"/>
   <service name="replace"/>
   <reference target="text4" name="from"/>
@@ -48,63 +48,63 @@
   <reference target="text3" name="string"/>
  </component>
  <service name="lowercase" promote="lowercase"/>
- <component t:x="34" t:y="317" name="lowercase" t:title="lowercase" t:color="magenta1">
+ <component t:x="34" t:y="297" name="lowercase" t:title="lower" t:color="magenta1">
   <t:implementation.python script="nuvem/lowercase.py"/>
   <service name="lowercase"/>
   <reference target="text2" name="string"/>
  </component>
  <service name="uppercase" promote="uppercase"/>
- <component t:x="34" t:y="253" name="uppercase" t:title="uppercase" t:color="magenta1">
+ <component t:x="35" t:y="236" name="uppercase" t:title="upper" t:color="magenta1">
   <t:implementation.python script="nuvem/uppercase.py"/>
   <service name="uppercase"/>
   <reference target="text" name="string"/>
  </component>
- <component t:x="391" t:y="223" name="text" t:title="text" t:color="orange1">
+ <component t:x="391" t:y="223" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component t:x="391" t:y="150" name="text2" t:title="text" t:color="orange1">
+ <component t:x="391" t:y="150" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>ABC</property>
  </component>
- <component t:x="376" t:y="81" name="text3" t:title="text" t:color="orange1">
+ <component t:x="376" t:y="81" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcxdefxghi</property>
  </component>
- <component t:x="377" t:y="20" name="text4" t:title="text" t:color="orange1">
+ <component t:x="377" t:y="20" name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component t:x="376" t:y="63" name="text5" t:title="text" t:color="orange1">
+ <component t:x="376" t:y="63" name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>y</property>
  </component>
- <component t:x="107" t:y="56" name="text9" t:title="text" t:color="orange1">
+ <component t:x="107" t:y="56" name="text9" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcdef</property>
  </component>
- <component t:x="107" t:y="14" name="text10" t:title="text" t:color="orange1">
+ <component t:x="107" t:y="14" name="text10" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>cd</property>
  </component>
- <component t:x="587" t:y="20" name="text6" t:title="text" t:color="orange1">
+ <component t:x="587" t:y="20" name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component t:x="85" t:y="156" name="text11" t:title="text" t:color="orange1">
+ <component t:x="85" t:y="156" name="text11" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>x</property>
  </component>
- <component t:x="89" t:y="193" name="text12" t:title="text" t:color="orange1">
+ <component t:x="89" t:y="193" name="text12" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abcxdefxghi</property>
@@ -116,31 +116,31 @@
   <reference target="text8" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="662" t:y="61" name="text7" t:title="text" t:color="orange1">
+ <component t:x="662" t:y="61" name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>abc</property>
  </component>
- <component t:x="655" t:y="98" name="text8" t:title="text" t:color="orange1">
+ <component t:x="655" t:y="98" name="text8" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>def</property>
  </component>
  <service name="format" promote="format"/>
- <component t:x="229" t:y="174" name="format" t:title="format" t:color="magenta1">
+ <component t:x="220" t:y="170" name="format" t:title="format" t:color="magenta1">
   <t:implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text13" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
  <service name="format2" promote="format2"/>
- <component t:x="492" t:y="189" name="format2" t:title="format" t:color="magenta1">
+ <component t:x="444" t:y="164" name="format2" t:title="format" t:color="magenta1">
   <t:implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference target="text14" name="pattern"/>
   <reference target="list3" name="values"/>
  </component>
- <component t:x="365" t:y="194" name="text13" t:title="text" t:color="orange1">
+ <component t:x="365" t:y="194" name="text13" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>The {0} brown {1}</property>
@@ -152,17 +152,17 @@
   <reference target="text16" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="444" t:y="236" name="text15" t:title="text" t:color="orange1">
+ <component t:x="444" t:y="236" name="text15" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>quick</property>
  </component>
- <component t:x="438" t:y="274" name="text16" t:title="text" t:color="orange1">
+ <component t:x="438" t:y="274" name="text16" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>fox</property>
  </component>
- <component t:x="599" t:y="198" name="text14" t:title="text" t:color="orange1">
+ <component t:x="599" t:y="198" name="text14" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>The {a} brown {b}</property>
@@ -170,57 +170,47 @@
  <component t:x="603" t:y="239" name="list3" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="675" t:y="243" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="text17" name="value"/>
- </component>
- <component t:x="673" t:y="287" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="text18" name="value"/>
- </component>
- <component t:x="727" t:y="238" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>a</property>
- </component>
- <component t:x="727" t:y="326" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>b</property>
- </component>
- <component t:x="727" t:y="278" name="text17" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>quick</property>
- </component>
- <component t:x="727" t:y="366" name="text18" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>fox</property>
- </component>
  <service name="parse" promote="parse"/>
- <component t:x="35" t:y="378" name="parse" t:title="parse" t:color="magenta1">
+ <component t:x="218" t:y="325" name="parse" t:title="parse" t:color="magenta1">
   <t:implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference target="text19" name="regexp"/>
   <reference target="text20" name="string"/>
  </component>
- <component t:x="89" t:y="428" name="text20" t:title="text" t:color="orange1">
+ <component t:x="89" t:y="428" name="text20" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>city San Francisco state CA</property>
  </component>
- <component t:x="89" t:y="388" name="text19" t:title="text" t:color="orange1">
+ <component t:x="89" t:y="388" name="text19" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>city (.*) state (.*)</property>
  </component>
+ <component t:x="589" t:y="215" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text17" name="value"/>
+  <property>a</property>
+ </component>
+ <component t:x="840" t:y="241" name="text17" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>quick</property>
+ </component>
+ <component t:x="586" t:y="254" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text18" name="value"/>
+  <property>b</property>
+ </component>
+ <component t:x="837" t:y="299" name="text18" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>fox</property>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.html?rev=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.html Sun Apr 17 22:13:58 2011
@@ -17,4 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test text processing components</H2>
+ </SPAN>
+</DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite?rev=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite Sun Apr 17 22:13:58 2011
@@ -19,39 +19,104 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testurl" name="testurl">
  <service name="host" promote="host"/>
- <component t:x="29" t:y="14" name="host" t:title="host" t:color="green1">
+ <component t:x="40" t:y="30" name="host" t:title="host" t:color="green1">
   <t:implementation.python script="nuvem/host.py"/>
   <service name="host"/>
   <property name="host"/>
  </component>
  <service name="path" promote="path"/>
- <component t:x="29" t:y="80" name="path" t:title="path" t:color="green1">
+ <component t:x="39" t:y="81" name="path" t:title="path" t:color="green1">
   <t:implementation.python script="nuvem/path.py"/>
   <service name="path"/>
   <property name="path"/>
  </component>
  <service name="params" promote="params"/>
- <component t:x="28" t:y="141" name="params" t:title="?params" t:color="green1">
+ <component t:x="41" t:y="133" name="params" t:title="?params" t:color="green1">
   <t:implementation.python script="nuvem/params.py"/>
   <service name="params"/>
   <property name="params"/>
  </component>
  <service name="user" promote="user"/>
- <component t:x="25" t:y="205" name="user" t:title="user" t:color="green1">
+ <component t:x="37" t:y="198" name="user" t:title="user" t:color="green1">
   <t:implementation.python script="nuvem/user.py"/>
   <service name="user"/>
   <property name="user"/>
  </component>
  <service name="realm" promote="realm"/>
- <component t:x="22" t:y="265" name="realm" t:title="realm" t:color="green1">
+ <component t:x="35" t:y="254" name="realm" t:title="realm" t:color="green1">
   <t:implementation.python script="nuvem/realm.py"/>
   <service name="realm"/>
   <property name="realm"/>
  </component>
  <service name="email" promote="email"/>
- <component t:x="26" t:y="328" name="email" t:title="email" t:color="green1">
+ <component t:x="35" t:y="316" name="email" t:title="email" t:color="green1">
   <t:implementation.python script="nuvem/email.py"/>
   <service name="email"/>
   <property name="email"/>
  </component>
+ <service name="url" promote="url"/>
+ <component t:x="162" t:y="36" name="url" t:title="url" t:color="green1">
+  <t:implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference target="text" name="address"/>
+  <reference target="list" name="args"/>
+ </component>
+ <component t:x="240" t:y="27" name="text" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://sca-store.com/</property>
+ </component>
+ <component t:x="242" t:y="58" name="list" t:title="list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text2" name="item" t:clonable="true"/>
+  <reference target="text3" name="item" t:clonable="true"/>
+  <reference target="property" name="item" t:clonable="true"/>
+  <reference target="property2" name="item" t:clonable="true"/>
+  <reference target="property3" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="280" t:y="61" name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test</property>
+ </component>
+ <component t:x="282" t:y="90" name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>path</property>
+ </component>
+ <component t:x="277" t:y="108" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text4" name="value"/>
+  <property>parmx</property>
+ </component>
+ <component t:x="276" t:y="169" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text5" name="value"/>
+  <property>parmy</property>
+ </component>
+ <component t:x="271" t:y="224" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="number" name="value"/>
+  <property>parmn</property>
+ </component>
+ <component t:x="385" t:y="228" name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>123</property>
+ </component>
+ <component t:x="386" t:y="169" name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>yy</property>
+ </component>
+ <component t:x="386" t:y="110" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>xx</property>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.html?rev=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.html Sun Apr 17 22:13:58 2011
@@ -17,4 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test url components</H2>
+ </SPAN>
+</DIV>

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=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite Sun Apr 17 22:13:58 2011
@@ -19,157 +19,104 @@
 -->
 <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">
  <service name="name" promote="name"/>
- <component t:x="8" t:y="91" name="name" t:title="name" t:color="orange1">
+ <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="true" promote="true"/>
- <component t:x="11" t:y="152" name="true" t:title="true" t:color="orange1">
+ <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>
  <service name="false" promote="false"/>
- <component t:x="6" t:y="205" name="false" t:title="false" t:color="orange1">
+ <component t:x="35" t:y="254" name="false" t:title="false" t:color="orange1">
   <t:implementation.python script="nuvem/false_.py"/>
   <service name="false"/>
  </component>
- <service name="find" promote="find"/>
- <component t:x="740" t:y="32" name="find" t:title="find by name" t:color="yellow1">
-  <t:implementation.python script="nuvem/find.py"/>
-  <service name="find"/>
+ <service name="lookup" promote="lookup"/>
+ <component t:x="128" t:y="399" 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="pair"/>
+  <reference target="list2" name="list"/>
  </component>
- <component t:x="283" t:y="351" name="name3" t:title="name" t:color="orange1">
+ <component t:x="283" t:y="351" name="name3" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
   <property>d</property>
  </component>
- <component t:x="420" t:y="390" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>a</property>
- </component>
- <component t:x="421" t:y="436" name="text3" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>abc</property>
- </component>
- <component t:x="495" t:y="486" name="name5" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>d</property>
- </component>
- <component t:x="787" t:y="217" name="text4" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>def</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>
- <component t:x="378" t:y="48" name="number4" t:title="number" t:color="orange1">
+ <component t:x="378" t:y="48" name="number4" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>0</property>
  </component>
- <component t:x="378" t:y="90" name="number5" t:title="number" t:color="orange1">
+ <component t:x="378" t:y="90" name="number5" 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="212" t:y="49" name="first" t:title="first item" t:color="yellow1">
+ <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="475" t:y="41" name="rest" t:title="rest of list" t:color="yellow1">
+ <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="5" t:y="320" name="empty" t:title="empty list" t:color="yellow1">
+ <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="121" t:y="178" name="itemnb" t:title="item number" t:color="yellow1">
+ <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="number" t:color="orange1">
+ <component t:x="208" t:y="187" name="number8" 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="name" t:color="orange1">
+ <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>
  </component>
- <service name="reduce" promote="reduce"/>
- <component t:x="486" t:y="191" name="reduce" 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="range2" name="list"/>
- </component>
- <component t:x="449" t:y="259" name="name6" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>sum</property>
- </component>
- <component t:x="442" t:y="299" name="name7" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>i</property>
- </component>
- <component t:x="444" t:y="341" 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>
- <component t:x="444" t:y="437" 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>
- <component t:x="498" t:y="437" name="number9" t:title="number" t:color="orange1">
+ <component t:x="498" t:y="437" name="number9" 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="number" t:color="orange1">
+ <component t:x="547" t:y="403" name="number10" 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="number" t:color="orange1">
+ <component t:x="226" t:y="373" name="number6" 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="value of" t:color="orange1">
+ <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="value of" t:color="orange1">
+ <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>
@@ -182,7 +129,7 @@
   <reference target="valueof" name="value1"/>
   <reference target="number6" name="value2"/>
  </component>
- <component t:x="280" t:y="264" name="valueof" t:title="value of" t:color="orange1">
+ <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>
@@ -194,80 +141,312 @@
   <reference target="number3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="241" t:y="11" name="number2" t:title="number" t:color="orange1">
+ <component t:x="241" t:y="11" 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="number" t:color="orange1">
+ <component t:x="241" t:y="48" 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="7" t:y="260" name="nothing" t:title="nothing" t:color="orange1">
+ <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>
- <component t:x="488" t:y="11" 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 t:x="558" t:y="6" name="number" t:title="number" t:color="orange1">
+ <component t:x="558" t:y="6" name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>12</property>
  </component>
- <component t:x="559" t:y="46" name="number7" t:title="number" t:color="orange1">
+ <component t:x="559" t:y="46" name="number7" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>34</property>
  </component>
- <component t:x="902" t:y="56" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name4" name="name"/>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <component t:x="264" t:y="429" 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="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>
- <component t:x="896" t:y="137" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name5" name="name"/>
+ <component t:x="267" t:y="460" 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">
+  <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">
+  <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">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text6" name="value"/>
+  <property>b</property>
+ </component>
+ <component t:x="1020" t:y="286" 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">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="text8" name="value"/>
+  <property>c</property>
+ </component>
+ <component t:x="941" t:y="227" 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="823" t:y="49" name="list2" t:title="list" t:color="yellow1">
+ <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="pair2" name="item" t:clonable="true"/>
-  <reference target="pair3" name="item" t:clonable="true"/>
+  <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="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 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>
- <service name="page" promote="page"/>
- <component t:x="0" t:y="26" name="page" t:title="when page opened" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="text" name="content"/>
+ <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="128" t:y="26" name="text" t:title="text" t:color="orange1">
+ <component t:x="860" t:y="171" 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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <service name="shuffle" promote="shuffle"/>
+ <component t:x="350" t:y="373" 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>
+ <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>
+ <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>
+ <component t:x="150" t:y="18" 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="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"/>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <component t:x="552" t:y="146" name="name6" t:title="" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <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>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html?rev=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html Sun Apr 17 22:13:58 2011
@@ -18,7 +18,10 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="value" class="h2" style="position: absolute; top: 17px; left: 4px; ">
-  <H2>Header2</H2>
+ <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; ">
+  <H2>Test values and lists</H2>
  </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=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite Sun Apr 17 22:13:58 2011
@@ -18,192 +18,131 @@
  * 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">
- <service name="page" promote="page"/>
- <component t:x="208" t:y="0" name="page" t:title="when page opens" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="pair8" name="content"/>
- </component>
- <component t:x="516" t:y="121" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="text" name="value"/>
- </component>
- <component t:x="571" t:y="121" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testh1</property>
+ <component t:x="708" t:y="619" 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="571" t:y="161" name="text" t:title="text" t:color="orange1">
+ <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 header 1</property>
+  <property>test path</property>
  </component>
- <component t:x="506" t:y="176" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testentry</property>
+ <component t:x="413" t:y="315" 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="506" t:y="216" name="text3" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test entry field</property>
+ <component t:x="411" t:y="281" 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="458" t:y="392" name="text5" t:title="text" t:color="orange1">
+ <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>test checkbox</property>
+  <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property>
  </component>
- <component t:x="459" t:y="263" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testbutton</property>
+ <component t:x="410" t:y="247" 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="458" t:y="302" name="text2" t:title="text" t:color="orange1">
+ <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 button</property>
+  <property>test text</property>
  </component>
- <component t:x="458" t:y="352" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
+ <component t:x="411" t:y="210" 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="464" t:y="444" name="name5" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testimg</property>
+ <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="458" t:y="480" name="text6" t:title="text" t:color="orange1">
+ <component t:x="413" t:y="177" 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>http://tuscany.apache.org/images/TuscanyLogo.jpg</property>
+  <property>test checkbox</property>
  </component>
- <component t:x="405" t:y="268" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
+ <component t:x="411" t:y="136" 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="407" t:y="355" name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name7" name="name"/>
-  <reference target="text5" name="value"/>
+ <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="409" t:y="178" name="pair6" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
+ <component t:x="401" t:y="102" 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="407" t:y="445" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name4" name="name"/>
-  <reference target="text4" name="value"/>
+ <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="461" t:y="87" name="name6" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
+ <component t:x="411" t:y="66" 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="458" t:y="128" name="text7" t:title="text" t:color="orange1">
+ <component t:x="780" t:y="147" name="text7" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>test section</property>
  </component>
- <component t:x="458" t:y="352" name="name7" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testcheckbox</property>
- </component>
- <component t:x="385" t:y="0" name="name8" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>test</property>
- </component>
- <component t:x="460" t:y="660" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name5" name="name"/>
-  <reference target="text6" name="value"/>
- </component>
- <component t:x="460" t:y="569" name="pair9" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name9" name="name"/>
-  <reference target="text8" name="value"/>
- </component>
- <component t:x="102" t:y="92" name="name9" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testtext</property>
+ <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>
- <component t:x="105" t:y="132" name="text8" t:title="text" t:color="orange1">
+ <component t:x="748" t:y="92" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>test text</property>
- </component>
- <component t:x="458" t:y="128" name="pair7" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name6" name="name"/>
-  <reference target="text7" name="value"/>
- </component>
- <component t:x="330" t:y="0" name="pair8" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name8" name="name"/>
-  <reference target="list" name="value"/>
+  <property>test header 1</property>
  </component>
- <component t:x="385" t:y="40" name="list" t:title="list" t:color="yellow1">
+ <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="pair" name="item" t:clonable="true"/>
-  <reference target="pair7" name="item" t:clonable="true"/>
-  <reference target="pair6" name="item" t:clonable="true"/>
-  <reference target="pair3" name="item" t:clonable="true"/>
-  <reference target="pair5" name="item" t:clonable="true"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
-  <reference target="pair9" name="item" t:clonable="true"/>
-  <reference target="pair4" name="item" t:clonable="true"/>
-  <reference target="pair10" name="item" t:clonable="true"/>
+  <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 t:x="513" t:y="520" name="text4" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://tuscany.apache.org</property>
- </component>
- <component t:x="515" t:y="541" name="name10" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testpath1</property>
- </component>
- <component t:x="512" t:y="568" name="pair11" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name11" name="name"/>
-  <reference target="text9" name="value"/>
- </component>
- <component t:x="571" t:y="567" name="name11" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testpath2</property>
- </component>
- <component t:x="567" t:y="596" name="text9" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test path</property>
- </component>
- <component t:x="457" t:y="540" name="pair10" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name10" name="name"/>
-  <reference target="pair11" name="value"/>
+ <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>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html?rev=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html Sun Apr 17 22:13:58 2011
@@ -18,15 +18,9 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="testh1" class="h1" style="position: absolute; top: 6px; left: 9px; ">
-  <H1>Header1</H1>
- </SPAN>
  <SPAN id="testbutton" class="button" style="position: absolute; top: 97px; left: 9px; ">
   <INPUT type="button" value="button"/>
  </SPAN>
- <SPAN id="testentry" class="entry" style="position: absolute; top: 135px; left: 15px; ">
-  <INPUT type="text" value="field" size="5"/>
- </SPAN>
  <SPAN id="testsection" class="section" style="position: absolute; top: 52px; left: 10px; ">
   <SPAN>section</SPAN>
  </SPAN>
@@ -42,20 +36,26 @@
    <SPAN>link</SPAN>
   </A>
  </SPAN>
- <SPAN id="testlink3" class="link" style="position: absolute; top: 142px; left: 256px; ">
+ <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: 105px; left: 256px; ">
+ <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: 12px; left: 252px; ">
+ <SPAN id="testimg" class="img" style="position: absolute; top: 90px; left: 263px; ">
   <IMG src="/public/img.png"/>
  </SPAN>
- <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 282px; left: 17px; ">
-  <SPAN>text</SPAN>
+ <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; ">
+  <INPUT type="text" value="field" size="20" autocapitalize="off"/>
  </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=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite Sun Apr 17 22:13:58 2011
@@ -18,148 +18,113 @@
  * 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="77" t:y="95" name="text" t:title="text" t:color="orange1">
+ <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>test value</property>
- </component>
- <component t:x="74" t:y="10" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testlist1</property>
+  <property>http://www.apache.org/</property>
  </component>
- <service name="page" promote="page"/>
- <component t:x="109" t:y="0" name="page" t:title="when page opens" t:color="green1">
-  <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="page"/>
-  </service>
-  <reference target="list" name="content"/>
+ <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>
- <component t:x="305" t:y="202" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="text" name="value"/>
+ <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>
- <component t:x="355" t:y="129" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testlist2</property>
+ <component t:x="271" t:y="276" 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="355" t:y="177" name="list2" t:title="list" t:color="yellow1">
+ <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="pair3" name="item" t:clonable="true"/>
-  <reference target="pair4" name="item" t:clonable="true"/>
+  <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="435" t:y="165" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
-  <reference target="number" name="value"/>
- </component>
- <component t:x="486" t:y="167" name="name3" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>a</property>
- </component>
- <component t:x="493" t:y="201" name="number" t:title="number" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>1</property>
- </component>
- <component t:x="435" t:y="256" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name4" name="name"/>
-  <reference target="number2" name="value"/>
- </component>
- <component t:x="488" t:y="288" name="number2" t:title="number" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>2</property>
- </component>
- <component t:x="303" t:y="126" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="list2" name="value"/>
- </component>
- <component t:x="482" t:y="251" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>b</property>
- </component>
- <component t:x="230" t:y="38" name="list" t:title="list" t:color="yellow1">
-  <t:implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair2" name="item" t:clonable="true"/>
-  <reference target="pair5" name="item" t:clonable="true"/>
-  <reference target="pair6" name="item" t:clonable="true"/>
-  <reference target="pair7" name="item" t:clonable="true"/>
-  <reference name="item" t:clonable="true"/>
+ <component t:x="272" t:y="183" 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="312" t:y="294" name="pair5" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name5" name="name"/>
+ <component t:x="270" t:y="147" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
   <reference target="text2" name="value"/>
- </component>
- <component t:x="377" t:y="292" name="name5" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
   <property>testhtml</property>
  </component>
- <component t:x="370" t:y="322" name="text2" t:title="text" t:color="orange1">
+ <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="315" t:y="362" name="pair6" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name6" name="name"/>
-  <reference target="list3" name="value"/>
- </component>
- <component t:x="371" t:y="362" name="name6" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testlink</property>
+ <component t:x="271" t:y="0" 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="449" t:y="389" name="text3" t:title="text" t:color="orange1">
+ <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>http://www.apache.org/</property>
+  <property>test value</property>
+ </component>
+ <component t:x="271" t:y="34" 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="369" t:y="387" name="list3" t:title="list" t:color="yellow1">
+ <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="text3" name="item" t:clonable="true"/>
-  <reference target="text4" name="item" t:clonable="true"/>
+  <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="735" t:y="335" name="text4" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Apache</property>
+ <component t:x="709" t:y="109" 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="319" t:y="478" name="pair7" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name7" name="name"/>
-  <reference target="text5" name="value"/>
+ <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="370" t:y="440" name="name7" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>testframe</property>
+ <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="379" t:y="471" name="text5" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://www.cnn.com</property>
+ <component t:x="710" t:y="142" 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"/>
+  </service>
+  <reference target="list" name="content"/>
  </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html?rev=1094208&r1=1094207&r2=1094208&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html Sun Apr 17 22:13:58 2011
@@ -18,66 +18,69 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="testtable1" class="table" style="position: absolute; top: 19px; left: 121px; ">
-  <TABLE class="datatable">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; ">
+  <H2>Test widget components</H2>
+ </SPAN>
+ <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; left: 20px; ">
+  <TABLE class="datatable" style="width: 200px;">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="testlist" class="list" style="position: absolute; top: 20px; left: 15px; ">
-  <SELECT>
-   <OPTION>list</OPTION>
-  </SELECT>
- </SPAN>
- <SPAN id="testtable2" class="table" style="position: absolute; top: 115px; left: 122px; ">
-  <TABLE class="datatable">
+ <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; left: 20px; ">
+  <TABLE class="datatable" style="width: 200px;">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 124px; ">
-  <TABLE class="datatable">
+ <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 20px; ">
+  <TABLE class="datatable" style="width: 200px;">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="testhtml" class="text" style="position: absolute; top: 18px; left: 297px; ">
+ <SPAN id="testhtml" class="text" style="position: absolute; top: 234px; left: 20px; ">
   <SPAN>text</SPAN>
  </SPAN>
- <SPAN id="testlink" class="link" style="position: absolute; top: 90px; left: 302px; ">
+ <SPAN id="testlink" class="link" style="position: absolute; top: 270px; left: 20px; ">
   <A href="/">
    <SPAN>link</SPAN>
   </A>
  </SPAN>
- <SPAN id="testframe" class="iframe" style="position: absolute; top: 142px; left: 301px; ">
+ <SPAN id="testframe" class="iframe" style="position: absolute; top: 306px; left: 20px; ">
   <A href="/public/iframe.html">
    <SPAN class="fakeframe">
     <SPAN>frame ...</SPAN>
    </SPAN>
   </A>
  </SPAN>
+ <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; ">
+  <SELECT>
+   <OPTION>select</OPTION>
+  </SELECT>
+ </SPAN>
 </DIV>



Mime
View raw message