diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-05-02 05:58:47 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2011-05-02 05:58:47 +0000 |
| commit | 636e046fd1cdf7a6f1a365e4f02f5bbc2f593c70 (patch) | |
| tree | ba254fdf29a82c2c8957b03732fe17a89154dd78 /sca-cpp/trunk/modules/edit/apps/test | |
| parent | 8cfb387f9129dcff5ff74922a3be8f1662529037 (diff) | |
Reformat, sort and refactor test and sample apps.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1098490 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
24 files changed, 1190 insertions, 1208 deletions
diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.composite b/sca-cpp/trunk/modules/edit/apps/test/app.composite index 37abe589ad..7e4828573a 100644 --- a/sca-cpp/trunk/modules/edit/apps/test/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite @@ -17,29 +17,11 @@ * 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://test" name="test"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> <service name="text3" promote="text3"/> - <component t:x="48" t:y="35" name="text3" t:title=" '{propval}'" t:color="orange1"> + <component t:x="27" t:y="12" name="text3" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>Hello World</property> </component> - <service name="fbprofile" promote="fbprofile"/> - <component t:x="404" t:y="163" name="fbprofile" t:title="facebook profile" t:color="blue1"> - <t:implementation.python script="nuvem/fbprofile.py"/> - <service name="fbprofile"/> - <reference name="id"/> - <reference name="fb" t:visible="false"> - <t:binding.http uri="https://graph.facebook.com"/> - </reference> - </component> - <service name="twprofile" promote="twprofile"/> - <component t:x="402" t:y="216" name="twprofile" t:title="twitter profile" t:color="blue1"> - <t:implementation.python script="nuvem/twprofile.py"/> - <service name="twprofile"/> - <reference name="id"/> - <reference name="tw" t:visible="false"> - <t:binding.http uri="http://api.twitter.com/1/users/show.json"/> - </reference> - </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.html b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html index 5c7c7219bb..5c7c7219bb 100644 --- a/sca-cpp/trunk/modules/edit/apps/test/app.html +++ b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite index 1a764eb20e..ddad3cd7a1 100644 --- a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite @@ -17,81 +17,81 @@ * 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://testdb" name="testdb"> - <component t:x="177" t:y="36" name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>testkey</property> - </component> - <component t:x="102" t:y="35" name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="text" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component t:x="103" t:y="91" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>testvalue</property> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> + <service name="delete" promote="delete"/> + <service name="get" promote="get"/> + <service name="put" promote="put"/> + <component t:x="176" t:y="11" name="delete" t:title="delete" t:color="red1"> + <t:implementation.python script="nuvem/delete.py"/> + <service name="delete"/> + <reference target="filedb2" name="collection"/> + <reference target="list3" name="id"/> </component> - <component t:x="105" t:y="8" name="filedb" t:title="file" t:color="red1"> + <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> - <service name="put" promote="put"/> - <component t:x="72" t:y="38" name="put" t:title="put" t:color="red1"> - <t:implementation.python script="nuvem/put.py"/> - <service name="put"/> - <reference target="filedb" name="collection"/> - <reference target="list" name="id"/> - <reference target="text2" name="value"/> - </component> - <component t:x="311" t:y="186" name="list2" 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 name="item" t:clonable="true"/> - </component> - <service name="get" promote="get"/> - <component t:x="263" t:y="42" name="get" t:title="get" t:color="red1"> - <t:implementation.python script="nuvem/get.py"/> - <service name="get"/> - <reference target="filedb3" name="collection"/> - <reference target="list2" name="id"/> - </component> - <component t:x="311" t:y="155" name="filedb3" t:title="file" t:color="red1"> + <component name="filedb2" 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> - <service name="delete" promote="delete"/> - <component t:x="457" t:y="44" name="delete" t:title="delete" t:color="red1"> - <t:implementation.python script="nuvem/delete.py"/> - <service name="delete"/> - <reference target="filedb2" name="collection"/> - <reference target="list3" name="id"/> - </component> - <component t:x="113" t:y="223" name="filedb2" t:title="file" t:color="red1"> + <component name="filedb3" 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 t:x="111" t:y="243" name="list3" t:title="list" t:color="yellow1"> + <component t:x="18" t:y="137" name="get" t:title="get" t:color="red1"> + <t:implementation.python script="nuvem/get.py"/> + <service name="get"/> + <reference target="filedb3" name="collection"/> + <reference target="list2" name="id"/> + </component> + <component name="list" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="text" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list2" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="text3" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list3" t:title="list" t:color="yellow1"> <t:implementation.python script="nuvem/list_.py"/> <service name="list"/> <reference target="text4" name="item" t:clonable="true"/> <reference name="item" t:clonable="true"/> </component> - <component t:x="187" t:y="249" name="text4" t:title=" '{propval}'" t:color="orange1"> + <component t:x="13" t:y="1" name="put" t:title="put" t:color="red1"> + <t:implementation.python script="nuvem/put.py"/> + <service name="put"/> + <reference target="filedb" name="collection"/> + <reference target="list" name="id"/> + <reference target="text2" name="value"/> + </component> + <component name="text" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>testkey</property> + </component> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>testvalue</property> + </component> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>testkey</property> </component> - <component t:x="342" t:y="70" name="text3" t:title=" '{propval}'" t:color="orange1"> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>testkey</property> diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.html b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html index 734ec8f687..734ec8f687 100644 --- a/sca-cpp/trunk/modules/edit/apps/testdb/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite index 04c6eea787..ffe17c3cd4 100644 --- a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite @@ -17,155 +17,155 @@ * 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://testevents" name="testevents"> - <component t:x="888" t:y="14" name="text3" t:title=" '{propval}'" t:color="orange1"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> + <service name="call2" promote="call2"/> + <service name="compabc" promote="compabc"/> + <service name="compxyz" promote="compxyz"/> + <service name="geolocation" promote="geolocation"/> + <service name="start" promote="start"/> + <service name="testbutton1" promote="testbutton1"/> + <service name="testbutton2" promote="testbutton2"/> + <service name="timer3" promote="timer3"/> + <component name="abc" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>cancel button clicked</property> + <property>abc</property> </component> - <component t:x="844" t:y="132" name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>timer fired</property> + <component t:x="16" t:y="208" name="call2" t:title="call" t:color="green1"> + <t:implementation.python script="nuvem/call.py"/> + <service name="call"/> + <reference target="name" name="name"/> + <reference name="proxy" wiredByImpl="true" t:visible="false"/> </component> - <component t:x="359" t:y="75" name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>page opens</property> + <component t:x="14" t:y="265" name="compabc" t:title="{compname}" t:color="green1"> + <t:implementation.python script="nuvem/service.py"/> + <service name="service" t:visible="false"/> + <reference target="abc" name="content"/> </component> - <component t:x="228" t:y="197" name="property4" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="text2" name="value"/> - <property>status</property> + <component t:x="15" t:y="316" name="compxyz" t:title="{compname}" t:color="green1"> + <t:implementation.python script="nuvem/service.py"/> + <service name="service" t:visible="false"/> + <reference target="text12" name="content"/> </component> - <component t:x="371" t:y="408" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>ok button clicked</property> + <component t:x="12" t:y="146" 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 target="property6" name="content"/> </component> - <component t:x="229" t:y="156" name="property5" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="param" name="value"/> - <property>testtext</property> + <component name="list" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property5" name="item" t:clonable="true"/> + <reference target="property4" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> </component> - <component t:x="619" t:y="371" name="params2" t:title="?params" t:color="green1"> - <t:implementation.python script="nuvem/params.py"/> - <service name="params"/> - <property name="query" t:visible="false"/> + <component name="name" t:title="" t:color="orange1"> + <t:implementation.python script="nuvem/name.py"/> + <service name="name"/> + <property>compxyz</property> </component> - <component t:x="307" t:y="147" name="param" t:title="?param" t:color="green1"> + <component name="number" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>3000</property> + </component> + <component name="param" t:title="?param" t:color="green1"> <t:implementation.python script="nuvem/param.py"/> <service name="param"/> <property>testfield</property> <property name="query" t:visible="false"/> </component> - <service name="every3" promote="every3"/> - <component t:x="62" t:y="91" name="every3" t:title="every" t:color="green1"> - <t:implementation.python script="nuvem/every.py"/> - <service name="every" t:visible="false"> - <t:binding.http uri="every"/> - </service> - <reference target="number" name="n"/> - <reference target="property2" name="content"/> + <component name="params2" t:title="?params" t:color="green1"> + <t:implementation.python script="nuvem/params.py"/> + <service name="params"/> + <property name="query" t:visible="false"/> </component> - <component t:x="601" t:y="122" name="number" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>3000</property> + <component name="prop2" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="text3" name="value"/> + <property>status</property> </component> - <component t:x="602" t:y="148" name="property2" t:title="{propval} :" t:color="orange1"> + <component name="property2" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text4" name="value"/> <property>status</property> </component> - <component t:x="598" t:y="227" name="property6" t:title="{propval} :" t:color="orange1"> + <component name="property3" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> - <reference target="params2" name="value"/> - <property>location</property> - </component> - <service name="geolocation" promote="geolocation"/> - <component t:x="61" t:y="178" 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 target="property6" name="content"/> + <reference target="text" name="value"/> + <property>status</property> </component> - <component t:x="159" t:y="42" name="property3" t:title="{propval} :" t:color="orange1"> + <component name="property4" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> - <reference target="text" name="value"/> + <reference target="text2" name="value"/> <property>status</property> </component> - <service name="appstart" promote="appstart"/> - <component t:x="63" t:y="31" name="appstart" t:title="start" t:color="green1"> - <t:implementation.python script="nuvem/appstart.py"/> - <service name="appstart" t:visible="false"> - <t:binding.http uri="appstart"/> + <component name="property5" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="param" name="value"/> + <property>testtext</property> + </component> + <component name="property6" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="params2" name="value"/> + <property>location</property> + </component> + <component t:x="15" t:y="3" name="start" t:title="start" t:color="green1"> + <t:implementation.python script="nuvem/start.py"/> + <service name="start" t:visible="false"> + <t:binding.http uri="start"/> </service> <reference target="property3" name="content"/> </component> - <component t:x="172" t:y="141" name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <service name="testbutton1" promote="testbutton1"/> - <component t:x="364" t:y="102" name="testbutton1" t:title="{compname}" t:color="green1"> + <component t:x="228" t:y="78" name="testbutton1" t:title="{compname}" t:color="green1"> <t:implementation.python script="nuvem/service.py"/> <service name="service" t:visible="false"/> <reference target="list" name="content"/> </component> - <service name="testbutton2" promote="testbutton2"/> - <component t:x="362" t:y="35" name="testbutton2" t:title="{compname}" t:color="green1"> + <component t:x="223" t:y="16" name="testbutton2" t:title="{compname}" t:color="green1"> <t:implementation.python script="nuvem/service.py"/> <service name="service" t:visible="false"/> <reference target="prop2" name="content"/> </component> - <component t:x="602" t:y="52" name="prop2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="text3" name="value"/> - <property>status</property> - </component> - <component t:x="455" t:y="315" name="abc" t:title=" '{propval}'" t:color="orange1"> + <component name="text" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>abc</property> + <property>page opens</property> </component> - <service name="compabc" promote="compabc"/> - <component t:x="236" t:y="248" name="compabc" t:title="{compname}" t:color="green1"> - <t:implementation.python script="nuvem/service.py"/> - <service name="service" t:visible="false"/> - <reference target="abc" name="content"/> + <component name="text12" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>xyz</property> </component> - <service name="compxyz" promote="compxyz"/> - <component t:x="236" t:y="299" name="compxyz" t:title="{compname}" t:color="green1"> - <t:implementation.python script="nuvem/service.py"/> - <service name="service" t:visible="false"/> - <reference name="content" target="text12"/> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>ok button clicked</property> </component> - <component name="text12" t:x="428" t:y="366" t:title=" '{propval}'" t:color="orange1"> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>xyz</property> + <property>cancel button clicked</property> </component> - <service name="call2" promote="call2"/> - <component t:x="69" t:y="248" name="call2" t:title="call" t:color="green1"> - <t:implementation.python script="nuvem/call.py"/> - <service name="call"/> - <reference target="name" name="name"/> - <reference name="proxy" wiredByImpl="true" t:visible="false"/> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>timer fired</property> </component> - <component t:x="184" t:y="316" name="name" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> - <service name="name"/> - <property>compxyz</property> + <component t:x="13" t:y="58" name="timer3" 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 target="number" name="n"/> + <reference target="property2" name="content"/> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.html b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html index 94ffd7a609..36b07205c7 100644 --- a/sca-cpp/trunk/modules/edit/apps/testevents/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html @@ -19,10 +19,10 @@ --> <DIV id="page"> <SPAN id="testbutton1" class="button" style="position: absolute; top: 207px; left: 2px; "> - <INPUT type="button" value="OK"/> + <INPUT type="button" value="OK" class="graybutton"/> </SPAN> <SPAN id="testbutton2" class="button" style="position: absolute; top: 207px; left: 47px; "> - <INPUT type="button" value="Cancel"/> + <INPUT type="button" value="Cancel" class="graybutton"/> </SPAN> <SPAN id="text" class="text" style="position: absolute; top: 171px; left: 11px; "> <SPAN>Latitude:</SPAN> diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite index d403fcb32a..f9955c5640 100644 --- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite @@ -17,114 +17,114 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testhttp" name="testhttp"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> <service name="get" promote="get"/> - <component t:x="25" t:y="25" name="get" t:title="get" t:color="green1"> + <service name="get2" promote="get2"/> + <service name="get3" promote="get3"/> + <service name="get4" promote="get4"/> + <service name="get5" promote="get5"/> + <service name="get6" promote="get6"/> + <service name="parse" promote="parse"/> + <component name="first" t:title="first" t:color="yellow1"> + <t:implementation.python script="nuvem/first.py"/> + <service name="first"/> + <reference target="rest" name="list"/> + </component> + <component t:x="20" t:y="8" name="get" t:title="get" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text" name="url"/> </component> - <service name="get2" promote="get2"/> - <component t:x="24" t:y="83" name="get2" t:title="get" t:color="green1"> + <component t:x="18" t:y="61" name="get2" t:title="get" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text2" name="url"/> </component> - <service name="get3" promote="get3"/> - <component t:x="23" t:y="146" name="get3" t:title="get" t:color="green1"> + <component t:x="14" t:y="112" name="get3" t:title="get" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text3" name="url"/> </component> - <component t:x="87" t:y="175" name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdXMLclient.php?whichClient=NDFDgen&lat=38.99&lon=-77.01&listLatLon=&lat1=&lon1=&lat2=&lon2=&resolutionSub=&listLat1=&listLon1=&listLat2=&listLon2=&resolutionList=&endPoint1Lat=&endPoint1Lon=&endPoint2Lat=&endPoint2Lon=&listEndPoint1Lat=&listEndPoint1Lon=&listEndPoint2Lat=&listEndPoint2Lon=&zipCodeList=&listZipCodeList=&centerPointLat=&centerPointLon=&distanceLat=&distanceLon=&resolutionSquare=&listCenterPointLat=&listCenterPointLon=&listDistanceLat=&listDistanceLon=&listResolutionSquare=&citiesLevel=&listCitiesLevel=&sector=&gmlListLatLon=&featureType=&requestedTime=&startTime=&endTime=&compType=&propertyName=&product=time-series&begin=2004-01-01T00%3A00%3A00&end=2015-03-10T00%3A00%3A00&maxt=maxt&Submit=Submit</property> - </component> - <component t:x="88" t:y="91" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&destination=Concord,MA&waypoints=Charlestown,MA|Lexington,MA&sensor=false</property> - </component> - <service name="get4" promote="get4"/> - <component t:x="25" t:y="210" name="get4" t:title="get" t:color="green1"> + <component t:x="17" t:y="166" name="get4" t:title="get" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text4" name="url"/> </component> - <component t:x="90" t:y="267" name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://feedproxy.google.com/TechCrunch</property> - </component> - <component t:x="93" t:y="25" name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://www.google.com</property> - </component> - <service name="get5" promote="get5"/> - <component t:x="26" t:y="274" name="get5" t:title="get" t:color="green1"> + <component t:x="19" t:y="218" name="get5" t:title="get" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text5" name="url"/> </component> - <component t:x="95" t:y="331" name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>cnn.com</property> - </component> - <service name="get6" promote="get6"/> - <component t:x="26" t:y="335" name="get6" t:title="get" t:color="green1"> + <component t:x="19" t:y="271" name="get6" t:title="get" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text6" name="url"/> </component> - <component t:x="95" t:y="395" name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>https://chart.googleapis.com/chart?cht=p3&chs=250x100&chd=t:60,40&chl=Hello|World</property> + <component name="get7" t:title="get" t:color="green1"> + <implementation.cpp path="lib/http" library="libhttpget"/> + <service name="get"/> + <reference target="text7" name="url"/> </component> - <service name="parse" promote="parse"/> - <component t:x="529" t:y="192" name="parse" t:title="parse" t:color="magenta1"> + <component name="join" t:title="join" t:color="magenta1"> + <t:implementation.python script="nuvem/join.py"/> + <service name="join"/> + <reference target="text9" name="separator"/> + <reference target="first" name="list"/> + </component> + <component t:x="19" t:y="329" name="parse" t:title="parse" t:color="magenta1"> <t:implementation.python script="nuvem/parse.py"/> <service name="parse"/> <reference target="text8" name="regexp"/> <reference target="join" name="string"/> </component> - <component t:x="832" t:y="249" name="rest" t:title="rest" t:color="yellow1"> + <component name="rest" t:title="rest" t:color="yellow1"> <t:implementation.python script="nuvem/rest.py"/> <service name="rest"/> <reference target="get7" name="list"/> </component> - <component t:x="868" t:y="311" name="get7" t:title="get" t:color="green1"> - <implementation.cpp path="lib/http" library="libhttpget"/> - <service name="get"/> - <reference target="text7" name="url"/> + <component name="text" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>http://www.google.com</property> + </component> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&destination=Concord,MA&waypoints=Charlestown,MA|Lexington,MA&sensor=false</property> + </component> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdXMLclient.php?whichClient=NDFDgen&lat=38.99&lon=-77.01&listLatLon=&lat1=&lon1=&lat2=&lon2=&resolutionSub=&listLat1=&listLon1=&listLat2=&listLon2=&resolutionList=&endPoint1Lat=&endPoint1Lon=&endPoint2Lat=&endPoint2Lon=&listEndPoint1Lat=&listEndPoint1Lon=&listEndPoint2Lat=&listEndPoint2Lon=&zipCodeList=&listZipCodeList=&centerPointLat=&centerPointLon=&distanceLat=&distanceLon=&resolutionSquare=&listCenterPointLat=&listCenterPointLon=&listDistanceLat=&listDistanceLon=&listResolutionSquare=&citiesLevel=&listCitiesLevel=&sector=&gmlListLatLon=&featureType=&requestedTime=&startTime=&endTime=&compType=&propertyName=&product=time-series&begin=2004-01-01T00%3A00%3A00&end=2015-03-10T00%3A00%3A00&maxt=maxt&Submit=Submit</property> + </component> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>http://feedproxy.google.com/TechCrunch</property> </component> - <component t:x="795" t:y="269" name="text7" t:title=" '{propval}'" t:color="orange1"> + <component name="text5" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>cnn.com</property> </component> - <component t:x="553" t:y="292" name="first" t:title="first" t:color="yellow1"> - <t:implementation.python script="nuvem/first.py"/> - <service name="first"/> - <reference target="rest" name="list"/> + <component name="text6" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>https://chart.googleapis.com/chart?cht=p3&chs=250x100&chd=t:60,40&chl=Hello|World</property> </component> - <component t:x="812" t:y="334" name="text9" t:title=" '{propval}'" t:color="orange1"> + <component name="text7" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property name="property"/> + <property>cnn.com</property> </component> - <component t:x="617" t:y="226" name="text8" t:title=" '{propval}'" t:color="orange1"> + <component name="text8" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>(CNN)</property> </component> - <component t:x="617" t:y="254" name="join" t:title="join" t:color="magenta1"> - <t:implementation.python script="nuvem/join.py"/> - <service name="join"/> - <reference target="text9" name="separator"/> - <reference target="first" name="list"/> + <component name="text9" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property name="property"/> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.html b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html index 2faf6fa886..ddbd0ebc48 100644 --- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. --> <DIV id="page"> - <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 0px; "> + <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> <H1>Test HTTP components</H1> </SPAN> <SPAN id="iframe" class="iframe" style="position: absolute; top: 234px; left: 11px; "> diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite index a5ab623b3c..d9b209fe10 100644 --- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite @@ -17,134 +17,134 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testlogic" name="testlogic"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> + <service name="cos" promote="cos"/> + <service name="eval" promote="eval"/> + <service name="eval2" promote="eval2"/> + <service name="exec" promote="exec"/> + <service name="exec2" promote="exec2"/> <service name="if" promote="if"/> - <component t:x="22" t:y="45" name="if" t:title="if" t:color="magenta1"> - <t:implementation.python script="nuvem/if_.py"/> - <service name="if"/> - <reference target="greater" name="condition"/> - <reference target="text" name="then"/> - <reference target="text2" name="else"/> + <service name="random" promote="random"/> + <service name="sin" promote="sin"/> + <component t:x="20" t:y="251" name="cos" t:title="cos" t:color="magenta1"> + <t:implementation.python script="nuvem/cos_.py"/> + <service name="cos"/> + <reference target="number7" name="x"/> + </component> + <component t:x="170" t:y="11" name="eval" t:title="expr" t:color="magenta1"> + <t:implementation.python script="nuvem/eval_.py"/> + <service name="eval"/> + <reference target="text3" name="py"/> + <reference name="ref"/> + </component> + <component t:x="180" t:y="85" name="eval2" t:title="expr" t:color="magenta1"> + <t:implementation.python script="nuvem/eval_.py"/> + <service name="eval"/> + <reference target="text4" name="py"/> + <reference target="number3" name="ref"/> + </component> + <component t:x="156" t:y="267" name="exec" t:title="script" t:color="magenta1"> + <t:implementation.python script="nuvem/exec_.py"/> + <service name="exec"/> + <reference target="get" name="py"/> + <reference target="number4" name="ref"/> + </component> + <component t:x="160" t:y="172" name="exec2" t:title="script" t:color="magenta1"> + <t:implementation.python script="nuvem/exec_.py"/> + <service name="exec"/> + <reference target="text6" name="py"/> + <reference target="number5" name="ref"/> + </component> + <component name="get" t:title="get" t:color="green1"> + <implementation.cpp path="lib/http" library="libhttpget"/> + <service name="get"/> + <reference target="text5" name="url"/> </component> - <component t:x="75" t:y="24" name="greater" t:title="gt" t:color="magenta1"> + <component name="greater" t:title="gt" t:color="magenta1"> <t:implementation.python script="nuvem/greater.py"/> <service name="greater"/> <reference target="number2" name="value1"/> <reference target="number" name="value2"/> </component> - <component t:x="118" t:y="66" name="number" t:title="#" t:color="orange1"> + <component t:x="19" t:y="9" name="if" t:title="if" t:color="magenta1"> + <t:implementation.python script="nuvem/if_.py"/> + <service name="if"/> + <reference target="greater" name="condition"/> + <reference target="text" name="then"/> + <reference target="text2" name="else"/> + </component> + <component name="number" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>5</property> </component> - <component t:x="78" t:y="118" name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>greater than 5</property> - </component> - <component t:x="76" t:y="162" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>not greater than 5</property> - </component> - <component t:x="88" t:y="25" name="number2" t:title="#" t:color="orange1"> + <component name="number2" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>3</property> </component> - <service name="eval" promote="eval"/> - <component t:x="235" t:y="46" name="eval" t:title="expr" t:color="magenta1"> - <t:implementation.python script="nuvem/eval_.py"/> - <service name="eval"/> - <reference target="text3" name="py"/> - <reference name="ref"/> + <component name="number3" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>5</property> </component> - <service name="eval2" promote="eval2"/> - <component t:x="454" t:y="46" name="eval2" t:title="expr" t:color="magenta1"> - <t:implementation.python script="nuvem/eval_.py"/> - <service name="eval"/> - <reference target="text4" name="py"/> - <reference target="number3" name="ref"/> + <component name="number4" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>5</property> </component> - <component t:x="350" t:y="160" name="number3" t:title="#" t:color="orange1"> + <component name="number5" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>5</property> </component> - <service name="exec" promote="exec"/> - <component t:x="234" t:y="233" name="exec" t:title="script" t:color="magenta1"> - <t:implementation.python script="nuvem/exec_.py"/> - <service name="exec"/> - <reference target="get" name="py"/> - <reference target="number4" name="ref"/> + <component name="number6" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>0.5</property> </component> - <component t:x="357" t:y="289" name="number4" t:title="#" t:color="orange1"> + <component name="number7" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> - <property>5</property> + <property>0.5</property> </component> - <component t:x="358" t:y="267" name="get" t:title="get" t:color="green1"> - <implementation.cpp path="lib/http" library="libhttpget"/> - <service name="get"/> - <reference target="text5" name="url"/> + <component t:x="24" t:y="158" name="random" t:title="rand" t:color="magenta1"> + <t:implementation.python script="nuvem/random_.py"/> + <service name="random"/> </component> - <service name="exec2" promote="exec2"/> - <component t:x="236" t:y="146" name="exec2" t:title="script" t:color="magenta1"> - <t:implementation.python script="nuvem/exec_.py"/> - <service name="exec"/> - <reference target="text6" name="py"/> - <reference target="number5" name="ref"/> + <component t:x="21" t:y="198" name="sin" t:title="sin" t:color="magenta1"> + <t:implementation.python script="nuvem/sin_.py"/> + <service name="sin"/> + <reference target="number6" name="x"/> </component> - <component t:x="350" t:y="37" name="text3" t:title=" '{propval}'" t:color="orange1"> + <component name="text" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>3.14116 * 5 * 5</property> + <property>greater than 5</property> </component> - <component t:x="350" t:y="130" name="text4" t:title=" '{propval}'" t:color="orange1"> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>3.14116 * ref.get(r) * ref.get(r)</property> + <property>not greater than 5</property> </component> - <component t:x="359" t:y="286" name="number5" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>5</property> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>3.14116 * 5 * 5</property> </component> - <component t:x="357" t:y="245" name="text6" t:title=" '{propval}'" t:color="orange1"> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>val = 3.14116 * ref.get(r) * ref.get(r)</property> + <property>3.14116 * ref.get(r) * ref.get(r)</property> </component> - <component t:x="423" t:y="365" name="text5" t:title=" '{propval}'" t:color="orange1"> + <component name="text5" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://people.apache.org/~jsdelfino/tuscany/test/surface.py</property> </component> - <service name="random" promote="random"/> - <component t:x="43" t:y="208" name="random" t:title="rand" t:color="magenta1"> - <t:implementation.python script="nuvem/random_.py"/> - <service name="random"/> - </component> - <service name="sin" promote="sin"/> - <component t:x="44" t:y="258" name="sin" t:title="sin" t:color="magenta1"> - <t:implementation.python script="nuvem/sin_.py"/> - <service name="sin"/> - <reference target="number6" name="x"/> - </component> - <component t:x="70" t:y="258" name="number6" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>0.5</property> - </component> - <service name="cos" promote="cos"/> - <component t:x="40" t:y="316" name="cos" t:title="cos" t:color="magenta1"> - <t:implementation.python script="nuvem/cos_.py"/> - <service name="cos"/> - <reference target="number7" name="x"/> - </component> - <component t:x="81" t:y="316" name="number7" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>0.5</property> + <component name="text6" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>val = 3.14116 * ref.get(r) * ref.get(r)</property> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html index c2dc3a21c2..c2dc3a21c2 100644 --- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite index dc6a42753c..3846266b74 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite @@ -17,57 +17,29 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testsearch" name="testsearch"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> + <service name="bingsearch" promote="bingsearch"/> + <service name="get" promote="get"/> + <service name="googlemap" promote="googlemap"/> + <service name="googlemap2" promote="googlemap2"/> <service name="googlesearch" promote="googlesearch"/> - <component t:x="91" t:y="20" name="googlesearch" t:title="google" t:color="red1"> - <t:implementation.python script="nuvem/gsearch.py"/> - <service name="googlesearch"/> - <reference target="text" name="query"/> - <reference name="s" t:visible="false"> - <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/> - </reference> - </component> <service name="weather" promote="weather"/> - <component t:x="92" t:y="70" name="weather" t:title="weather" t:color="red1"> - <t:implementation.python script="nuvem/gweather.py"/> - <service name="weather"/> - <reference target="number" name="zip"/> - <reference name="ws" t:visible="false"> - <t:binding.http uri="http://www.google.com/ig/api"/> - </reference> - </component> - <component t:x="141" t:y="95" name="number" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>94070</property> - </component> <service name="weather2" promote="weather2"/> - <component t:x="333" t:y="73" name="weather2" t:title="weather" t:color="red1"> - <t:implementation.python script="nuvem/gweather.py"/> - <service name="weather"/> - <reference target="text2" name="zip"/> - <reference name="ws" t:visible="false"> - <t:binding.http uri="http://www.google.com/ig/api"/> + <service name="yahoosearch" promote="yahoosearch"/> + <component t:x="336" t:y="48" name="bingsearch" t:title="bing" t:color="red1"> + <t:implementation.python script="nuvem/bsearch.py"/> + <service name="bingsearch"/> + <reference target="text10" name="query"/> + <reference name="s" t:visible="false"> + <t:binding.http uri="http://www.bing.com/search"/> </reference> </component> - <component t:x="141" t:y="162" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>94070</property> - </component> - <service name="get" promote="get"/> - <component t:x="43" t:y="348" name="get" t:title="get" t:color="green1"> + <component t:x="20" t:y="300" name="get" t:title="get" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text3" name="url"/> </component> - <component t:x="141" t:y="234" name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://maps.google.com/maps/api/staticmap?center=Brooklyn+Bridge,New+York,NY&zoom=14&size=512x512&maptype=roadmap%20&markers=color:blue|label:S|40.702147,-74.015794&markers=color:green|label:G|40.711614,-74.012318%20&markers=color:red|color:red|label:C|40.718217,-73.998284&sensor=false</property> - </component> - <service name="googlemap" promote="googlemap"/> - <component t:x="492" t:y="143" name="googlemap" t:title="google map" t:color="red1"> + <component t:x="347" t:y="106" name="googlemap" t:title="google map" t:color="red1"> <t:implementation.python script="nuvem/gmap.py"/> <service name="googlemap"/> <reference target="list2" name="locations"/> @@ -75,8 +47,7 @@ <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/> </reference> </component> - <service name="googlemap2" promote="googlemap2"/> - <component t:x="90" t:y="144" name="googlemap2" t:title="google map" t:color="red1"> + <component t:x="15" t:y="96" name="googlemap2" t:title="google map" t:color="red1"> <t:implementation.python script="nuvem/gmap.py"/> <service name="googlemap"/> <reference target="list3" name="locations"/> @@ -84,123 +55,152 @@ <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/> </reference> </component> - <component t:x="300" t:y="391" name="number3" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>-122.260526</property> + <component t:x="18" t:y="0" name="googlesearch" t:title="google" t:color="red1"> + <t:implementation.python script="nuvem/gsearch.py"/> + <service name="googlesearch"/> + <reference target="text" name="query"/> + <reference name="s" t:visible="false"> + <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/> + </reference> </component> - <component t:x="303" t:y="659" name="text8" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>green</property> + <component name="list" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="text4" name="item" t:clonable="true"/> + <reference target="number2" name="item" t:clonable="true"/> + <reference target="number3" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> </component> - <component t:x="300" t:y="335" name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>green</property> + <component name="list2" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list3" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property2" name="item" t:clonable="true"/> + <reference target="property3" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> </component> - <component t:x="300" t:y="363" name="number2" t:title="#" t:color="orange1"> + <component name="number" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>94070</property> + </component> + <component name="number2" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>37.507156</property> </component> - <component t:x="164" t:y="307" name="list2" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <component name="number3" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>-122.260526</property> + </component> + <component name="pair4" t:title="pair" t:color="yellow1"> + <t:implementation.python script="nuvem/pair.py"/> + <service name="pair"/> + <reference target="text7" name="name"/> + <reference target="text5" name="value"/> + </component> + <component name="pair5" t:title="pair" t:color="yellow1"> + <t:implementation.python script="nuvem/pair.py"/> + <service name="pair"/> + <reference target="text8" name="name"/> + <reference target="text6" name="value"/> </component> - <component t:x="202" t:y="308" name="property" t:title="{propval} :" t:color="orange1"> + <component name="property" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="list" name="value"/> <property>A</property> </component> - <component t:x="640" t:y="423" name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="text4" name="item" t:clonable="true"/> - <reference target="number2" name="item" t:clonable="true"/> - <reference target="number3" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component t:x="208" t:y="532" name="property2" t:title="{propval} :" t:color="orange1"> + <component name="property2" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="pair4" name="value"/> <property>A</property> </component> - <component t:x="512" t:y="485" name="pair4" t:title="pair" t:color="yellow1"> - <t:implementation.python script="nuvem/pair.py"/> - <service name="pair"/> - <reference target="text7" name="name"/> - <reference target="text5" name="value"/> - </component> - <component t:x="208" t:y="604" name="property3" t:title="{propval} :" t:color="orange1"> + <component name="property3" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="pair5" name="value"/> <property>B</property> </component> - <component t:x="527" t:y="579" name="pair5" t:title="pair" t:color="yellow1"> - <t:implementation.python script="nuvem/pair.py"/> - <service name="pair"/> - <reference target="text8" name="name"/> - <reference target="text6" name="value"/> + <component name="text" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>apache tuscany</property> </component> - <component t:x="315" t:y="212" name="text7" t:title=" '{propval}'" t:color="orange1"> + <component name="text10" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>yellow</property> + <property>apache tuscany</property> </component> - <component t:x="315" t:y="240" name="text5" t:title=" '{propval}'" t:color="orange1"> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>San Francisco, CA</property> + <property>94070</property> </component> - <component t:x="315" t:y="312" name="text6" t:title=" '{propval}'" t:color="orange1"> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>San Carlos, CA</property> + <property>http://maps.google.com/maps/api/staticmap?center=Brooklyn+Bridge,New+York,NY&zoom=14&size=512x512&maptype=roadmap%20&markers=color:blue|label:S|40.702147,-74.015794&markers=color:green|label:G|40.711614,-74.012318%20&markers=color:red|color:red|label:C|40.718217,-73.998284&sensor=false</property> </component> - <component t:x="161" t:y="212" name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>green</property> </component> - <service name="yahoosearch" promote="yahoosearch"/> - <component t:x="333" t:y="22" name="yahoosearch" t:title="yahoo" t:color="red1"> - <t:implementation.python script="nuvem/ysearch.py"/> - <service name="yahoosearch"/> - <reference target="text9" name="query"/> - <reference name="s" t:visible="false"> - <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/> - </reference> + <component name="text5" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>San Francisco, CA</property> </component> - <component t:x="682" t:y="231" name="text9" t:title=" '{propval}'" t:color="orange1"> + <component name="text6" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>apache tuscany</property> + <property>San Carlos, CA</property> </component> - <component t:x="173" t:y="31" name="text" t:title=" '{propval}'" t:color="orange1"> + <component name="text7" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>apache tuscany</property> + <property>yellow</property> + </component> + <component name="text8" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>green</property> </component> - <component t:x="774" t:y="54" name="text10" t:title=" '{propval}'" t:color="orange1"> + <component name="text9" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>apache tuscany</property> </component> - <service name="bingsearch" promote="bingsearch"/> - <component t:x="569" t:y="22" name="bingsearch" t:title="bing" t:color="red1"> - <t:implementation.python script="nuvem/bsearch.py"/> - <service name="bingsearch"/> - <reference target="text10" name="query"/> + <component t:x="18" t:y="49" name="weather" t:title="weather" t:color="red1"> + <t:implementation.python script="nuvem/gweather.py"/> + <service name="weather"/> + <reference target="number" name="zip"/> + <reference name="ws" t:visible="false"> + <t:binding.http uri="http://www.google.com/ig/api"/> + </reference> + </component> + <component t:x="190" t:y="51" name="weather2" t:title="weather" t:color="red1"> + <t:implementation.python script="nuvem/gweather.py"/> + <service name="weather"/> + <reference target="text2" name="zip"/> + <reference name="ws" t:visible="false"> + <t:binding.http uri="http://www.google.com/ig/api"/> + </reference> + </component> + <component t:x="204" t:y="5" name="yahoosearch" t:title="yahoo" t:color="red1"> + <t:implementation.python script="nuvem/ysearch.py"/> + <service name="yahoosearch"/> + <reference target="text9" name="query"/> <reference name="s" t:visible="false"> - <t:binding.http uri="http://www.bing.com/search"/> + <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/> </reference> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.html b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html index 3760a04794..3760a04794 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite index 26642deccb..ad7c983098 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite @@ -17,60 +17,10 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testsocial" name="testsocial"> - <component t:x="485" t:y="164" name="twtimeline" t:title="twitter timeline" t:color="blue1"> - <t:implementation.python script="nuvem/twtimeline.py"/> - <service name="twtimeline"/> - <reference target="text2" name="id"/> - <reference name="tw" t:visible="false"> - <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/> - </reference> - </component> - <component t:x="477" t:y="201" name="twfriends" t:title="twitter friends" t:color="blue1"> - <t:implementation.python script="nuvem/twfriends.py"/> - <service name="twfriends"/> - <reference target="text4" name="id"/> - <reference name="tw" t:visible="false"> - <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/> - </reference> - </component> - <component t:x="488" t:y="254" name="twfollowers" t:title="twitter followers" t:color="blue1"> - <t:implementation.python script="nuvem/twfollowers.py"/> - <service name="twfollowers"/> - <reference target="text5" name="id"/> - <reference name="tw" t:visible="false"> - <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/> - </reference> - </component> - <component t:x="589" t:y="71" name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>100001053301307</property> - </component> - <component t:x="252" t:y="308" name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>jsdelfino</property> - </component> - <component t:x="745" t:y="149" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>jsdelfino</property> - </component> - <component t:x="493" t:y="132" name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>jsdelfino</property> - </component> - <component t:x="334" t:y="462" name="twprofile" t:title="twitter profile" t:color="blue1"> - <t:implementation.python script="nuvem/twprofile.py"/> - <service name="twprofile"/> - <reference target="text3" name="id"/> - <reference name="tw" t:visible="false"> - <t:binding.http uri="http://api.twitter.com/1/users/show.json"/> - </reference> - </component> - <component t:x="626" t:y="77" name="fbprofile" t:title="facebook profile" t:color="blue1"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> + <service name="sendgtalk" promote="sendgtalk"/> + <service name="start" promote="start"/> + <component name="fbprofile" t:title="facebook profile" t:color="blue1"> <t:implementation.python script="nuvem/fbprofile.py"/> <service name="fbprofile"/> <reference target="text" name="id"/> @@ -78,102 +28,152 @@ <t:binding.http uri="https://graph.facebook.com"/> </reference> </component> - <component t:x="662" t:y="220" name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>jsdelfino</property> + <component name="format" t:title="format" t:color="magenta1"> + <t:implementation.python script="nuvem/format_.py"/> + <service name="format"/> + <reference target="text7" name="pattern"/> + <reference target="list" name="values"/> </component> - <service name="appstart" promote="appstart"/> - <component t:x="204" t:y="35" name="appstart" t:title="start" t:color="green1"> - <t:implementation.python script="nuvem/appstart.py"/> - <service name="appstart" t:visible="false"> - <t:binding.http uri="appstart"/> - </service> - <reference target="list3" name="content"/> + <component name="list" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="now" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> </component> - <component t:x="393" t:y="35" name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="fbprofile" name="value"/> - <property>name</property> + <component name="list3" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property2" name="item" t:clonable="true"/> + <reference target="property" name="item" t:clonable="true"/> + <reference target="property3" name="item" t:clonable="true"/> + <reference target="property4" name="item" t:clonable="true"/> + <reference target="property5" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> </component> - <component t:x="393" t:y="79" name="property" t:title="{propval} :" t:color="orange1"> + <component name="now" t:title="now" t:color="orange1"> + <t:implementation.python script="nuvem/now.py"/> + <service name="now"/> + </component> + <component name="property" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="twprofile" name="value"/> <property>twitprofile</property> </component> - <component t:x="393" t:y="123" name="property3" t:title="{propval} :" t:color="orange1"> + <component name="property2" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="fbprofile" name="value"/> + <property>name</property> + </component> + <component name="property3" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="twtimeline" name="value"/> <property>twittimeline</property> </component> - <component t:x="393" t:y="167" name="property4" t:title="{propval} :" t:color="orange1"> + <component name="property4" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="twfriends" name="value"/> <property>twitfriends</property> </component> - <component t:x="393" t:y="211" name="property5" t:title="{propval} :" t:color="orange1"> + <component name="property5" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="twfollowers" name="value"/> <property>twitfollowers</property> </component> - <component t:x="318" t:y="35" name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference target="property" name="item" t:clonable="true"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <component t:x="34" t:y="286" name="sendgtalk" t:title="gtalk" t:color="blue1"> + <implementation.cpp path="lib/chat" library="libchat-sender2"/> + <service name="sendgtalk"/> + <reference target="text8" name="jid"/> + <reference target="text9" name="pass"/> + <reference target="text6" name="to"/> + <reference target="format" name="msg"/> + </component> + <component t:x="33" t:y="12" name="start" t:title="start" t:color="green1"> + <t:implementation.python script="nuvem/start.py"/> + <service name="start" t:visible="false"> + <t:binding.http uri="start"/> + </service> + <reference target="list3" name="content"/> </component> - <component t:x="460" t:y="358" name="text6" t:title=" '{propval}'" t:color="orange1"> + <component name="text" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>xmppsca.2@gmail.com</property> + <property>100001053301307</property> </component> - <component t:x="582" t:y="431" name="text7" t:title=" '{propval}'" t:color="orange1"> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>Hello, the time is {0}</property> + <property>jsdelfino</property> </component> - <component t:x="623" t:y="452" name="now" t:title="now" t:color="orange1"> - <t:implementation.python script="nuvem/now.py"/> - <service name="now"/> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>jsdelfino</property> </component> - <component t:x="575" t:y="447" name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="now" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>jsdelfino</property> </component> - <component t:x="461" t:y="380" name="format" t:title="format" t:color="magenta1"> - <t:implementation.python script="nuvem/format_.py"/> - <service name="format"/> - <reference target="text7" name="pattern"/> - <reference target="list" name="values"/> + <component name="text5" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>jsdelfino</property> </component> - <service name="sendgtalk" promote="sendgtalk"/> - <component t:x="410" t:y="318" name="sendgtalk" t:title="gtalk" t:color="blue1"> - <implementation.cpp path="lib/chat" library="libchat-sender2"/> - <service name="sendgtalk"/> - <reference target="text8" name="jid"/> - <reference target="text9" name="pass"/> - <reference target="text6" name="to"/> - <reference target="format" name="msg"/> + <component name="text6" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>xmppsca.2@gmail.com</property> + </component> + <component name="text7" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>Hello, the time is {0}</property> </component> - <component t:x="460" t:y="318" name="text8" t:title=" '{propval}'" t:color="orange1"> + <component name="text8" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>xmppsca.1@gmail.com</property> </component> - <component t:x="460" t:y="346" name="text9" t:title=" '{propval}'" t:color="orange1"> + <component name="text9" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>xmpp4sca</property> </component> + <component name="twfollowers" t:title="twitter followers" t:color="blue1"> + <t:implementation.python script="nuvem/twfollowers.py"/> + <service name="twfollowers"/> + <reference target="text5" name="id"/> + <reference name="tw" t:visible="false"> + <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/> + </reference> + </component> + <component name="twfriends" t:title="twitter friends" t:color="blue1"> + <t:implementation.python script="nuvem/twfriends.py"/> + <service name="twfriends"/> + <reference target="text4" name="id"/> + <reference name="tw" t:visible="false"> + <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/> + </reference> + </component> + <component name="twprofile" t:title="twitter profile" t:color="blue1"> + <t:implementation.python script="nuvem/twprofile.py"/> + <service name="twprofile"/> + <reference target="text3" name="id"/> + <reference name="tw" t:visible="false"> + <t:binding.http uri="http://api.twitter.com/1/users/show.json"/> + </reference> + </component> + <component name="twtimeline" t:title="twitter timeline" t:color="blue1"> + <t:implementation.python script="nuvem/twtimeline.py"/> + <service name="twtimeline"/> + <reference target="text2" name="id"/> + <reference name="tw" t:visible="false"> + <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/> + </reference> + </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html index 9630d36d0f..9630d36d0f 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite index 56cde3999c..22436f5019 100644 --- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite @@ -17,200 +17,200 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testtext" name="testtext"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> <service name="contains" promote="contains"/> - <component t:x="34" t:y="33" name="contains" t:title="contains" t:color="magenta1"> + <service name="format" promote="format"/> + <service name="format2" promote="format2"/> + <service name="join" promote="join"/> + <service name="lowercase" promote="lowercase"/> + <service name="parse" promote="parse"/> + <service name="replace" promote="replace"/> + <service name="split" promote="split"/> + <service name="uppercase" promote="uppercase"/> + <component t:x="19" t:y="7" name="contains" t:title="contains" t:color="magenta1"> <t:implementation.python script="nuvem/contains.py"/> <service name="contains"/> <reference target="text10" name="search"/> <reference target="text9" name="string"/> </component> - <service name="split" promote="split"/> - <component t:x="34" t:y="140" name="split" t:title="split" t:color="magenta1"> - <t:implementation.python script="nuvem/split.py"/> - <service name="split"/> - <reference target="text11" name="separator"/> - <reference target="text12" name="string"/> + <component t:x="176" t:y="115" name="format" t:title="format" t:color="magenta1"> + <t:implementation.python script="nuvem/format_.py"/> + <service name="format"/> + <reference target="text13" name="pattern"/> + <reference target="list" name="values"/> </component> - <service name="join" promote="join"/> - <component t:x="420" t:y="25" name="join" t:title="join" t:color="magenta1"> + <component t:x="369" t:y="141" name="format2" t:title="format" t:color="magenta1"> + <t:implementation.python script="nuvem/format_.py"/> + <service name="format"/> + <reference target="text14" name="pattern"/> + <reference target="list3" name="values"/> + </component> + <component t:x="361" t:y="8" name="join" t:title="join" t:color="magenta1"> <t:implementation.python script="nuvem/join.py"/> <service name="join"/> <reference target="text6" name="separator"/> <reference target="list2" name="list"/> </component> - <service name="replace" promote="replace"/> - <component t:x="204" t:y="27" name="replace" t:title="replace" t:color="magenta1"> + <component name="list" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="text15" name="item" t:clonable="true"/> + <reference target="text16" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list2" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="text7" name="item" t:clonable="true"/> + <reference target="text8" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list3" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property" name="item" t:clonable="true"/> + <reference target="property2" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component t:x="20" t:y="226" name="lowercase" t:title="lower" t:color="magenta1"> + <t:implementation.python script="nuvem/lowercase.py"/> + <service name="lowercase"/> + <reference target="text2" name="string"/> + </component> + <component t:x="142" t:y="252" name="parse" t:title="parse" t:color="magenta1"> + <t:implementation.python script="nuvem/parse.py"/> + <service name="parse"/> + <reference target="text19" name="regexp"/> + <reference target="text20" name="string"/> + </component> + <component name="property" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="text17" name="value"/> + <property>a</property> + </component> + <component name="property2" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="text18" name="value"/> + <property>b</property> + </component> + <component t:x="175" t:y="6" name="replace" t:title="replace" t:color="magenta1"> <t:implementation.python script="nuvem/replace.py"/> <service name="replace"/> <reference target="text4" name="from"/> <reference target="text5" name="to"/> <reference target="text3" name="string"/> </component> - <service name="lowercase" promote="lowercase"/> - <component t:x="34" t:y="297" name="lowercase" t:title="lower" t:color="magenta1"> - <t:implementation.python script="nuvem/lowercase.py"/> - <service name="lowercase"/> - <reference target="text2" name="string"/> - </component> - <service name="uppercase" promote="uppercase"/> - <component t:x="35" t:y="236" name="uppercase" t:title="upper" t:color="magenta1"> - <t:implementation.python script="nuvem/uppercase.py"/> - <service name="uppercase"/> - <reference target="text" name="string"/> + <component t:x="23" t:y="89" name="split" t:title="split" t:color="magenta1"> + <t:implementation.python script="nuvem/split.py"/> + <service name="split"/> + <reference target="text11" name="separator"/> + <reference target="text12" name="string"/> </component> - <component t:x="391" t:y="223" name="text" t:title=" '{propval}'" t:color="orange1"> + <component name="text" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>abc</property> </component> - <component t:x="391" t:y="150" name="text2" t:title=" '{propval}'" t:color="orange1"> + <component name="text10" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>ABC</property> + <property>cd</property> </component> - <component t:x="376" t:y="81" name="text3" t:title=" '{propval}'" t:color="orange1"> + <component name="text11" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>abcxdefxghi</property> + <property>x</property> </component> - <component t:x="377" t:y="20" name="text4" t:title=" '{propval}'" t:color="orange1"> + <component name="text12" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>x</property> + <property>abcxdefxghi</property> </component> - <component t:x="376" t:y="63" name="text5" t:title=" '{propval}'" t:color="orange1"> + <component name="text13" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>y</property> + <property>The {0} brown {1}</property> </component> - <component t:x="107" t:y="56" name="text9" t:title=" '{propval}'" t:color="orange1"> + <component name="text14" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>abcdef</property> + <property>The {a} brown {b}</property> </component> - <component t:x="107" t:y="14" name="text10" t:title=" '{propval}'" t:color="orange1"> + <component name="text15" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>cd</property> + <property>quick</property> </component> - <component t:x="587" t:y="20" name="text6" t:title=" '{propval}'" t:color="orange1"> + <component name="text16" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>x</property> + <property>fox</property> </component> - <component t:x="85" t:y="156" name="text11" t:title=" '{propval}'" t:color="orange1"> + <component name="text17" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>x</property> + <property>quick</property> </component> - <component t:x="89" t:y="193" name="text12" t:title=" '{propval}'" t:color="orange1"> + <component name="text18" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>abcxdefxghi</property> - </component> - <component t:x="583" t:y="60" name="list2" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="text7" name="item" t:clonable="true"/> - <reference target="text8" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <property>fox</property> </component> - <component t:x="662" t:y="61" name="text7" t:title=" '{propval}'" t:color="orange1"> + <component name="text19" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>abc</property> + <property>city (.*) state (.*)</property> </component> - <component t:x="655" t:y="98" name="text8" t:title=" '{propval}'" t:color="orange1"> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>def</property> - </component> - <service name="format" promote="format"/> - <component t:x="220" t:y="170" name="format" t:title="format" t:color="magenta1"> - <t:implementation.python script="nuvem/format_.py"/> - <service name="format"/> - <reference target="text13" name="pattern"/> - <reference target="list" name="values"/> - </component> - <service name="format2" promote="format2"/> - <component t:x="444" t:y="164" name="format2" t:title="format" t:color="magenta1"> - <t:implementation.python script="nuvem/format_.py"/> - <service name="format"/> - <reference target="text14" name="pattern"/> - <reference target="list3" name="values"/> + <property>ABC</property> </component> - <component t:x="365" t:y="194" name="text13" t:title=" '{propval}'" t:color="orange1"> + <component name="text20" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>The {0} brown {1}</property> - </component> - <component t:x="369" t:y="238" name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="text15" name="item" t:clonable="true"/> - <reference target="text16" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <property>city San Francisco state CA</property> </component> - <component t:x="444" t:y="236" name="text15" t:title=" '{propval}'" t:color="orange1"> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>quick</property> + <property>abcxdefxghi</property> </component> - <component t:x="438" t:y="274" name="text16" t:title=" '{propval}'" t:color="orange1"> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>fox</property> + <property>x</property> </component> - <component t:x="599" t:y="198" name="text14" t:title=" '{propval}'" t:color="orange1"> + <component name="text5" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>The {a} brown {b}</property> - </component> - <component t:x="603" t:y="239" name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property" name="item" t:clonable="true"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <service name="parse" promote="parse"/> - <component t:x="218" t:y="325" name="parse" t:title="parse" t:color="magenta1"> - <t:implementation.python script="nuvem/parse.py"/> - <service name="parse"/> - <reference target="text19" name="regexp"/> - <reference target="text20" name="string"/> + <property>y</property> </component> - <component t:x="89" t:y="428" name="text20" t:title=" '{propval}'" t:color="orange1"> + <component name="text6" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>city San Francisco state CA</property> + <property>x</property> </component> - <component t:x="89" t:y="388" name="text19" t:title=" '{propval}'" t:color="orange1"> + <component name="text7" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>city (.*) state (.*)</property> - </component> - <component t:x="589" t:y="215" name="property" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="text17" name="value"/> - <property>a</property> + <property>abc</property> </component> - <component t:x="840" t:y="241" name="text17" t:title=" '{propval}'" t:color="orange1"> + <component name="text8" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>quick</property> - </component> - <component t:x="586" t:y="254" name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="text18" name="value"/> - <property>b</property> + <property>def</property> </component> - <component t:x="837" t:y="299" name="text18" t:title=" '{propval}'" t:color="orange1"> + <component name="text9" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>fox</property> + <property>abcdef</property> + </component> + <component t:x="20" t:y="172" name="uppercase" t:title="upper" t:color="magenta1"> + <t:implementation.python script="nuvem/uppercase.py"/> + <service name="uppercase"/> + <reference target="text" name="string"/> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.html b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html index 99f719ef40..99f719ef40 100644 --- a/sca-cpp/trunk/modules/edit/apps/testtext/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite index 6cda648ac1..2bb49a9e81 100644 --- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite @@ -17,56 +17,25 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testurl" name="testurl"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> + <service name="email" promote="email"/> <service name="host" promote="host"/> - <component t:x="40" t:y="30" name="host" t:title="host" t:color="green1"> - <t:implementation.python script="nuvem/host.py"/> - <service name="host"/> - <property name="host"/> - </component> - <service name="path" promote="path"/> - <component t:x="39" t:y="81" name="path" t:title="path" t:color="green1"> - <t:implementation.python script="nuvem/path.py"/> - <service name="path"/> - <property name="path"/> - </component> <service name="params" promote="params"/> - <component t:x="41" t:y="133" name="params" t:title="?params" t:color="green1"> - <t:implementation.python script="nuvem/params.py"/> - <service name="params"/> - <property name="params"/> - </component> - <service name="user" promote="user"/> - <component t:x="37" t:y="198" name="user" t:title="user" t:color="green1"> - <t:implementation.python script="nuvem/user.py"/> - <service name="user"/> - <property name="user"/> - </component> + <service name="path" promote="path"/> <service name="realm" promote="realm"/> - <component t:x="35" t:y="254" name="realm" t:title="realm" t:color="green1"> - <t:implementation.python script="nuvem/realm.py"/> - <service name="realm"/> - <property name="realm"/> - </component> - <service name="email" promote="email"/> - <component t:x="35" t:y="316" name="email" t:title="email" t:color="green1"> + <service name="url" promote="url"/> + <service name="user" promote="user"/> + <component t:x="17" t:y="223" name="email" t:title="email" t:color="green1"> <t:implementation.python script="nuvem/email.py"/> <service name="email"/> <property name="email"/> </component> - <service name="url" promote="url"/> - <component t:x="162" t:y="36" name="url" t:title="url" t:color="green1"> - <t:implementation.python script="nuvem/url.py"/> - <service name="url"/> - <reference target="text" name="address"/> - <reference target="list" name="args"/> - </component> - <component t:x="240" t:y="27" name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://sca-store.com/</property> + <component t:x="14" t:y="1" name="host" t:title="host" t:color="green1"> + <t:implementation.python script="nuvem/host.py"/> + <service name="host"/> + <property name="host"/> </component> - <component t:x="242" t:y="58" name="list" t:title="list" t:color="yellow1"> + <component name="list" t:title="list" t:color="yellow1"> <t:implementation.python script="nuvem/list_.py"/> <service name="list"/> <reference target="text2" name="item" t:clonable="true"/> @@ -76,47 +45,78 @@ <reference target="property3" name="item" t:clonable="true"/> <reference name="item" t:clonable="true"/> </component> - <component t:x="280" t:y="61" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>test</property> + <component name="number" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>123</property> </component> - <component t:x="282" t:y="90" name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>path</property> + <component t:x="16" t:y="91" name="params" t:title="?params" t:color="green1"> + <t:implementation.python script="nuvem/params.py"/> + <service name="params"/> + <property name="params"/> </component> - <component t:x="277" t:y="108" name="property" t:title="{propval} :" t:color="orange1"> + <component t:x="17" t:y="48" name="path" t:title="path" t:color="green1"> + <t:implementation.python script="nuvem/path.py"/> + <service name="path"/> + <property name="path"/> + </component> + <component name="property" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text4" name="value"/> <property>parmx</property> </component> - <component t:x="276" t:y="169" name="property2" t:title="{propval} :" t:color="orange1"> + <component name="property2" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text5" name="value"/> <property>parmy</property> </component> - <component t:x="271" t:y="224" name="property3" t:title="{propval} :" t:color="orange1"> + <component name="property3" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="number" name="value"/> <property>parmn</property> </component> - <component t:x="385" t:y="228" name="number" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>123</property> + <component t:x="14" t:y="177" name="realm" t:title="realm" t:color="green1"> + <t:implementation.python script="nuvem/realm.py"/> + <service name="realm"/> + <property name="realm"/> </component> - <component t:x="386" t:y="169" name="text5" t:title=" '{propval}'" t:color="orange1"> + <component name="text" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>yy</property> + <property>http://sca-store.com/</property> </component> - <component t:x="386" t:y="110" name="text4" t:title=" '{propval}'" t:color="orange1"> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>test</property> + </component> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>path</property> + </component> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> <property>xx</property> </component> + <component name="text5" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>yy</property> + </component> + <component t:x="117" t:y="14" name="url" t:title="url" t:color="green1"> + <t:implementation.python script="nuvem/url.py"/> + <service name="url"/> + <reference target="text" name="address"/> + <reference target="list" name="args"/> + </component> + <component t:x="16" t:y="134" name="user" t:title="user" t:color="green1"> + <t:implementation.python script="nuvem/user.py"/> + <service name="user"/> + <property name="user"/> + </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html index 9641f58ba5..9641f58ba5 100644 --- a/sca-cpp/trunk/modules/edit/apps/testurl/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite index 8de688216a..6793aceef1 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite @@ -17,436 +17,436 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testvalues" name="testvalues"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> + <service name="empty" promote="empty"/> + <service name="false" promote="false"/> + <service name="first" promote="first"/> + <service name="itemnb" promote="itemnb"/> + <service name="list8" promote="list8"/> + <service name="list9" promote="list9"/> + <service name="lookup" promote="lookup"/> <service name="name" promote="name"/> - <component t:x="36" t:y="152" name="name" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> - <service name="name"/> - <property>abc</property> - </component> + <service name="nothing" promote="nothing"/> + <service name="reduce2" promote="reduce2"/> + <service name="rest" promote="rest"/> + <service name="search" promote="search"/> + <service name="shuffle" promote="shuffle"/> + <service name="start" promote="start"/> <service name="true" promote="true"/> - <component t:x="34" t:y="204" name="true" t:title="true" t:color="orange1"> - <t:implementation.python script="nuvem/true_.py"/> - <service name="true"/> + <component name="add" t:title="+" t:color="magenta1"> + <t:implementation.python script="nuvem/add.py"/> + <service name="add"> + <documentation>+</documentation> + </service> + <reference target="valueof2" name="value1"/> + <reference target="valueof3" name="value2"/> </component> - <service name="false" promote="false"/> - <component t:x="35" t:y="254" name="false" t:title="false" t:color="orange1"> + <component t:x="17" t:y="269" name="empty" t:title="empty" t:color="yellow1"> + <t:implementation.python script="nuvem/empty.py"/> + <service name="empty"/> + </component> + <component t:x="21" t:y="170" name="false" t:title="false" t:color="orange1"> <t:implementation.python script="nuvem/false_.py"/> <service name="false"/> </component> - <service name="lookup" promote="lookup"/> - <component t:x="128" t:y="399" name="lookup" t:title="lookup" t:color="yellow1"> + <component t:x="121" t:y="26" name="first" t:title="first" t:color="yellow1"> + <t:implementation.python script="nuvem/first.py"/> + <service name="first"/> + <reference target="list7" name="list"/> + </component> + <component name="foreach" t:title="foreach" t:color="yellow1"> + <t:implementation.python script="nuvem/map_.py"/> + <service name="foreach"/> + <reference target="name2" name="item"/> + <reference target="multiply" name="transform"/> + <reference target="reverse" name="list"/> + </component> + <component t:x="123" t:y="147" name="itemnb" t:title="item #" t:color="yellow1"> + <t:implementation.python script="nuvem/itemnb.py"/> + <service name="itemnb"/> + <reference target="number8" name="index"/> + <reference target="foreach" name="list"/> + </component> + <component name="list" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="number" name="item" t:clonable="true"/> + <reference target="number7" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list10" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property13" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list2" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property" name="item" t:clonable="true"/> + <reference target="property2" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list3" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property10" name="item" t:clonable="true"/> + <reference target="property9" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list4" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property7" name="item" t:clonable="true"/> + <reference target="property6" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list5" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property8" name="item" t:clonable="true"/> + <reference target="property5" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list6" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property3" name="item" t:clonable="true"/> + <reference target="property4" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="list7" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="number2" name="item" t:clonable="true"/> + <reference target="number3" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component t:x="430" t:y="269" name="list8" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property11" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component t:x="407" t:y="354" name="list9" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property12" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component t:x="32" t:y="375" name="lookup" t:title="lookup" t:color="yellow1"> <t:implementation.python script="nuvem/lookup.py"/> <service name="lookup"/> <reference target="name3" name="name"/> <reference target="list2" name="list"/> </component> - <component t:x="283" t:y="351" name="name3" t:title="" t:color="orange1"> + <component name="multiply" t:title="*" t:color="magenta1"> + <t:implementation.python script="nuvem/multiply.py"/> + <service name="multiply"> + <documentation>*</documentation> + </service> + <reference target="valueof" name="value1"/> + <reference target="number6" name="value2"/> + </component> + <component t:x="21" t:y="70" name="name" t:title="" t:color="orange1"> + <t:implementation.python script="nuvem/name.py"/> + <service name="name"/> + <property>abc</property> + </component> + <component name="name2" t:title="" t:color="orange1"> + <t:implementation.python script="nuvem/name.py"/> + <service name="name"/> + <property>nb</property> + </component> + <component name="name3" t:title="" t:color="orange1"> <t:implementation.python script="nuvem/name.py"/> <service name="name"/> <property>d</property> </component> - <component t:x="433" t:y="37" name="range" t:title="range" t:color="yellow1"> - <t:implementation.python script="nuvem/range_.py"/> - <service name="range"/> - <reference target="number4" name="first"/> - <reference target="number5" name="last"/> + <component name="name6" t:title="" t:color="orange1"> + <t:implementation.python script="nuvem/name.py"/> + <service name="name"/> + <property>sum</property> </component> - <component t:x="378" t:y="48" name="number4" t:title="#" t:color="orange1"> + <component name="name7" t:title="" t:color="orange1"> + <t:implementation.python script="nuvem/name.py"/> + <service name="name"/> + <property>i</property> + </component> + <component name="name8" t:title="" t:color="orange1"> + <t:implementation.python script="nuvem/name.py"/> + <service name="name"/> + <property>a.b</property> + </component> + <component t:x="19" t:y="219" name="nothing" t:title="nothing" t:color="orange1"> + <t:implementation.python script="nuvem/nothing.py"/> + <service name="nothing"/> + </component> + <component name="number" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> - <property>0</property> + <property>12</property> </component> - <component t:x="378" t:y="90" name="number5" t:title="#" t:color="orange1"> + <component name="number10" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>10</property> </component> - <service name="first" promote="first"/> - <component t:x="179" t:y="34" name="first" t:title="first" t:color="yellow1"> - <t:implementation.python script="nuvem/first.py"/> - <service name="first"/> - <reference target="list7" name="list"/> - </component> - <service name="rest" promote="rest"/> - <component t:x="362" t:y="35" name="rest" t:title="rest" t:color="yellow1"> - <t:implementation.python script="nuvem/rest.py"/> - <service name="rest"/> - <reference target="list" name="list"/> - </component> - <service name="empty" promote="empty"/> - <component t:x="29" t:y="362" name="empty" t:title="empty" t:color="yellow1"> - <t:implementation.python script="nuvem/empty.py"/> - <service name="empty"/> - </component> - <service name="itemnb" promote="itemnb"/> - <component t:x="123" t:y="147" name="itemnb" t:title="item #" t:color="yellow1"> - <t:implementation.python script="nuvem/itemnb.py"/> - <service name="itemnb"/> - <reference target="number8" name="index"/> - <reference target="foreach" name="list"/> - </component> - <component t:x="208" t:y="187" name="number8" t:title="#" t:color="orange1"> + <component name="number11" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> - <property>3</property> - </component> - <component t:x="225" t:y="293" name="name2" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> - <service name="name"/> - <property>nb</property> + <property>123</property> </component> - <component t:x="498" t:y="437" name="number9" t:title="#" t:color="orange1"> + <component name="number12" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>0</property> </component> - <component t:x="547" t:y="403" name="number10" t:title="#" t:color="orange1"> + <component name="number13" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>10</property> </component> - <component t:x="226" t:y="373" name="number6" t:title="#" t:color="orange1"> + <component name="number14" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> - <property>2</property> - </component> - <component t:x="533" t:y="265" name="valueof2" t:title="valueof" t:color="orange1"> - <t:implementation.python script="nuvem/valueof.py"/> - <service name="valueof"/> - <property>sum</property> - </component> - <component t:x="533" t:y="307" name="valueof3" t:title="valueof" t:color="orange1"> - <t:implementation.python script="nuvem/valueof.py"/> - <service name="valueof"/> - <property>i</property> - </component> - <component t:x="253" t:y="266" name="multiply" t:title="*" t:color="magenta1"> - <t:implementation.python script="nuvem/multiply.py"/> - <service name="multiply"> - <documentation>*</documentation> - </service> - <reference target="valueof" name="value1"/> - <reference target="number6" name="value2"/> - </component> - <component t:x="280" t:y="264" name="valueof" t:title="valueof" t:color="orange1"> - <t:implementation.python script="nuvem/valueof.py"/> - <service name="valueof"/> - <property>nb</property> - </component> - <component t:x="167" t:y="13" name="list7" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="number2" name="item" t:clonable="true"/> - <reference target="number3" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <property>0</property> </component> - <component t:x="241" t:y="11" name="number2" t:title="#" t:color="orange1"> + <component name="number2" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>123</property> </component> - <component t:x="241" t:y="48" name="number3" t:title="#" t:color="orange1"> + <component name="number3" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>456</property> </component> - <service name="nothing" promote="nothing"/> - <component t:x="33" t:y="304" name="nothing" t:title="nothing" t:color="orange1"> - <t:implementation.python script="nuvem/nothing.py"/> - <service name="nothing"/> + <component name="number4" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>0</property> </component> - <component t:x="558" t:y="6" name="number" t:title="#" t:color="orange1"> + <component name="number5" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> - <property>12</property> + <property>10</property> </component> - <component t:x="559" t:y="46" name="number7" t:title="#" t:color="orange1"> + <component name="number6" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>2</property> + </component> + <component name="number7" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> <property>34</property> </component> - <component t:x="252" t:y="352" name="reverse" t:title="reverse" t:color="yellow1"> - <t:implementation.python script="nuvem/reverse.py"/> - <service name="reverse"/> - <reference target="range" name="list"/> + <component name="number8" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>3</property> </component> - <component t:x="189" t:y="224" name="foreach" t:title="foreach" t:color="yellow1"> - <t:implementation.python script="nuvem/map_.py"/> - <service name="foreach"/> - <reference target="name2" name="item"/> - <reference target="multiply" name="transform"/> - <reference target="reverse" name="list"/> + <component name="number9" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>0</property> </component> - <component t:x="834" t:y="61" name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property10" name="item" t:clonable="true"/> - <reference target="property9" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <component name="property" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="text3" name="value"/> + <property>a</property> </component> - <component t:x="833" t:y="32" name="name8" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> - <service name="name"/> - <property>a.b</property> + <component name="property10" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="list6" name="value"/> + <property>a</property> </component> - <service name="search" promote="search"/> - <component t:x="734" t:y="33" name="search" t:title="search" t:color="yellow1"> - <t:implementation.python script="nuvem/search.py"/> - <service name="search"/> - <reference target="name8" name="path"/> - <reference target="list3" name="list"/> + <component name="property11" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="text7" name="value"/> + <property>entry</property> </component> - <component t:x="264" t:y="429" name="property" t:title="{propval} :" t:color="orange1"> + <component name="property12" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> - <reference target="text3" name="value"/> - <property>a</property> + <reference target="list10" name="value"/> + <property>entry</property> </component> - <component t:x="470" t:y="441" name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>abc</property> + <component name="property13" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="text9" name="value"/> + <property>test</property> </component> - <component t:x="267" t:y="460" name="property2" t:title="{propval} :" t:color="orange1"> + <component name="property2" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text4" name="value"/> <property>d</property> </component> - <component t:x="480" t:y="517" name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>def</property> - </component> - <component t:x="935" t:y="92" name="property3" t:title="{propval} :" t:color="orange1"> + <component name="property3" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text5" name="value"/> <property>ccc</property> </component> - <component t:x="1255" t:y="126" name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>ccc</property> - </component> - <component t:x="938" t:y="127" name="property4" t:title="{propval} :" t:color="orange1"> + <component name="property4" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text2" name="value"/> <property>b</property> </component> - <component t:x="1229" t:y="179" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>bbb</property> - </component> - <component t:x="1037" t:y="559" name="text8" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>CCC</property> - </component> - <component t:x="1177" t:y="476" name="number11" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>123</property> - </component> - <component t:x="1230" t:y="253" name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>BBB</property> - </component> - <component t:x="1018" t:y="256" name="property7" t:title="{propval} :" t:color="orange1"> + <component name="property5" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> - <reference target="text6" name="value"/> - <property>b</property> + <reference target="text8" name="value"/> + <property>c</property> </component> - <component t:x="1020" t:y="286" name="property6" t:title="{propval} :" t:color="orange1"> + <component name="property6" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="number11" name="value"/> <property>c</property> </component> - <component t:x="941" t:y="334" name="property5" t:title="{propval} :" t:color="orange1"> + <component name="property7" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> - <reference target="text8" name="value"/> - <property>c</property> + <reference target="text6" name="value"/> + <property>b</property> </component> - <component t:x="941" t:y="227" name="property8" t:title="{propval} :" t:color="orange1"> + <component name="property8" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="list4" name="value"/> <property>a</property> </component> - <component t:x="1166" t:y="182" name="list4" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property7" name="item" t:clonable="true"/> - <reference target="property6" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component t:x="844" t:y="516" name="list5" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property8" name="item" t:clonable="true"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component t:x="972" t:y="531" name="list6" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component t:x="860" t:y="171" name="property9" t:title="{propval} :" t:color="orange1"> + <component name="property9" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="list5" name="value"/> <property>x</property> </component> - <component t:x="542" t:y="28" name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="number" name="item" t:clonable="true"/> - <reference target="number7" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <service name="list8" promote="list8"/> - <component t:x="550" t:y="351" name="list8" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property11" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component t:x="627" t:y="410" name="text7" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>hello</property> + <component name="range" t:title="range" t:color="yellow1"> + <t:implementation.python script="nuvem/range_.py"/> + <service name="range"/> + <reference target="number4" name="first"/> + <reference target="number5" name="last"/> </component> - <component t:x="529" t:y="410" name="property11" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="text7" name="value"/> - <property>entry</property> + <component name="range2" t:title="range" t:color="yellow1"> + <t:implementation.python script="nuvem/range_.py"/> + <service name="range"/> + <reference target="number9" name="first"/> + <reference target="number10" name="last"/> </component> - <service name="list9" promote="list9"/> - <component t:x="408" t:y="458" name="list9" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property12" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <component name="range3" t:title="range" t:color="yellow1"> + <t:implementation.python script="nuvem/range_.py"/> + <service name="range"/> + <reference target="number12" name="first"/> + <reference target="number13" name="last"/> </component> - <component t:x="876" t:y="414" name="list10" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property13" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <component t:x="437" t:y="24" name="reduce2" t:title="reduce" t:color="yellow1"> + <t:implementation.python script="nuvem/reduce_.py"/> + <service name="reduce"/> + <reference target="name6" name="item"/> + <reference target="name7" name="accum"/> + <reference target="add" name="transform"/> + <reference target="number14" name="init"/> + <reference target="range2" name="list"/> </component> - <component t:x="1013" t:y="414" name="text9" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>abc</property> + <component t:x="290" t:y="18" name="rest" t:title="rest" t:color="yellow1"> + <t:implementation.python script="nuvem/rest.py"/> + <service name="rest"/> + <reference target="list" name="list"/> </component> - <component t:x="776" t:y="416" name="property12" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="list10" name="value"/> - <property>entry</property> + <component name="reverse" t:title="reverse" t:color="yellow1"> + <t:implementation.python script="nuvem/reverse.py"/> + <service name="reverse"/> + <reference target="range" name="list"/> </component> - <component t:x="911" t:y="416" name="property13" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="text9" name="value"/> - <property>test</property> + <component t:x="628" t:y="20" name="search" t:title="search" t:color="yellow1"> + <t:implementation.python script="nuvem/search.py"/> + <service name="search"/> + <reference target="name8" name="path"/> + <reference target="list3" name="list"/> </component> - <service name="shuffle" promote="shuffle"/> - <component t:x="350" t:y="373" name="shuffle" t:title="shuffle" t:color="yellow1"> + <component t:x="223" t:y="368" name="shuffle" t:title="shuffle" t:color="yellow1"> <t:implementation.python script="nuvem/shuffle_.py"/> <service name="shuffle"/> <reference target="range3" name="list"/> </component> - <component t:x="565" t:y="389" name="number12" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>0</property> + <component t:x="15" t:y="11" name="start" t:title="start" t:color="green1"> + <t:implementation.python script="nuvem/start.py"/> + <service name="start" t:visible="false"> + <t:binding.http uri="start"/> + </service> + <reference target="text" name="content"/> </component> - <component t:x="560" t:y="417" name="number13" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>10</property> + <component name="text" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>xyz</property> </component> - <component t:x="508" t:y="389" name="range3" t:title="range" t:color="yellow1"> - <t:implementation.python script="nuvem/range_.py"/> - <service name="range"/> - <reference target="number12" name="first"/> - <reference target="number13" name="last"/> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>bbb</property> </component> - <component t:x="150" t:y="18" name="text" t:title=" '{propval}'" t:color="orange1"> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>xyz</property> + <property>abc</property> </component> - <service name="appstart" promote="appstart"/> - <component t:x="42" t:y="35" name="appstart" t:title="start" t:color="green1"> - <t:implementation.python script="nuvem/appstart.py"/> - <service name="appstart" t:visible="false"> - <t:binding.http uri="appstart"/> - </service> - <reference target="text" name="content"/> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>def</property> </component> - <component t:x="207" t:y="427" name="list2" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property" name="item" t:clonable="true"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <component name="text5" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>ccc</property> </component> - <service name="reduce2" promote="reduce2"/> - <component t:x="525" t:y="84" name="reduce2" t:title="reduce" t:color="yellow1"> - <t:implementation.python script="nuvem/reduce_.py"/> - <service name="reduce"/> - <reference target="name6" name="item"/> - <reference target="name7" name="accum"/> - <reference target="add" name="transform"/> - <reference target="number14" name="init"/> - <reference target="range2" name="list"/> + <component name="text6" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>BBB</property> </component> - <component t:x="571" t:y="500" name="name7" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> - <service name="name"/> - <property>i</property> + <component name="text7" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>hello</property> </component> - <component t:x="567" t:y="526" name="add" t:title="+" t:color="magenta1"> - <t:implementation.python script="nuvem/add.py"/> - <service name="add"> - <documentation>+</documentation> - </service> - <reference target="valueof2" name="value1"/> - <reference target="valueof3" name="value2"/> + <component name="text8" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>CCC</property> </component> - <component t:x="555" t:y="287" name="range2" t:title="range" t:color="yellow1"> - <t:implementation.python script="nuvem/range_.py"/> - <service name="range"/> - <reference target="number9" name="first"/> - <reference target="number10" name="last"/> + <component name="text9" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>abc</property> </component> - <component t:x="556" t:y="265" name="number14" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>0</property> + <component t:x="23" t:y="120" name="true" t:title="true" t:color="orange1"> + <t:implementation.python script="nuvem/true_.py"/> + <service name="true"/> </component> - <component t:x="552" t:y="146" name="name6" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> - <service name="name"/> + <component name="valueof" t:title="valueof" t:color="orange1"> + <t:implementation.python script="nuvem/valueof.py"/> + <service name="valueof"/> + <property>nb</property> + </component> + <component name="valueof2" t:title="valueof" t:color="orange1"> + <t:implementation.python script="nuvem/valueof.py"/> + <service name="valueof"/> <property>sum</property> </component> - <component t:x="816" t:y="61" name="property10" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="list6" name="value"/> - <property>a</property> + <component name="valueof3" t:title="valueof" t:color="orange1"> + <t:implementation.python script="nuvem/valueof.py"/> + <service name="valueof"/> + <property>i</property> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html b/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html index 9ac6e55434..97889b7a9d 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html @@ -18,10 +18,10 @@ * under the License. --> <DIV id="page"> - <SPAN id="value" class="text" style="position: absolute; top: 63px; left: 2px; "> - <SPAN>text</SPAN> - </SPAN> - <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; "> + <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> <H2>Test values and lists</H2> </SPAN> + <SPAN id="value" class="text" style="position: absolute; top: 36px; left: 29px; "> + <SPAN>text</SPAN> + </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite index 27e93dc15f..6b08e18f3b 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite @@ -17,132 +17,132 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testwidgets" name="testwidgets"> - <component t:x="708" t:y="619" name="property" t:title="{propval} :" t:color="orange1"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> + <service name="start" promote="start"/> + <component name="list" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property10" name="item" t:clonable="true"/> + <reference target="property9" name="item" t:clonable="true"/> + <reference target="property8" name="item" t:clonable="true"/> + <reference target="property7" name="item" t:clonable="true"/> + <reference target="property6" name="item" t:clonable="true"/> + <reference target="property5" name="item" t:clonable="true"/> + <reference target="property4" name="item" t:clonable="true"/> + <reference target="property3" name="item" t:clonable="true"/> + <reference target="property2" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="property" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text9" name="value"/> <property>testpath2</property> </component> - <component t:x="905" t:y="615" name="text9" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>test path</property> + <component name="property10" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference target="text" name="value"/> + <property>testh1</property> </component> - <component t:x="413" t:y="315" name="property2" t:title="{propval} :" t:color="orange1"> + <component name="property2" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="property" name="value"/> <property>testpath1</property> </component> - <component t:x="411" t:y="281" name="property3" t:title="{propval} :" t:color="orange1"> + <component name="property3" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text6" name="value"/> <property>testimg</property> </component> - <component t:x="927" t:y="304" name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property> - </component> - <component t:x="410" t:y="247" name="property4" t:title="{propval} :" t:color="orange1"> + <component name="property4" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text8" name="value"/> <property>testtext</property> </component> - <component t:x="790" t:y="441" name="text8" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>test text</property> - </component> - <component t:x="411" t:y="210" name="property5" t:title="{propval} :" t:color="orange1"> + <component name="property5" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text4" name="value"/> <property>testlink</property> </component> - <component t:x="842" t:y="340" name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://tuscany.apache.org</property> - </component> - <component t:x="413" t:y="177" name="property6" t:title="{propval} :" t:color="orange1"> + <component name="property6" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text5" name="value"/> <property>testcheckbox</property> </component> - <component t:x="790" t:y="336" name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>test checkbox</property> - </component> - <component t:x="411" t:y="136" name="property7" t:title="{propval} :" t:color="orange1"> + <component name="property7" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text3" name="value"/> <property>testentry</property> </component> - <component t:x="588" t:y="314" name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>test entry field</property> - </component> - <component t:x="401" t:y="102" name="property8" t:title="{propval} :" t:color="orange1"> + <component name="property8" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text2" name="value"/> <property>testbutton</property> </component> - <component t:x="775" t:y="212" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>test button</property> - </component> - <component t:x="411" t:y="66" name="property9" t:title="{propval} :" t:color="orange1"> + <component name="property9" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text7" name="value"/> <property>testsection</property> </component> - <component t:x="780" t:y="147" name="text7" t:title=" '{propval}'" t:color="orange1"> + <component t:x="17" t:y="3" name="start" t:title="start" t:color="green1"> + <t:implementation.python script="nuvem/start.py"/> + <service name="start" t:visible="false"> + <t:binding.http uri="start"/> + </service> + <reference target="list" name="content"/> + </component> + <component name="text" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>test section</property> + <property>test header 1</property> </component> - <component t:x="406" t:y="28" name="property10" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="text" name="value"/> - <property>testh1</property> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>test button</property> </component> - <component t:x="748" t:y="92" name="text" t:title=" '{propval}'" t:color="orange1"> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>test header 1</property> + <property>test entry field</property> </component> - <component t:x="308" t:y="37" name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property10" name="item" t:clonable="true"/> - <reference target="property9" name="item" t:clonable="true"/> - <reference target="property8" name="item" t:clonable="true"/> - <reference target="property7" name="item" t:clonable="true"/> - <reference target="property6" name="item" t:clonable="true"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>http://tuscany.apache.org</property> </component> - <service name="appstart" promote="appstart"/> - <component t:x="208" t:y="18" name="appstart" t:title="start" t:color="green1"> - <t:implementation.python script="nuvem/appstart.py"/> - <service name="appstart" t:visible="false"> - <t:binding.http uri="appstart"/> - </service> - <reference target="list" name="content"/> + <component name="text5" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>test checkbox</property> + </component> + <component name="text6" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property> + </component> + <component name="text7" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>test section</property> + </component> + <component name="text8" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>test text</property> + </component> + <component name="text9" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>test path</property> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html index ce561f3a98..ff255ee45d 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html @@ -18,44 +18,44 @@ * under the License. --> <DIV id="page"> - <SPAN id="testbutton" class="button" style="position: absolute; top: 97px; left: 9px; "> - <INPUT type="button" value="button"/> + <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; "> + <H1>Header1</H1> </SPAN> - <SPAN id="testsection" class="section" style="position: absolute; top: 52px; left: 10px; "> + <SPAN id="testsection" class="section" style="position: absolute; top: 45px; width: 100%; left: 11px; "> <SPAN>section</SPAN> </SPAN> - <SPAN id="testtext" class="text" style="position: absolute; top: 252px; left: 17px; "> - <SPAN>text</SPAN> + <SPAN id="testimg" class="img" style="position: absolute; top: 90px; left: 263px; "> + <IMG src="/public/img.png"/> + </SPAN> + <SPAN id="testbutton" class="button" style="position: absolute; top: 99px; left: 11px; "> + <INPUT type="button" value="button" class="graybutton"/> </SPAN> - <SPAN id="testcheckbox" class="checkbox" style="position: absolute; top: 183px; left: 11px; "> + <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; "> + <INPUT type="text" value="field" size="20" autocapitalize="off"/> + </SPAN> + <SPAN id="testcheckbox" class="checkbox" style="position: absolute; top: 180px; left: 11px; "> <INPUT type="checkbox" value="checkbox"/> <SPAN>checkbox</SPAN> </SPAN> - <SPAN id="testlink" class="link" style="position: absolute; top: 217px; left: 17px; "> + <SPAN id="testlink2" class="link" style="position: absolute; top: 189px; left: 263px; "> + <A href="http://www.apache.org/"> + <SPAN>http://www.apache.org/</SPAN> + </A> + </SPAN> + <SPAN id="testlink" class="link" style="position: absolute; top: 216px; left: 11px; "> <A href="link"> <SPAN>link</SPAN> </A> </SPAN> - <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 282px; left: 17px; "> - <SPAN>text</SPAN> - </SPAN> - <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; "> - <H1>Header1</H1> - </SPAN> <SPAN id="testlink3" class="link" style="position: absolute; top: 225px; left: 263px; "> <A href="http://www.apache.org"> <SPAN> Apache</SPAN> </A> </SPAN> - <SPAN id="testlink2" class="link" style="position: absolute; top: 189px; left: 263px; "> - <A href="http://www.apache.org/"> - <SPAN>http://www.apache.org/</SPAN> - </A> - </SPAN> - <SPAN id="testimg" class="img" style="position: absolute; top: 90px; left: 263px; "> - <IMG src="/public/img.png"/> + <SPAN id="testtext" class="text" style="position: absolute; top: 243px; left: 11px; "> + <SPAN>text</SPAN> </SPAN> - <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; "> - <INPUT type="text" value="field" size="20" autocapitalize="off"/> + <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 270px; left: 11px; "> + <SPAN>text</SPAN> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite index 1fc61a4f22..1a14eec510 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite @@ -17,114 +17,114 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testwidgets2" name="testwidgets2"> - <component t:x="449" t:y="389" name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://www.apache.org/</property> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> + <service name="start" promote="start"/> + <component name="list" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property4" name="item" t:clonable="true"/> + <reference target="property5" name="item" t:clonable="true"/> + <reference target="property3" name="item" t:clonable="true"/> + <reference target="property2" name="item" t:clonable="true"/> + <reference target="property" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> </component> - <component t:x="735" t:y="335" name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>Apache</property> + <component name="list3" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="text3" name="item" t:clonable="true"/> + <reference target="text4" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> </component> - <component t:x="645" t:y="457" name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>http://www.cnn.com</property> + <component name="list4" t:title="list" t:color="yellow1"> + <t:implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="property6" name="item" t:clonable="true"/> + <reference target="property7" name="item" t:clonable="true"/> + <reference name="item" t:clonable="true"/> + </component> + <component name="number3" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>1</property> + </component> + <component name="number4" t:title="#" t:color="orange1"> + <t:implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>2</property> </component> - <component t:x="271" t:y="276" name="property" t:title="{propval} :" t:color="orange1"> + <component name="property" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text5" name="value"/> <property>testframe</property> </component> - <component t:x="631" t:y="388" name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="text3" name="item" t:clonable="true"/> - <reference target="text4" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component t:x="272" t:y="183" name="property2" t:title="{propval} :" t:color="orange1"> + <component name="property2" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="list3" name="value"/> <property>testlink</property> </component> - <component t:x="270" t:y="147" name="property3" t:title="{propval} :" t:color="orange1"> + <component name="property3" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text2" name="value"/> <property>testhtml</property> </component> - <component t:x="695" t:y="243" name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property><b>test bold text</b></property> - </component> - <component t:x="271" t:y="0" name="property4" t:title="{propval} :" t:color="orange1"> + <component name="property4" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="text" name="value"/> <property>testlist1</property> </component> - <component t:x="677" t:y="49" name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> - <service name="text"/> - <property>test value</property> - </component> - <component t:x="271" t:y="34" name="property5" t:title="{propval} :" t:color="orange1"> + <component name="property5" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="list4" name="value"/> <property>testlist2</property> </component> - <component t:x="672" t:y="111" name="list4" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property6" name="item" t:clonable="true"/> - <reference target="property7" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component t:x="709" t:y="109" name="property6" t:title="{propval} :" t:color="orange1"> + <component name="property6" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="number3" name="value"/> <property>a</property> </component> - <component t:x="780" t:y="107" name="number3" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>1</property> - </component> - <component t:x="781" t:y="137" name="number4" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> - <service name="number"/> - <property>2</property> - </component> - <component t:x="710" t:y="142" name="property7" t:title="{propval} :" t:color="orange1"> + <component name="property7" t:title="{propval} :" t:color="orange1"> <t:implementation.python script="nuvem/assoc.py"/> <service name="property"/> <reference target="number4" name="value"/> <property>b</property> </component> - <component t:x="326" t:y="32" name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> - <service name="list"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference target="property" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <service name="appstart" promote="appstart"/> - <component t:x="212" t:y="33" name="appstart" t:title="start" t:color="green1"> - <t:implementation.python script="nuvem/appstart.py"/> - <service name="appstart" t:visible="false"> - <t:binding.http uri="appstart"/> + <component t:x="13" t:y="8" name="start" t:title="start" t:color="green1"> + <t:implementation.python script="nuvem/start.py"/> + <service name="start" t:visible="false"> + <t:binding.http uri="start"/> </service> <reference target="list" name="content"/> </component> + <component name="text" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>test value</property> + </component> + <component name="text2" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property><b>test bold text</b></property> + </component> + <component name="text3" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>http://www.apache.org/</property> + </component> + <component name="text4" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>Apache</property> + </component> + <component name="text5" t:title=" '{propval}'" t:color="orange1"> + <t:implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>http://www.cnn.com</property> + </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html index b20cf24c02..2bf6593f02 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html @@ -22,7 +22,7 @@ <H2>Test widget components</H2> </SPAN> <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; left: 20px; "> - <TABLE class="datatable" style="width: 200px;"> + <TABLE class="datatable" style="width: 100%; "> <TBODY> <TR> <TD>table</TD> @@ -36,7 +36,7 @@ </TABLE> </SPAN> <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; left: 20px; "> - <TABLE class="datatable" style="width: 200px;"> + <TABLE class="datatable" style="width: 100%; "> <TBODY> <TR> <TD>table</TD> @@ -50,7 +50,7 @@ </TABLE> </SPAN> <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 20px; "> - <TABLE class="datatable" style="width: 200px;"> + <TABLE class="datatable" style="width: 100%; "> <TBODY> <TR> <TD>table</TD> @@ -66,6 +66,11 @@ <SPAN id="testhtml" class="text" style="position: absolute; top: 234px; left: 20px; "> <SPAN>text</SPAN> </SPAN> + <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; "> + <SELECT> + <OPTION>select</OPTION> + </SELECT> + </SPAN> <SPAN id="testlink" class="link" style="position: absolute; top: 270px; left: 20px; "> <A href="/"> <SPAN>link</SPAN> @@ -78,9 +83,4 @@ </SPAN> </A> </SPAN> - <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; "> - <SELECT> - <OPTION>select</OPTION> - </SELECT> - </SPAN> </DIV> |