diff options
Diffstat (limited to '')
24 files changed, 1114 insertions, 895 deletions
diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.composite b/sca-cpp/trunk/modules/edit/apps/test/app.composite index 7e4828573a..253168ff21 100644 --- a/sca-cpp/trunk/modules/edit/apps/test/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite @@ -17,11 +17,48 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> - <service name="text3" promote="text3"/> - <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> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> + <service name="comment1" promote="comment1"/> + <service name="start1" promote="start1"/> + <component x="10" y="0" name="comment1" title="{propval}" color="white"> + <implementation.python script="nuvem/comment.py"/> + <service name="comment" visible="false"/> + <property>Change this example to do what you want</property> + </component> + <component name="item1" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="user1" name="value"/> + <property>me</property> + </component> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="now1" name="value"/> + <property>time</property> + </component> + <component name="list2" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="item1" name="item" clonable="true"/> + <reference target="item2" name="item" clonable="true"/> + <reference name="item" clonable="true"/> + </component> + <component name="now1" title="now" color="orange1"> + <implementation.python script="nuvem/now.py"/> + <service name="now"/> + <reference name="format"/> + </component> + <component x="10" y="40" name="start1" title="start" color="green1"> + <implementation.python script="nuvem/start.py"/> + <service name="start" visible="false"> + <binding.http uri="start"/> + </service> + <reference target="list2" name="content"/> + </component> + <component name="user1" title="user" color="green1"> + <implementation.python script="nuvem/user.py"/> + <service name="user"/> + <property name="user" visible="false"/> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html index 5c7c7219bb..de39e20956 100644 --- a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html @@ -17,4 +17,17 @@ * specific language governing permissions and limitations * under the License. --> -<DIV id="page"/> +<DIV id="page"> + <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 0px; "> + <H1>Hello</H1> + </SPAN> + <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 56px; "> + <H1>=me</H1> + </SPAN> + <SPAN id="page:text" class="text" style="position: absolute; top: 36px; left: 2px; "> + <SPAN>The time is:</SPAN> + </SPAN> + <SPAN id="time" class="text" style="position: absolute; top: 36px; left: 74px; "> + <SPAN>=time</SPAN> + </SPAN> +</DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite index ddad3cd7a1..e635f964bb 100644 --- a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testdb/app.composite @@ -17,82 +17,82 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> <service name="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"/> + <component x="176" y="11" name="delete" title="delete" color="red1"> + <implementation.python script="nuvem/delete.py"/> <service name="delete"/> <reference target="filedb2" name="collection"/> <reference target="list3" name="id"/> </component> - <component name="filedb" t:title="file" t:color="red1"> - <t:implementation.python script="nuvem/filedb.py"/> + <component name="filedb" title="file" color="red1"> + <implementation.python script="nuvem/filedb.py"/> <service name="filedb"/> - <reference name="db" target="AppDataFileCache" t:visible="false"/> - <property name="host" t:visible="false"/> + <reference name="db" target="AppDataFileCache" visible="false"/> + <property name="host" visible="false"/> </component> - <component name="filedb2" t:title="file" t:color="red1"> - <t:implementation.python script="nuvem/filedb.py"/> + <component name="filedb2" title="file" color="red1"> + <implementation.python script="nuvem/filedb.py"/> <service name="filedb"/> - <reference name="db" target="AppDataFileCache" t:visible="false"/> - <property name="host" t:visible="false"/> + <reference name="db" target="AppDataFileCache" visible="false"/> + <property name="host" visible="false"/> </component> - <component name="filedb3" t:title="file" t:color="red1"> - <t:implementation.python script="nuvem/filedb.py"/> + <component name="filedb3" title="file" color="red1"> + <implementation.python script="nuvem/filedb.py"/> <service name="filedb"/> - <reference name="db" target="AppDataFileCache" t:visible="false"/> - <property name="host" t:visible="false"/> + <reference name="db" target="AppDataFileCache" visible="false"/> + <property name="host" visible="false"/> </component> - <component t:x="18" t:y="137" name="get" t:title="get" t:color="red1"> - <t:implementation.python script="nuvem/get.py"/> + <component x="18" y="137" name="get" title="get" color="red1"> + <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"/> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="text" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="text" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list2" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list2" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="text3" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="text3" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list3" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="text4" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="text4" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component t:x="13" t:y="1" name="put" t:title="put" t:color="red1"> - <t:implementation.python script="nuvem/put.py"/> + <component x="13" y="1" name="put" title="put" color="red1"> + <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"/> + <component name="text" title=" '{propval}'" color="orange1"> + <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"/> + <component name="text2" title=" '{propval}'" color="orange1"> + <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"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>testkey</property> </component> - <component name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>testkey</property> </component> diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html index 734ec8f687..856966ff50 100644 --- a/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. --> <DIV id="page"> - <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> + <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> <H1>Test db components</H1> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite index ffe17c3cd4..6389622481 100644 --- a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testevents/app.composite @@ -17,155 +17,179 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> + <service name="Cancel" promote="Cancel"/> + <service name="OK" promote="OK"/> + <service name="call" promote="call"/> <service name="call2" promote="call2"/> + <service name="call3" promote="call3"/> <service name="compabc" promote="compabc"/> <service name="compxyz" promote="compxyz"/> - <service name="geolocation" promote="geolocation"/> + <service name="location" promote="location"/> <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"/> + <component name="Cancel" x="223" y="16" title="{compname}" color="green1"> + <implementation.python script="nuvem/service.py"/> + <service name="service" visible="false"/> + <reference target="prop2" name="content"/> + </component> + <component name="OK" x="228" y="78" title="{compname}" color="green1"> + <implementation.python script="nuvem/service.py"/> + <service name="service" visible="false"/> + <reference target="list" name="content"/> + </component> + <component name="abc" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>abc</property> </component> - <component t:x="16" t:y="208" name="call2" t:title="call" t:color="green1"> - <t:implementation.python script="nuvem/call.py"/> + <component x="223" y="216" name="call" title="call" color="green1"> + <implementation.python script="nuvem/call.py"/> + <service name="call"/> + <reference target="name2" name="name"/> + <reference name="proxy" wiredByImpl="true" visible="false"/> + </component> + <component x="16" y="208" name="call2" title="call" color="green1"> + <implementation.python script="nuvem/call.py"/> <service name="call"/> <reference target="name" name="name"/> - <reference name="proxy" wiredByImpl="true" t:visible="false"/> + <reference name="proxy" wiredByImpl="true" visible="false"/> + </component> + <component x="222" y="273" name="call3" title="call" color="green1"> + <implementation.python script="nuvem/call.py"/> + <service name="call"/> + <reference target="text5" name="name"/> + <reference name="proxy" wiredByImpl="true" visible="false"/> </component> - <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"/> + <component x="14" y="265" name="compabc" title="{compname}" color="green1"> + <implementation.python script="nuvem/service.py"/> + <service name="service" visible="false"/> <reference target="abc" name="content"/> </component> - <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"/> + <component x="15" y="316" name="compxyz" title="{compname}" color="green1"> + <implementation.python script="nuvem/service.py"/> + <service name="service" visible="false"/> <reference target="text12" name="content"/> </component> - <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"/> + <component x="12" y="146" name="location" title="location" color="green1"> + <implementation.python script="nuvem/location.py"/> + <service name="location" visible="false"> + <binding.http uri="location"/> </service> - <reference target="property6" name="content"/> + <reference target="item6" name="content"/> </component> - <component name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item5" name="item" clonable="true"/> + <reference target="item4" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="name" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> + <component name="name" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> <service name="name"/> <property>compxyz</property> </component> - <component name="number" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="name2" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> + <service name="name"/> + <property>https://testhttp.sca-store.com:8453/components/property</property> + </component> + <component name="number" title="#" color="orange1"> + <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"/> + <component name="param" title="?param" color="green1"> + <implementation.python script="nuvem/param.py"/> <service name="param"/> <property>testfield</property> - <property name="query" t:visible="false"/> + <property name="query" visible="false"/> </component> - <component name="params2" t:title="?params" t:color="green1"> - <t:implementation.python script="nuvem/params.py"/> + <component name="params2" title="?params" color="green1"> + <implementation.python script="nuvem/params.py"/> <service name="params"/> - <property name="query" t:visible="false"/> + <property name="query" visible="false"/> </component> - <component name="prop2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="prop2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text3" name="value"/> <property>status</property> </component> - <component name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text4" name="value"/> <property>status</property> </component> - <component name="property3" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item3" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text" name="value"/> <property>status</property> </component> - <component name="property4" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item4" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text2" name="value"/> <property>status</property> </component> - <component name="property5" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item5" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="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"/> + <component name="item6" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <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"/> + <component x="15" y="3" name="start" title="start" color="green1"> + <implementation.python script="nuvem/start.py"/> + <service name="start" visible="false"> + <binding.http uri="start"/> </service> - <reference target="property3" name="content"/> - </component> - <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"/> + <reference target="item3" name="content"/> </component> - <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 name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>page opens</property> </component> - <component name="text12" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text12" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>xyz</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>ok button clicked</property> </component> - <component name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>cancel button clicked</property> </component> - <component name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>timer fired</property> </component> - <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"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>https://testhttp.sca-store.com:8453/components/property</property> + </component> + <component x="13" y="58" name="timer3" title="timer" color="green1"> + <implementation.python script="nuvem/timer.py"/> + <service name="timer" visible="false"> + <binding.http uri="timer"/> </service> <reference target="number" name="n"/> - <reference target="property2" name="content"/> + <reference target="item2" name="content"/> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html index 36b07205c7..6698c6faa8 100644 --- a/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html @@ -18,40 +18,40 @@ * under the License. --> <DIV id="page"> - <SPAN id="testbutton1" class="button" style="position: absolute; top: 207px; left: 2px; "> - <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" class="graybutton"/> - </SPAN> - <SPAN id="text" class="text" style="position: absolute; top: 171px; left: 11px; "> - <SPAN>Latitude:</SPAN> + <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> + <H1>Test events</H1> </SPAN> - <SPAN id="latitude" class="text" style="position: absolute; top: 171px; left: 92px; "> - <SPAN>text</SPAN> + <SPAN id="testfield" class="entry" style="position: absolute; top: 54px; left: 11px; "> + <INPUT type="text" value="=testfield" size="10" autocapitalize="off"/> </SPAN> - <SPAN id="longitude" class="text" style="position: absolute; top: 144px; left: 92px; "> - <SPAN>text</SPAN> + <SPAN id="page:text" class="text" style="position: absolute; top: 90px; left: 11px; "> + <SPAN>Status:</SPAN> </SPAN> - <SPAN id="text" class="text" style="position: absolute; top: 144px; left: 11px; "> - <SPAN>Longitude:</SPAN> + <SPAN id="status" class="text" style="position: absolute; top: 90px; left: 92px; "> + <SPAN>=status</SPAN> </SPAN> - <SPAN id="text" class="text" style="position: absolute; top: 117px; left: 11px; "> + <SPAN id="page:text" class="text" style="position: absolute; top: 117px; left: 11px; "> <SPAN>Field value:</SPAN> </SPAN> <SPAN id="testtext" class="text" style="position: absolute; top: 117px; left: 92px; "> - <SPAN>text</SPAN> + <SPAN>=testtext</SPAN> </SPAN> - <SPAN id="text" class="text" style="position: absolute; top: 90px; left: 11px; "> - <SPAN>Status:</SPAN> + <SPAN id="page:text" class="text" style="position: absolute; top: 144px; left: 11px; "> + <SPAN>Longitude:</SPAN> </SPAN> - <SPAN id="status" class="text" style="position: absolute; top: 90px; left: 92px; "> - <SPAN>text</SPAN> + <SPAN id="longitude" class="text" style="position: absolute; top: 144px; left: 92px; "> + <SPAN>=longitude</SPAN> </SPAN> - <SPAN id="testfield" class="entry" style="position: absolute; top: 54px; left: 11px; "> - <INPUT type="text" value="enter a val" size="10" autocapitalize="off"/> + <SPAN id="page:text" class="text" style="position: absolute; top: 171px; left: 11px; "> + <SPAN>Latitude:</SPAN> </SPAN> - <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> - <H1>Test events</H1> + <SPAN id="latitude" class="text" style="position: absolute; top: 171px; left: 92px; "> + <SPAN>=latitude</SPAN> + </SPAN> + <SPAN id="page:button" class="button" style="position: absolute; top: 207px; left: 2px; "> + <INPUT type="button" value="OK" class="graybutton"/> + </SPAN> + <SPAN id="page:button" class="button" style="position: absolute; top: 207px; left: 47px; "> + <INPUT type="button" value="Cancel" class="graybutton"/> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite index f9955c5640..a632809760 100644 --- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite @@ -17,7 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> + <service name="call" promote="call"/> <service name="get" promote="get"/> <service name="get2" promote="get2"/> <service name="get3" promote="get3"/> @@ -25,106 +26,153 @@ <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="item" promote="property"/> + <component x="36" y="287" name="call" title="call" color="green1"> + <implementation.python script="nuvem/call.py"/> + <service name="call"/> + <reference target="name" name="name"/> + <reference name="proxy" wiredByImpl="true" visible="false"/> + </component> + <component name="first" title="first" color="yellow1"> + <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"> + <component x="20" y="8" name="get" title="get" color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text" name="url"/> </component> - <component t:x="18" t:y="61" name="get2" t:title="get" t:color="green1"> + <component x="18" y="61" name="get2" title="get" color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text2" name="url"/> </component> - <component t:x="14" t:y="112" name="get3" t:title="get" t:color="green1"> + <component x="14" y="112" name="get3" title="get" color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text3" name="url"/> </component> - <component t:x="17" t:y="166" name="get4" t:title="get" t:color="green1"> + <component x="19" y="170" name="get4" title="get" color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text4" name="url"/> </component> - <component t:x="19" t:y="218" name="get5" t:title="get" t:color="green1"> + <component x="241" y="6" name="get5" title="get" color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text5" name="url"/> </component> - <component t:x="19" t:y="271" name="get6" t:title="get" t:color="green1"> + <component x="16" y="227" name="get6" title="get" color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text6" name="url"/> </component> - <component name="get7" t:title="get" t:color="green1"> + <component name="get7" title="get" color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text7" name="url"/> </component> - <component name="join" t:title="join" t:color="magenta1"> - <t:implementation.python script="nuvem/join.py"/> + <component name="join" title="join" color="magenta1"> + <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"/> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> + <service name="list"/> + <reference target="item2" name="item" clonable="true"/> + <reference target="item3" name="item" clonable="true"/> + <reference name="item" clonable="true"/> + </component> + <component name="name" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> + <service name="name"/> + <property>https://testhttp.sca-store.com:8453/components/property</property> + </component> + <component name="params" title="?params" color="green1"> + <implementation.python script="nuvem/params.py"/> + <service name="params"/> + <property name="query" visible="false"/> + </component> + <component x="597" y="167" name="parse" title="parse" color="magenta1"> + <implementation.python script="nuvem/parse.py"/> <service name="parse"/> <reference target="text8" name="regexp"/> <reference target="join" name="string"/> </component> - <component name="rest" t:title="rest" t:color="yellow1"> - <t:implementation.python script="nuvem/rest.py"/> + <component x="74" y="343" name="property" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="list" name="value"/> + <property>test</property> + </component> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="user" name="value"/> + <property>user</property> + </component> + <component name="item3" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="params" name="value"/> + <property>name</property> + </component> + <component name="rest" title="rest" color="yellow1"> + <implementation.python script="nuvem/rest.py"/> <service name="rest"/> <reference target="get7" name="list"/> </component> - <component name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://www.google.com</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>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"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <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"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://feedproxy.google.com/TechCrunch</property> </component> - <component name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>cnn.com</property> </component> - <component name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text6" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> - <property>https://chart.googleapis.com/chart?cht=p3&chs=250x100&chd=t:60,40&chl=Hello|World</property> + <property>https://chart.googleapis.com/chart?cht=p3&chs=250x100&chd=60,40&chl=Hello|World</property> </component> - <component name="text7" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text7" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>cnn.com</property> </component> - <component name="text8" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text8" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>(CNN)</property> </component> - <component name="text9" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text9" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property name="property"/> </component> + <component name="user" title="user" color="green1"> + <implementation.python script="nuvem/user.py"/> + <service name="user"/> + <property name="user" visible="false"/> + </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html index ddbd0ebc48..b0c20ef5e6 100644 --- a/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html @@ -18,11 +18,11 @@ * under the License. --> <DIV id="page"> - <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> + <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> <H1>Test HTTP components</H1> </SPAN> <SPAN id="iframe" class="iframe" style="position: absolute; top: 234px; left: 11px; "> - <A href="https://testhttp.sca-store.com:8453/components/get5"> + <A href="/public/iframe.html"> <SPAN class="fakeframe"> <SPAN>frame ...</SPAN> </SPAN> diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite index d9b209fe10..86d4ed3365 100644 --- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> <service name="cos" promote="cos"/> <service name="eval" promote="eval"/> <service name="eval2" promote="eval2"/> @@ -26,124 +26,124 @@ <service name="if" promote="if"/> <service name="random" promote="random"/> <service name="sin" promote="sin"/> - <component t:x="20" t:y="251" name="cos" t:title="cos" t:color="magenta1"> - <t:implementation.python script="nuvem/cos_.py"/> + <component x="20" y="251" name="cos" title="cos" color="magenta1"> + <implementation.python script="nuvem/cos_.py"/> <service name="cos"/> <reference target="number7" name="x"/> </component> - <component t:x="170" t:y="11" name="eval" t:title="expr" t:color="magenta1"> - <t:implementation.python script="nuvem/eval_.py"/> + <component x="170" y="11" name="eval" title="expr" color="magenta1"> + <implementation.python script="nuvem/eval_.py"/> <service name="eval"/> <reference target="text3" name="py"/> <reference name="ref"/> </component> - <component t:x="180" t:y="85" name="eval2" t:title="expr" t:color="magenta1"> - <t:implementation.python script="nuvem/eval_.py"/> + <component x="180" y="85" name="eval2" title="expr" color="magenta1"> + <implementation.python script="nuvem/eval_.py"/> <service name="eval"/> <reference target="text4" name="py"/> <reference target="number3" name="ref"/> </component> - <component t:x="156" t:y="267" name="exec" t:title="script" t:color="magenta1"> - <t:implementation.python script="nuvem/exec_.py"/> + <component x="156" y="267" name="exec" title="script" color="magenta1"> + <implementation.python script="nuvem/exec_.py"/> <service name="exec"/> <reference target="get" name="py"/> <reference target="number4" name="ref"/> </component> - <component t:x="160" t:y="172" name="exec2" t:title="script" t:color="magenta1"> - <t:implementation.python script="nuvem/exec_.py"/> + <component x="160" y="172" name="exec2" title="script" color="magenta1"> + <implementation.python script="nuvem/exec_.py"/> <service name="exec"/> <reference target="text6" name="py"/> <reference target="number5" name="ref"/> </component> - <component name="get" t:title="get" t:color="green1"> + <component name="get" title="get" color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text5" name="url"/> </component> - <component name="greater" t:title="gt" t:color="magenta1"> - <t:implementation.python script="nuvem/greater.py"/> + <component name="greater" title="gt" color="magenta1"> + <implementation.python script="nuvem/greater.py"/> <service name="greater"/> <reference target="number2" name="value1"/> <reference target="number" name="value2"/> </component> - <component t:x="19" t:y="9" name="if" t:title="if" t:color="magenta1"> - <t:implementation.python script="nuvem/if_.py"/> + <component x="19" y="9" name="if" title="if" color="magenta1"> + <implementation.python script="nuvem/if_.py"/> <service name="if"/> <reference target="greater" name="condition"/> <reference target="text" name="then"/> <reference target="text2" name="else"/> </component> - <component name="number" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>5</property> </component> - <component name="number2" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number2" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>3</property> </component> - <component name="number3" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number3" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>5</property> </component> - <component name="number4" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number4" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>5</property> </component> - <component name="number5" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number5" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>5</property> </component> - <component name="number6" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number6" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>0.5</property> </component> - <component name="number7" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number7" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>0.5</property> </component> - <component t:x="24" t:y="158" name="random" t:title="rand" t:color="magenta1"> - <t:implementation.python script="nuvem/random_.py"/> + <component x="24" y="158" name="random" title="rand" color="magenta1"> + <implementation.python script="nuvem/random_.py"/> <service name="random"/> </component> - <component t:x="21" t:y="198" name="sin" t:title="sin" t:color="magenta1"> - <t:implementation.python script="nuvem/sin_.py"/> + <component x="21" y="198" name="sin" title="sin" color="magenta1"> + <implementation.python script="nuvem/sin_.py"/> <service name="sin"/> <reference target="number6" name="x"/> </component> - <component name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>greater than 5</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>not greater than 5</property> </component> - <component name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>3.14116 * 5 * 5</property> </component> - <component name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>3.14116 * ref.get(r) * ref.get(r)</property> </component> - <component name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://people.apache.org/~jsdelfino/tuscany/test/surface.py</property> </component> - <component name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text6" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>val = 3.14116 * ref.get(r) * ref.get(r)</property> </component> diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html index c2dc3a21c2..4e9efdaa22 100644 --- a/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. --> <DIV id="page"> - <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> + <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> <H2>Test logic components</H2> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite index 3846266b74..2448aca193 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite @@ -17,190 +17,224 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> <service name="bingsearch" promote="bingsearch"/> + <service name="gaddress1" promote="gaddress1"/> <service name="get" promote="get"/> + <service name="ggeopos1" promote="ggeopos1"/> <service name="googlemap" promote="googlemap"/> <service name="googlemap2" promote="googlemap2"/> <service name="googlesearch" promote="googlesearch"/> <service name="weather" promote="weather"/> <service name="weather2" promote="weather2"/> <service name="yahoosearch" promote="yahoosearch"/> - <component t:x="336" t:y="48" name="bingsearch" t:title="bing" t:color="red1"> - <t:implementation.python script="nuvem/bsearch.py"/> + <component x="336" y="48" name="bingsearch" title="bing" color="red1"> + <implementation.python script="nuvem/bsearch.py"/> <service name="bingsearch"/> <reference target="text10" name="query"/> - <reference name="s" t:visible="false"> - <t:binding.http uri="http://www.bing.com/search"/> + <reference name="s" visible="false"> + <binding.http uri="http://www.bing.com/search"/> </reference> </component> - <component t:x="20" t:y="300" name="get" t:title="get" t:color="green1"> + <component x="650" y="20" name="gaddress1" title="address" color="red1"> + <implementation.python script="nuvem/gaddress.py"/> + <service name="gaddress"/> + <reference target="text1" name="address"/> + <reference name="s" visible="false"> + <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/> + </reference> + </component> + <component x="20" y="300" name="get" title="get" color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference target="text3" name="url"/> </component> - <component t:x="347" t:y="106" name="googlemap" t:title="google map" t:color="red1"> - <t:implementation.python script="nuvem/gmap.py"/> + <component x="650" y="80" name="ggeopos1" title="geo position" color="red1"> + <implementation.python script="nuvem/ggeopos.py"/> + <service name="ggeopos"/> + <reference target="number1" name="latitude"/> + <reference target="number4" name="longitude"/> + <reference name="s" visible="false"> + <binding.http uri="http://maps.googleapis.com/maps/api/geocode/json"/> + </reference> + </component> + <component x="347" y="106" name="googlemap" title="google map" color="red1"> + <implementation.python script="nuvem/gmap.py"/> <service name="googlemap"/> <reference target="list2" name="locations"/> - <reference name="s" t:visible="false"> - <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/> + <reference name="s" visible="false"> + <binding.http uri="http://maps.google.com/maps/api/staticmap"/> </reference> </component> - <component t:x="15" t:y="96" name="googlemap2" t:title="google map" t:color="red1"> - <t:implementation.python script="nuvem/gmap.py"/> + <component x="15" y="96" name="googlemap2" title="google map" color="red1"> + <implementation.python script="nuvem/gmap.py"/> <service name="googlemap"/> <reference target="list3" name="locations"/> - <reference name="s" t:visible="false"> - <t:binding.http uri="http://maps.google.com/maps/api/staticmap"/> + <reference name="s" visible="false"> + <binding.http uri="http://maps.google.com/maps/api/staticmap"/> </reference> </component> - <component t:x="18" t:y="0" name="googlesearch" t:title="google" t:color="red1"> - <t:implementation.python script="nuvem/gsearch.py"/> + <component x="18" y="0" name="googlesearch" title="google" color="red1"> + <implementation.python script="nuvem/gsearch.py"/> <service name="googlesearch"/> <reference target="text" name="query"/> - <reference name="s" t:visible="false"> - <t:binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/> + <reference name="s" visible="false"> + <binding.http uri="http://ajax.googleapis.com/ajax/services/search/web"/> </reference> </component> - <component name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="item" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="list" name="value"/> + <property>A</property> + </component> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="pair4" name="value"/> + <property>A</property> + </component> + <component name="item3" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="pair5" name="value"/> + <property>B</property> + </component> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="text4" name="item" t:clonable="true"/> - <reference target="number2" name="item" t:clonable="true"/> - <reference target="number3" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="text4" name="item" clonable="true"/> + <reference target="number2" name="item" clonable="true"/> + <reference target="number3" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list2" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list2" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list3" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item2" name="item" clonable="true"/> + <reference target="item3" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="number" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>94070</property> </component> - <component name="number2" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component x="730" y="80" name="number1" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>37.507156</property> + </component> + <component name="number2" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>37.507156</property> </component> - <component name="number3" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number3" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>-122.260526</property> </component> - <component name="pair4" t:title="pair" t:color="yellow1"> - <t:implementation.python script="nuvem/pair.py"/> + <component x="730" y="120" name="number4" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> + <service name="number"/> + <property>-122.260526</property> + </component> + <component name="pair4" title="pair" color="yellow1"> + <implementation.python script="nuvem/pair.py"/> <service name="pair"/> <reference target="text7" name="name"/> <reference target="text5" name="value"/> </component> - <component name="pair5" t:title="pair" t:color="yellow1"> - <t:implementation.python script="nuvem/pair.py"/> + <component name="pair5" title="pair" color="yellow1"> + <implementation.python script="nuvem/pair.py"/> <service name="pair"/> <reference target="text8" name="name"/> <reference target="text6" name="value"/> </component> - <component name="property" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="list" name="value"/> - <property>A</property> - </component> - <component name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="pair4" name="value"/> - <property>A</property> - </component> - <component name="property3" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="pair5" name="value"/> - <property>B</property> - </component> - <component name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>apache tuscany</property> </component> - <component name="text10" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component x="710" y="20" name="text1" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>San Carlos, CA</property> + </component> + <component name="text10" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>apache tuscany</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>94070</property> </component> - <component name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://maps.google.com/maps/api/staticmap?center=Brooklyn+Bridge,New+York,NY&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 name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>green</property> </component> - <component name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>San Francisco, CA</property> </component> - <component name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text6" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>San Carlos, CA</property> </component> - <component name="text7" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text7" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>yellow</property> </component> - <component name="text8" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text8" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>green</property> </component> - <component name="text9" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text9" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>apache tuscany</property> </component> - <component t:x="18" t:y="49" name="weather" t:title="weather" t:color="red1"> - <t:implementation.python script="nuvem/gweather.py"/> + <component x="18" y="49" name="weather" title="weather" color="red1"> + <implementation.python script="nuvem/gweather.py"/> <service name="weather"/> <reference target="number" name="zip"/> - <reference name="ws" t:visible="false"> - <t:binding.http uri="http://www.google.com/ig/api"/> + <reference name="ws" visible="false"> + <binding.http uri="http://www.google.com/ig/api"/> </reference> </component> - <component t:x="190" t:y="51" name="weather2" t:title="weather" t:color="red1"> - <t:implementation.python script="nuvem/gweather.py"/> + <component x="190" y="51" name="weather2" title="weather" color="red1"> + <implementation.python script="nuvem/gweather.py"/> <service name="weather"/> <reference target="text2" name="zip"/> - <reference name="ws" t:visible="false"> - <t:binding.http uri="http://www.google.com/ig/api"/> + <reference name="ws" visible="false"> + <binding.http uri="http://www.google.com/ig/api"/> </reference> </component> - <component t:x="204" t:y="5" name="yahoosearch" t:title="yahoo" t:color="red1"> - <t:implementation.python script="nuvem/ysearch.py"/> + <component x="204" y="5" name="yahoosearch" title="yahoo" color="red1"> + <implementation.python script="nuvem/ysearch.py"/> <service name="yahoosearch"/> <reference target="text9" name="query"/> - <reference name="s" t:visible="false"> - <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/> + <reference name="s" visible="false"> + <binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/> </reference> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html index 3760a04794..ca5462f07a 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. --> <DIV id="page"> - <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> + <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> <H1>Test search components</H1> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite index ad7c983098..b331349b20 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite @@ -17,74 +17,74 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> <service name="sendgtalk" promote="sendgtalk"/> <service name="start" promote="start"/> - <component name="fbprofile" t:title="facebook profile" t:color="blue1"> - <t:implementation.python script="nuvem/fbprofile.py"/> + <component name="fbprofile" title="facebook profile" color="blue1"> + <implementation.python script="nuvem/fbprofile.py"/> <service name="fbprofile"/> <reference target="text" name="id"/> - <reference name="fb" t:visible="false"> - <t:binding.http uri="https://graph.facebook.com"/> + <reference name="fb" visible="false"> + <binding.http uri="https://graph.facebook.com"/> </reference> </component> - <component name="format" t:title="format" t:color="magenta1"> - <t:implementation.python script="nuvem/format_.py"/> + <component name="format" title="format" color="magenta1"> + <implementation.python script="nuvem/format_.py"/> <service name="format"/> <reference target="text7" name="pattern"/> <reference target="list" name="values"/> </component> - <component name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="now" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="now" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list3" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference target="property" name="item" t:clonable="true"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component name="now" t:title="now" t:color="orange1"> - <t:implementation.python script="nuvem/now.py"/> + <reference target="item2" name="item" clonable="true"/> + <reference target="item" name="item" clonable="true"/> + <reference target="item3" name="item" clonable="true"/> + <reference target="item4" name="item" clonable="true"/> + <reference target="item5" name="item" clonable="true"/> + <reference name="item" clonable="true"/> + </component> + <component name="now" title="now" color="orange1"> + <implementation.python script="nuvem/now.py"/> <service name="now"/> </component> - <component name="property" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="twprofile" name="value"/> <property>twitprofile</property> </component> - <component name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="fbprofile" name="value"/> <property>name</property> </component> - <component name="property3" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item3" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="twtimeline" name="value"/> <property>twittimeline</property> </component> - <component name="property4" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item4" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="twfriends" name="value"/> <property>twitfriends</property> </component> - <component name="property5" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item5" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="twfollowers" name="value"/> <property>twitfollowers</property> </component> - <component t:x="34" t:y="286" name="sendgtalk" t:title="gtalk" t:color="blue1"> + <component x="34" y="286" name="sendgtalk" title="gtalk" color="blue1"> <implementation.cpp path="lib/chat" library="libchat-sender2"/> <service name="sendgtalk"/> <reference target="text8" name="jid"/> @@ -92,88 +92,88 @@ <reference target="text6" name="to"/> <reference target="format" name="msg"/> </component> - <component t:x="33" t:y="12" name="start" t:title="start" t:color="green1"> - <t:implementation.python script="nuvem/start.py"/> - <service name="start" t:visible="false"> - <t:binding.http uri="start"/> + <component x="33" y="12" name="start" title="start" color="green1"> + <implementation.python script="nuvem/start.py"/> + <service name="start" visible="false"> + <binding.http uri="start"/> </service> <reference target="list3" name="content"/> </component> - <component name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>100001053301307</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>jsdelfino</property> </component> - <component name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>jsdelfino</property> </component> - <component name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>jsdelfino</property> </component> - <component name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>jsdelfino</property> </component> - <component name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text6" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>xmppsca.2@gmail.com</property> </component> - <component name="text7" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text7" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>Hello, the time is {0}</property> </component> - <component name="text8" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text8" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>xmppsca.1@gmail.com</property> </component> - <component name="text9" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text9" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>xmpp4sca</property> </component> - <component name="twfollowers" t:title="twitter followers" t:color="blue1"> - <t:implementation.python script="nuvem/twfollowers.py"/> + <component name="twfollowers" title="twitter followers" color="blue1"> + <implementation.python script="nuvem/twfollowers.py"/> <service name="twfollowers"/> <reference target="text5" name="id"/> - <reference name="tw" t:visible="false"> - <t:binding.http uri="http://api.twitter.com/1/statuses/followers.json"/> + <reference name="tw" visible="false"> + <binding.http uri="http://api.twitter.com/1/statuses/followers.json"/> </reference> </component> - <component name="twfriends" t:title="twitter friends" t:color="blue1"> - <t:implementation.python script="nuvem/twfriends.py"/> + <component name="twfriends" title="twitter friends" color="blue1"> + <implementation.python script="nuvem/twfriends.py"/> <service name="twfriends"/> <reference target="text4" name="id"/> - <reference name="tw" t:visible="false"> - <t:binding.http uri="http://api.twitter.com/1/statuses/friends.json"/> + <reference name="tw" visible="false"> + <binding.http uri="http://api.twitter.com/1/statuses/friends.json"/> </reference> </component> - <component name="twprofile" t:title="twitter profile" t:color="blue1"> - <t:implementation.python script="nuvem/twprofile.py"/> + <component name="twprofile" title="twitter profile" color="blue1"> + <implementation.python script="nuvem/twprofile.py"/> <service name="twprofile"/> <reference target="text3" name="id"/> - <reference name="tw" t:visible="false"> - <t:binding.http uri="http://api.twitter.com/1/users/show.json"/> + <reference name="tw" visible="false"> + <binding.http uri="http://api.twitter.com/1/users/show.json"/> </reference> </component> - <component name="twtimeline" t:title="twitter timeline" t:color="blue1"> - <t:implementation.python script="nuvem/twtimeline.py"/> + <component name="twtimeline" title="twitter timeline" color="blue1"> + <implementation.python script="nuvem/twtimeline.py"/> <service name="twtimeline"/> <reference target="text2" name="id"/> - <reference name="tw" t:visible="false"> - <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/> + <reference name="tw" visible="false"> + <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json"/> </reference> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html index 9630d36d0f..5fe616ca16 100644 --- a/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. --> <DIV id="page"> - <SPAN id="h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> + <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 2px; "> <H1>Test social components</H1> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite index 22436f5019..54771ecec8 100644 --- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> <service name="contains" promote="contains"/> <service name="format" promote="format"/> <service name="format2" promote="format2"/> @@ -27,189 +27,189 @@ <service name="replace" promote="replace"/> <service name="split" promote="split"/> <service name="uppercase" promote="uppercase"/> - <component t:x="19" t:y="7" name="contains" t:title="contains" t:color="magenta1"> - <t:implementation.python script="nuvem/contains.py"/> + <component x="19" y="7" name="contains" title="contains" color="magenta1"> + <implementation.python script="nuvem/contains.py"/> <service name="contains"/> <reference target="text10" name="search"/> <reference target="text9" name="string"/> </component> - <component t:x="176" t:y="115" name="format" t:title="format" t:color="magenta1"> - <t:implementation.python script="nuvem/format_.py"/> + <component x="176" y="115" name="format" title="format" color="magenta1"> + <implementation.python script="nuvem/format_.py"/> <service name="format"/> <reference target="text13" name="pattern"/> <reference target="list" name="values"/> </component> - <component t:x="369" t:y="141" name="format2" t:title="format" t:color="magenta1"> - <t:implementation.python script="nuvem/format_.py"/> + <component x="369" y="141" name="format2" title="format" color="magenta1"> + <implementation.python script="nuvem/format_.py"/> <service name="format"/> <reference target="text14" name="pattern"/> <reference target="list3" name="values"/> </component> - <component t:x="361" t:y="8" name="join" t:title="join" t:color="magenta1"> - <t:implementation.python script="nuvem/join.py"/> + <component x="361" y="8" name="join" title="join" color="magenta1"> + <implementation.python script="nuvem/join.py"/> <service name="join"/> <reference target="text6" name="separator"/> <reference target="list2" name="list"/> </component> - <component name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="text15" name="item" t:clonable="true"/> - <reference target="text16" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="text15" name="item" clonable="true"/> + <reference target="text16" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list2" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list2" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="text7" name="item" t:clonable="true"/> - <reference target="text8" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="text7" name="item" clonable="true"/> + <reference target="text8" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list3" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property" name="item" t:clonable="true"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item" name="item" clonable="true"/> + <reference target="item2" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component t:x="20" t:y="226" name="lowercase" t:title="lower" t:color="magenta1"> - <t:implementation.python script="nuvem/lowercase.py"/> + <component x="20" y="226" name="lowercase" title="lower" color="magenta1"> + <implementation.python script="nuvem/lowercase.py"/> <service name="lowercase"/> <reference target="text2" name="string"/> </component> - <component t:x="142" t:y="252" name="parse" t:title="parse" t:color="magenta1"> - <t:implementation.python script="nuvem/parse.py"/> + <component x="142" y="252" name="parse" title="parse" color="magenta1"> + <implementation.python script="nuvem/parse.py"/> <service name="parse"/> <reference target="text19" name="regexp"/> <reference target="text20" name="string"/> </component> - <component name="property" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text17" name="value"/> <property>a</property> </component> - <component name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text18" name="value"/> <property>b</property> </component> - <component t:x="175" t:y="6" name="replace" t:title="replace" t:color="magenta1"> - <t:implementation.python script="nuvem/replace.py"/> + <component x="175" y="6" name="replace" title="replace" color="magenta1"> + <implementation.python script="nuvem/replace.py"/> <service name="replace"/> <reference target="text4" name="from"/> <reference target="text5" name="to"/> <reference target="text3" name="string"/> </component> - <component t:x="23" t:y="89" name="split" t:title="split" t:color="magenta1"> - <t:implementation.python script="nuvem/split.py"/> + <component x="23" y="89" name="split" title="split" color="magenta1"> + <implementation.python script="nuvem/split.py"/> <service name="split"/> <reference target="text11" name="separator"/> <reference target="text12" name="string"/> </component> - <component name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>abc</property> </component> - <component name="text10" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text10" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>cd</property> </component> - <component name="text11" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text11" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>x</property> </component> - <component name="text12" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text12" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>abcxdefxghi</property> </component> - <component name="text13" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text13" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>The {0} brown {1}</property> </component> - <component name="text14" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text14" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>The {a} brown {b}</property> </component> - <component name="text15" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text15" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>quick</property> </component> - <component name="text16" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text16" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>fox</property> </component> - <component name="text17" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text17" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>quick</property> </component> - <component name="text18" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text18" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>fox</property> </component> - <component name="text19" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text19" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>city (.*) state (.*)</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>ABC</property> </component> - <component name="text20" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text20" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>city San Francisco state CA</property> </component> - <component name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>abcxdefxghi</property> </component> - <component name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>x</property> </component> - <component name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>y</property> </component> - <component name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text6" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>x</property> </component> - <component name="text7" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text7" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>abc</property> </component> - <component name="text8" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text8" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>def</property> </component> - <component name="text9" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text9" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>abcdef</property> </component> - <component t:x="20" t:y="172" name="uppercase" t:title="upper" t:color="magenta1"> - <t:implementation.python script="nuvem/uppercase.py"/> + <component x="20" y="172" name="uppercase" title="upper" color="magenta1"> + <implementation.python script="nuvem/uppercase.py"/> <service name="uppercase"/> <reference target="text" name="string"/> </component> diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html index 99f719ef40..1c7612d0e0 100644 --- a/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. --> <DIV id="page"> - <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> + <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> <H2>Test text processing components</H2> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite index 2bb49a9e81..68f9e36675 100644 --- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite @@ -17,105 +17,129 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> <service name="email" promote="email"/> <service name="host" promote="host"/> + <service name="keychain1" promote="keychain1"/> + <service name="keychain2" promote="keychain2"/> <service name="params" promote="params"/> <service name="path" promote="path"/> <service name="realm" promote="realm"/> <service name="url" promote="url"/> <service name="user" promote="user"/> - <component t:x="17" t:y="223" name="email" t:title="email" t:color="green1"> - <t:implementation.python script="nuvem/email.py"/> + <component x="17" y="223" name="email" title="email" color="green1"> + <implementation.python script="nuvem/email.py"/> <service name="email"/> <property name="email"/> </component> - <component t:x="14" t:y="1" name="host" t:title="host" t:color="green1"> - <t:implementation.python script="nuvem/host.py"/> + <component x="14" y="1" name="host" title="host" color="green1"> + <implementation.python script="nuvem/host.py"/> <service name="host"/> <property name="host"/> </component> - <component name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="item" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="text4" name="value"/> + <property>parmx</property> + </component> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="text5" name="value"/> + <property>parmy</property> + </component> + <component name="item3" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="number" name="value"/> + <property>parmn</property> + </component> + <component x="330" y="60" name="keychain1" title="keychain" color="green1"> + <implementation.python script="nuvem/keychain.py"/> + <service name="keychain"/> + <reference target="text1" name="name"/> + <reference name="account" target="Accounts" visible="false"/> + </component> + <component x="330" y="10" name="keychain2" title="keychain" color="green1"> + <implementation.python script="nuvem/keychain.py"/> + <service name="keychain"/> + <reference target="name1" name="name"/> + <reference name="account" target="Accounts" visible="false"/> + </component> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="text2" name="item" t:clonable="true"/> - <reference target="text3" name="item" t:clonable="true"/> - <reference target="property" name="item" t:clonable="true"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component name="number" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <reference target="text2" name="item" clonable="true"/> + <reference target="text3" name="item" clonable="true"/> + <reference target="item" name="item" clonable="true"/> + <reference target="item2" name="item" clonable="true"/> + <reference target="item3" name="item" clonable="true"/> + <reference name="item" clonable="true"/> + </component> + <component x="400" y="10" name="name1" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> + <service name="name"/> + <property>key2</property> + </component> + <component name="number" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>123</property> </component> - <component t:x="16" t:y="91" name="params" t:title="?params" t:color="green1"> - <t:implementation.python script="nuvem/params.py"/> + <component x="16" y="91" name="params" title="?params" color="green1"> + <implementation.python script="nuvem/params.py"/> <service name="params"/> <property name="params"/> </component> - <component t:x="17" t:y="48" name="path" t:title="path" t:color="green1"> - <t:implementation.python script="nuvem/path.py"/> + <component x="17" y="48" name="path" title="path" color="green1"> + <implementation.python script="nuvem/path.py"/> <service name="path"/> <property name="path"/> </component> - <component name="property" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="text4" name="value"/> - <property>parmx</property> - </component> - <component name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="text5" name="value"/> - <property>parmy</property> - </component> - <component name="property3" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="number" name="value"/> - <property>parmn</property> - </component> - <component t:x="14" t:y="177" name="realm" t:title="realm" t:color="green1"> - <t:implementation.python script="nuvem/realm.py"/> + <component x="14" y="177" name="realm" title="realm" color="green1"> + <implementation.python script="nuvem/realm.py"/> <service name="realm"/> <property name="realm"/> </component> - <component name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://sca-store.com/</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component x="400" y="10" name="text1" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>key2</property> + </component> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>test</property> </component> - <component name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>path</property> </component> - <component name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>xx</property> </component> - <component name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>yy</property> </component> - <component t:x="117" t:y="14" name="url" t:title="url" t:color="green1"> - <t:implementation.python script="nuvem/url.py"/> + <component x="120" y="10" name="url" title="url" color="green1"> + <implementation.python script="nuvem/url.py"/> <service name="url"/> <reference target="text" name="address"/> <reference target="list" name="args"/> </component> - <component t:x="16" t:y="134" name="user" t:title="user" t:color="green1"> - <t:implementation.python script="nuvem/user.py"/> + <component x="16" y="134" name="user" title="user" color="green1"> + <implementation.python script="nuvem/user.py"/> <service name="user"/> <property name="user"/> </component> diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html index 9641f58ba5..8c47186044 100644 --- a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html @@ -18,7 +18,7 @@ * under the License. --> <DIV id="page"> - <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> + <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> <H2>Test url components</H2> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite index 6793aceef1..172fbb90d9 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite @@ -17,339 +17,353 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> <service name="empty" promote="empty"/> <service name="false" promote="false"/> <service name="first" promote="first"/> <service name="itemnb" promote="itemnb"/> <service name="list8" promote="list8"/> <service name="list9" promote="list9"/> - <service name="lookup" promote="lookup"/> <service name="name" promote="name"/> <service name="nothing" promote="nothing"/> <service name="reduce2" promote="reduce2"/> <service name="rest" promote="rest"/> - <service name="search" promote="search"/> + <service name="second" promote="second"/> <service name="shuffle" promote="shuffle"/> <service name="start" promote="start"/> <service name="true" promote="true"/> - <component name="add" t:title="+" t:color="magenta1"> - <t:implementation.python script="nuvem/add.py"/> + <service name="values" promote="values"/> + <service name="values2" promote="values2"/> + <component name="add" title="+" color="magenta1"> + <implementation.python script="nuvem/add.py"/> <service name="add"> <documentation>+</documentation> </service> <reference target="valueof2" name="value1"/> <reference target="valueof3" name="value2"/> </component> - <component t:x="17" t:y="269" name="empty" t:title="empty" t:color="yellow1"> - <t:implementation.python script="nuvem/empty.py"/> + <component x="17" y="269" name="empty" title="empty" color="yellow1"> + <implementation.python script="nuvem/empty.py"/> <service name="empty"/> </component> - <component t:x="21" t:y="170" name="false" t:title="false" t:color="orange1"> - <t:implementation.python script="nuvem/false_.py"/> + <component x="21" y="170" name="false" title="false" color="orange1"> + <implementation.python script="nuvem/false_.py"/> <service name="false"/> </component> - <component t:x="121" t:y="26" name="first" t:title="first" t:color="yellow1"> - <t:implementation.python script="nuvem/first.py"/> + <component x="121" y="26" name="first" title="first" color="yellow1"> + <implementation.python script="nuvem/first.py"/> <service name="first"/> <reference target="list7" name="list"/> </component> - <component name="foreach" t:title="foreach" t:color="yellow1"> - <t:implementation.python script="nuvem/map_.py"/> + <component name="foreach" title="foreach" color="yellow1"> + <implementation.python script="nuvem/map_.py"/> <service name="foreach"/> <reference target="name2" name="item"/> <reference target="multiply" name="transform"/> <reference target="reverse" name="list"/> </component> - <component t:x="123" t:y="147" name="itemnb" t:title="item #" t:color="yellow1"> - <t:implementation.python script="nuvem/itemnb.py"/> + <component x="123" y="147" name="itemnb" title="item #" color="yellow1"> + <implementation.python script="nuvem/itemnb.py"/> <service name="itemnb"/> <reference target="number8" name="index"/> <reference target="foreach" name="list"/> </component> - <component name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="number" name="item" t:clonable="true"/> - <reference target="number7" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="number" name="item" clonable="true"/> + <reference target="number7" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list10" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list10" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property13" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item13" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list2" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list2" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property" name="item" t:clonable="true"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item" name="item" clonable="true"/> + <reference target="item2" name="item" clonable="true"/> + <reference target="item14" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list3" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property10" name="item" t:clonable="true"/> - <reference target="property9" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item10" name="item" clonable="true"/> + <reference target="item9" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list4" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list4" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property7" name="item" t:clonable="true"/> - <reference target="property6" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item7" name="item" clonable="true"/> + <reference target="item6" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list5" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list5" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property8" name="item" t:clonable="true"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item8" name="item" clonable="true"/> + <reference target="item5" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list6" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list6" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item3" name="item" clonable="true"/> + <reference target="item4" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list7" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list7" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="number2" name="item" t:clonable="true"/> - <reference target="number3" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="number2" name="item" clonable="true"/> + <reference target="number3" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component t:x="430" t:y="269" name="list8" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component x="430" y="269" name="list8" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property11" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item11" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component t:x="407" t:y="354" name="list9" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component x="407" y="354" name="list9" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property12" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item12" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component t:x="32" t:y="375" name="lookup" t:title="lookup" t:color="yellow1"> - <t:implementation.python script="nuvem/lookup.py"/> + <component name="lookup" title="lookup" color="yellow1"> + <implementation.python script="nuvem/lookup.py"/> <service name="lookup"/> <reference target="name3" name="name"/> <reference target="list2" name="list"/> </component> - <component name="multiply" t:title="*" t:color="magenta1"> - <t:implementation.python script="nuvem/multiply.py"/> + <component name="multiply" title="*" color="magenta1"> + <implementation.python script="nuvem/multiply.py"/> <service name="multiply"> <documentation>*</documentation> </service> <reference target="valueof" name="value1"/> <reference target="number6" name="value2"/> </component> - <component t:x="21" t:y="70" name="name" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> + <component x="21" y="70" name="name" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> <service name="name"/> <property>abc</property> </component> - <component name="name2" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> + <component name="name2" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> <service name="name"/> <property>nb</property> </component> - <component name="name3" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> + <component name="name3" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> <service name="name"/> <property>d</property> </component> - <component name="name6" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> + <component name="name6" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> <service name="name"/> <property>sum</property> </component> - <component name="name7" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> + <component name="name7" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> <service name="name"/> <property>i</property> </component> - <component name="name8" t:title="" t:color="orange1"> - <t:implementation.python script="nuvem/name.py"/> + <component name="name8" title="" color="orange1"> + <implementation.python script="nuvem/name.py"/> <service name="name"/> <property>a.b</property> </component> - <component t:x="19" t:y="219" name="nothing" t:title="nothing" t:color="orange1"> - <t:implementation.python script="nuvem/nothing.py"/> + <component x="19" y="219" name="nothing" title="nothing" color="orange1"> + <implementation.python script="nuvem/nothing.py"/> <service name="nothing"/> </component> - <component name="number" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>12</property> </component> - <component name="number10" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number10" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>10</property> </component> - <component name="number11" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number11" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>123</property> </component> - <component name="number12" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number12" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>0</property> </component> - <component name="number13" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number13" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>10</property> </component> - <component name="number14" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number14" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>0</property> </component> - <component name="number2" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number2" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>123</property> </component> - <component name="number3" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number3" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>456</property> </component> - <component name="number4" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number4" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>0</property> </component> - <component name="number5" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number5" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>10</property> </component> - <component name="number6" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number6" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>2</property> </component> - <component name="number7" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number7" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>34</property> </component> - <component name="number8" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number8" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>3</property> </component> - <component name="number9" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number9" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>0</property> </component> - <component name="property" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text3" name="value"/> <property>a</property> </component> - <component name="property10" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item10" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="list6" name="value"/> <property>a</property> </component> - <component name="property11" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item11" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text7" name="value"/> <property>entry</property> </component> - <component name="property12" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item12" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="list10" name="value"/> <property>entry</property> </component> - <component name="property13" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item13" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text9" name="value"/> <property>test</property> </component> - <component name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item14" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="text10" name="value"/> + <property>d</property> + </component> + <component name="item15" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="text11" name="value"/> + <property>x</property> + </component> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text4" name="value"/> <property>d</property> </component> - <component name="property3" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item3" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text5" name="value"/> <property>ccc</property> </component> - <component name="property4" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item4" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text2" name="value"/> <property>b</property> </component> - <component name="property5" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item5" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text8" name="value"/> <property>c</property> </component> - <component name="property6" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item6" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="number11" name="value"/> <property>c</property> </component> - <component name="property7" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item7" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text6" name="value"/> <property>b</property> </component> - <component name="property8" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item8" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="list4" name="value"/> <property>a</property> </component> - <component name="property9" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item9" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="list5" name="value"/> <property>x</property> </component> - <component name="range" t:title="range" t:color="yellow1"> - <t:implementation.python script="nuvem/range_.py"/> + <component name="range" title="range" color="yellow1"> + <implementation.python script="nuvem/range_.py"/> <service name="range"/> <reference target="number4" name="first"/> <reference target="number5" name="last"/> </component> - <component name="range2" t:title="range" t:color="yellow1"> - <t:implementation.python script="nuvem/range_.py"/> + <component name="range2" title="range" color="yellow1"> + <implementation.python script="nuvem/range_.py"/> <service name="range"/> <reference target="number9" name="first"/> <reference target="number10" name="last"/> </component> - <component name="range3" t:title="range" t:color="yellow1"> - <t:implementation.python script="nuvem/range_.py"/> + <component name="range3" title="range" color="yellow1"> + <implementation.python script="nuvem/range_.py"/> <service name="range"/> <reference target="number12" name="first"/> <reference target="number13" name="last"/> </component> - <component t:x="437" t:y="24" name="reduce2" t:title="reduce" t:color="yellow1"> - <t:implementation.python script="nuvem/reduce_.py"/> + <component x="437" y="24" name="reduce2" title="reduce" color="yellow1"> + <implementation.python script="nuvem/reduce_.py"/> <service name="reduce"/> <reference target="name6" name="item"/> <reference target="name7" name="accum"/> @@ -357,96 +371,121 @@ <reference target="number14" name="init"/> <reference target="range2" name="list"/> </component> - <component t:x="290" t:y="18" name="rest" t:title="rest" t:color="yellow1"> - <t:implementation.python script="nuvem/rest.py"/> + <component x="290" y="18" name="rest" title="rest" color="yellow1"> + <implementation.python script="nuvem/rest.py"/> <service name="rest"/> <reference target="list" name="list"/> </component> - <component name="reverse" t:title="reverse" t:color="yellow1"> - <t:implementation.python script="nuvem/reverse.py"/> + <component name="reverse" title="reverse" color="yellow1"> + <implementation.python script="nuvem/reverse.py"/> <service name="reverse"/> <reference target="range" name="list"/> </component> - <component t:x="628" t:y="20" name="search" t:title="search" t:color="yellow1"> - <t:implementation.python script="nuvem/search.py"/> - <service name="search"/> + <component name="select" title="select" color="yellow1"> + <implementation.python script="nuvem/select.py"/> + <service name="select"/> <reference target="name8" name="path"/> <reference target="list3" name="list"/> </component> - <component t:x="223" t:y="368" name="shuffle" t:title="shuffle" t:color="yellow1"> - <t:implementation.python script="nuvem/shuffle_.py"/> + <component x="1026" y="233" name="second" title="second" color="yellow1"> + <implementation.python script="nuvem/second.py"/> + <service name="second"/> + <reference target="item15" name="list"/> + </component> + <component x="223" y="368" name="shuffle" title="shuffle" color="yellow1"> + <implementation.python script="nuvem/shuffle_.py"/> <service name="shuffle"/> <reference target="range3" name="list"/> </component> - <component t:x="15" t:y="11" name="start" t:title="start" t:color="green1"> - <t:implementation.python script="nuvem/start.py"/> - <service name="start" t:visible="false"> - <t:binding.http uri="start"/> + <component x="15" y="11" name="start" title="start" color="green1"> + <implementation.python script="nuvem/start.py"/> + <service name="start" visible="false"> + <binding.http uri="start"/> </service> <reference target="text" name="content"/> </component> - <component name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>xyz</property> + </component> + <component name="text10" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>xyz</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text11" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> + <service name="text"/> + <property>y</property> + </component> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>bbb</property> </component> - <component name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>abc</property> </component> - <component name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>def</property> </component> - <component name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>ccc</property> </component> - <component name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text6" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>BBB</property> </component> - <component name="text7" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text7" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>hello</property> </component> - <component name="text8" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text8" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>CCC</property> </component> - <component name="text9" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text9" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>abc</property> </component> - <component t:x="23" t:y="120" name="true" t:title="true" t:color="orange1"> - <t:implementation.python script="nuvem/true_.py"/> + <component x="23" y="120" name="true" title="true" color="orange1"> + <implementation.python script="nuvem/true_.py"/> <service name="true"/> </component> - <component name="valueof" t:title="valueof" t:color="orange1"> - <t:implementation.python script="nuvem/valueof.py"/> + <component name="valueof" title="valueof" color="orange1"> + <implementation.python script="nuvem/valueof.py"/> <service name="valueof"/> <property>nb</property> </component> - <component name="valueof2" t:title="valueof" t:color="orange1"> - <t:implementation.python script="nuvem/valueof.py"/> + <component name="valueof2" title="valueof" color="orange1"> + <implementation.python script="nuvem/valueof.py"/> <service name="valueof"/> <property>sum</property> </component> - <component name="valueof3" t:title="valueof" t:color="orange1"> - <t:implementation.python script="nuvem/valueof.py"/> + <component name="valueof3" title="valueof" color="orange1"> + <implementation.python script="nuvem/valueof.py"/> <service name="valueof"/> <property>i</property> </component> + <component x="1020" y="31" name="values" title="values" color="yellow1"> + <implementation.python script="nuvem/values.py"/> + <service name="values"/> + <reference target="lookup" name="list"/> + </component> + <component x="639" y="12" name="values2" title="values" color="yellow1"> + <implementation.python script="nuvem/values.py"/> + <service name="values"/> + <reference target="select" name="list"/> + </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html index 97889b7a9d..79bb081a97 100644 --- a/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/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="h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> + <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> <H2>Test values and lists</H2> </SPAN> <SPAN id="value" class="text" style="position: absolute; top: 36px; left: 29px; "> - <SPAN>text</SPAN> + <SPAN>=value</SPAN> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite index 6b08e18f3b..690f1761e3 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite @@ -17,131 +17,131 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> <service name="start" promote="start"/> - <component name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property10" name="item" t:clonable="true"/> - <reference target="property9" name="item" t:clonable="true"/> - <reference target="property8" name="item" t:clonable="true"/> - <reference target="property7" name="item" t:clonable="true"/> - <reference target="property6" name="item" t:clonable="true"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component name="property" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <reference target="item10" name="item" clonable="true"/> + <reference target="item9" name="item" clonable="true"/> + <reference target="item8" name="item" clonable="true"/> + <reference target="item7" name="item" clonable="true"/> + <reference target="item6" name="item" clonable="true"/> + <reference target="item5" name="item" clonable="true"/> + <reference target="item4" name="item" clonable="true"/> + <reference target="item3" name="item" clonable="true"/> + <reference target="item2" name="item" clonable="true"/> + <reference name="item" clonable="true"/> + </component> + <component name="item" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text9" name="value"/> <property>testpath2</property> </component> - <component name="property10" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item10" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text" name="value"/> <property>testh1</property> </component> - <component name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> - <reference target="property" name="value"/> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> + <reference target="item" name="value"/> <property>testpath1</property> </component> - <component name="property3" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item3" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text6" name="value"/> <property>testimg</property> </component> - <component name="property4" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item4" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text8" name="value"/> <property>testtext</property> </component> - <component name="property5" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item5" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text4" name="value"/> <property>testlink</property> </component> - <component name="property6" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item6" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text5" name="value"/> <property>testcheckbox</property> </component> - <component name="property7" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item7" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text3" name="value"/> <property>testentry</property> </component> - <component name="property8" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item8" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text2" name="value"/> <property>testbutton</property> </component> - <component name="property9" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item9" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text7" name="value"/> <property>testsection</property> </component> - <component t:x="17" t:y="3" name="start" t:title="start" t:color="green1"> - <t:implementation.python script="nuvem/start.py"/> - <service name="start" t:visible="false"> - <t:binding.http uri="start"/> + <component x="17" y="3" name="start" title="start" color="green1"> + <implementation.python script="nuvem/start.py"/> + <service name="start" visible="false"> + <binding.http uri="start"/> </service> <reference target="list" name="content"/> </component> - <component name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>test header 1</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>test button</property> </component> - <component name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>test entry field</property> </component> - <component name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://tuscany.apache.org</property> </component> - <component name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>test checkbox</property> </component> - <component name="text6" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text6" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://tuscany.apache.org/images/TuscanyLogo.jpg</property> </component> - <component name="text7" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text7" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>test section</property> </component> - <component name="text8" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text8" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>test text</property> </component> - <component name="text9" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text9" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>test path</property> </component> diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html index ff255ee45d..0b5022513d 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html @@ -19,43 +19,43 @@ --> <DIV id="page"> <SPAN id="testh1" class="h1" style="position: absolute; top: 9px; left: 11px; "> - <H1>Header1</H1> + <H1>=testh1</H1> </SPAN> <SPAN id="testsection" class="section" style="position: absolute; top: 45px; width: 100%; left: 11px; "> - <SPAN>section</SPAN> + <SPAN>=testsection</SPAN> </SPAN> <SPAN id="testimg" class="img" style="position: absolute; top: 90px; left: 263px; "> <IMG src="/public/img.png"/> </SPAN> <SPAN id="testbutton" class="button" style="position: absolute; top: 99px; left: 11px; "> - <INPUT type="button" value="button" class="graybutton"/> + <INPUT type="button" value="=testbutton" class="graybutton"/> </SPAN> <SPAN id="testentry" class="entry" style="position: absolute; top: 144px; left: 11px; "> - <INPUT type="text" value="field" size="20" autocapitalize="off"/> + <INPUT type="text" value="=testentry" size="20" autocapitalize="off"/> </SPAN> <SPAN id="testcheckbox" class="checkbox" style="position: absolute; top: 180px; left: 11px; "> - <INPUT type="checkbox" value="checkbox"/> - <SPAN>checkbox</SPAN> + <INPUT type="checkbox" value="=testcheckbox"/> + <SPAN>=testcheckbox</SPAN> </SPAN> <SPAN id="testlink2" class="link" style="position: absolute; top: 189px; left: 263px; "> - <A href="http://www.apache.org/"> - <SPAN>http://www.apache.org/</SPAN> + <A href="=testlink2"> + <SPAN>=testlink2</SPAN> </A> </SPAN> <SPAN id="testlink" class="link" style="position: absolute; top: 216px; left: 11px; "> - <A href="link"> - <SPAN>link</SPAN> + <A href="=testlink"> + <SPAN>=testlink</SPAN> </A> </SPAN> <SPAN id="testlink3" class="link" style="position: absolute; top: 225px; left: 263px; "> - <A href="http://www.apache.org"> - <SPAN> Apache</SPAN> + <A href="=testlink3"> + <SPAN>=testlink3</SPAN> </A> </SPAN> <SPAN id="testtext" class="text" style="position: absolute; top: 243px; left: 11px; "> - <SPAN>text</SPAN> + <SPAN>=testtext</SPAN> </SPAN> <SPAN id="testpath1.testpath2" class="text" style="position: absolute; top: 270px; left: 11px; "> - <SPAN>text</SPAN> + <SPAN>=testpath1.testpath2</SPAN> </SPAN> </DIV> diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite index 1a14eec510..84d87bf184 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite @@ -17,113 +17,113 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app"> <service name="start" promote="start"/> - <component name="list" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property4" name="item" t:clonable="true"/> - <reference target="property5" name="item" t:clonable="true"/> - <reference target="property3" name="item" t:clonable="true"/> - <reference target="property2" name="item" t:clonable="true"/> - <reference target="property" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> - </component> - <component name="list3" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <reference target="item4" name="item" clonable="true"/> + <reference target="item5" name="item" clonable="true"/> + <reference target="item3" name="item" clonable="true"/> + <reference target="item2" name="item" clonable="true"/> + <reference target="item" name="item" clonable="true"/> + <reference name="item" clonable="true"/> + </component> + <component name="list3" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="text3" name="item" t:clonable="true"/> - <reference target="text4" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="text3" name="item" clonable="true"/> + <reference target="text4" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="list4" t:title="list" t:color="yellow1"> - <t:implementation.python script="nuvem/list_.py"/> + <component name="list4" title="list" color="yellow1"> + <implementation.python script="nuvem/list_.py"/> <service name="list"/> - <reference target="property6" name="item" t:clonable="true"/> - <reference target="property7" name="item" t:clonable="true"/> - <reference name="item" t:clonable="true"/> + <reference target="item6" name="item" clonable="true"/> + <reference target="item7" name="item" clonable="true"/> + <reference name="item" clonable="true"/> </component> - <component name="number3" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number3" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>1</property> </component> - <component name="number4" t:title="#" t:color="orange1"> - <t:implementation.python script="nuvem/number.py"/> + <component name="number4" title="#" color="orange1"> + <implementation.python script="nuvem/number.py"/> <service name="number"/> <property>2</property> </component> - <component name="property" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text5" name="value"/> <property>testframe</property> </component> - <component name="property2" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item2" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="list3" name="value"/> <property>testlink</property> </component> - <component name="property3" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item3" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text2" name="value"/> <property>testhtml</property> </component> - <component name="property4" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item4" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="text" name="value"/> <property>testlist1</property> </component> - <component name="property5" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item5" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="list4" name="value"/> <property>testlist2</property> </component> - <component name="property6" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item6" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="number3" name="value"/> <property>a</property> </component> - <component name="property7" t:title="{propval} :" t:color="orange1"> - <t:implementation.python script="nuvem/assoc.py"/> - <service name="property"/> + <component name="item7" title="{propval} :" color="orange1"> + <implementation.python script="nuvem/item.py"/> + <service name="item"/> <reference target="number4" name="value"/> <property>b</property> </component> - <component t:x="13" t:y="8" name="start" t:title="start" t:color="green1"> - <t:implementation.python script="nuvem/start.py"/> - <service name="start" t:visible="false"> - <t:binding.http uri="start"/> + <component x="13" y="8" name="start" title="start" color="green1"> + <implementation.python script="nuvem/start.py"/> + <service name="start" visible="false"> + <binding.http uri="start"/> </service> <reference target="list" name="content"/> </component> - <component name="text" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>test value</property> </component> - <component name="text2" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text2" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property><b>test bold text</b></property> </component> - <component name="text3" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text3" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://www.apache.org/</property> </component> - <component name="text4" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text4" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>Apache</property> </component> - <component name="text5" t:title=" '{propval}'" t:color="orange1"> - <t:implementation.python script="nuvem/text.py"/> + <component name="text5" title=" '{propval}'" color="orange1"> + <implementation.python script="nuvem/text.py"/> <service name="text"/> <property>http://www.cnn.com</property> </component> diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html index 2bf6593f02..a42c96bdff 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html @@ -18,14 +18,14 @@ * under the License. --> <DIV id="page"> - <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 0px; "> + <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; "> <H2>Test widget components</H2> </SPAN> - <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; left: 20px; "> - <TABLE class="datatable" style="width: 100%; "> + <SPAN id="testlist1" class="table" style="position: absolute; top: 63px; width: 100%; left: 20px; "> + <TABLE class="datatable" style="width: 100%;"> <TBODY> <TR> - <TD>table</TD> + <TD>=testlist1</TD> <TD>...</TD> </TR> <TR> @@ -35,11 +35,11 @@ </TBODY> </TABLE> </SPAN> - <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; left: 20px; "> - <TABLE class="datatable" style="width: 100%; "> + <SPAN id="testlist2" class="table" style="position: absolute; top: 117px; width: 100%; left: 20px; "> + <TABLE class="datatable" style="width: 100%;"> <TBODY> <TR> - <TD>table</TD> + <TD>=testlist2</TD> <TD>...</TD> </TR> <TR> @@ -49,11 +49,11 @@ </TBODY> </TABLE> </SPAN> - <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 20px; "> - <TABLE class="datatable" style="width: 100%; "> + <SPAN id="b" class="table" style="position: absolute; top: 180px; width: 100%; left: 20px; "> + <TABLE class="datatable" style="width: 100%;"> <TBODY> <TR> - <TD>table</TD> + <TD>=b</TD> <TD>...</TD> </TR> <TR> @@ -64,16 +64,16 @@ </TABLE> </SPAN> <SPAN id="testhtml" class="text" style="position: absolute; top: 234px; left: 20px; "> - <SPAN>text</SPAN> + <SPAN>=testhtml</SPAN> </SPAN> <SPAN id="testselect" class="select" style="position: absolute; top: 234px; left: 155px; "> <SELECT> - <OPTION>select</OPTION> + <OPTION>=testselect</OPTION> </SELECT> </SPAN> <SPAN id="testlink" class="link" style="position: absolute; top: 270px; left: 20px; "> - <A href="/"> - <SPAN>link</SPAN> + <A href="=testlink"> + <SPAN>=testlink</SPAN> </A> </SPAN> <SPAN id="testframe" class="iframe" style="position: absolute; top: 306px; left: 20px; "> |