Refactor the sample composites and components and cleanup the component names a bit.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1154446 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 20 insertions, 20 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite
index eb5bbc2439..e367b69a9c 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite
@@ -19,96 +19,96 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component x="260" y="220" name="htattrs1" title="html attrs:" color="magenta1">
+ <component x="260" y="220" name="htattrs1" title="html attrs:" color="cyan1">
   <implementation.python script="nuvem/htattrs.py"/>
   <service name="htattrs"/>
   <reference target="list1" name="value"/>
  </component>
- <component x="190" y="80" name="htbutton1" title="html button" color="magenta1">
+ <component x="190" y="80" name="htbutton1" title="html button" color="cyan1">
   <implementation.python script="nuvem/htbutton.py"/>
   <service name="htbutton"/>
   <reference target="text8" name="value"/>
  </component>
- <component x="210" y="180" name="htcheck1" title="html checkbox" color="magenta1">
+ <component x="210" y="180" name="htcheck1" title="html checkbox" color="cyan1">
   <implementation.python script="nuvem/htcheck.py"/>
   <service name="htcheck"/>
   <reference target="text9" name="value"/>
  </component>
- <component x="180" y="10" name="htimg1" title="html img" color="magenta1">
+ <component x="180" y="10" name="htimg1" title="html img" color="cyan1">
   <implementation.python script="nuvem/htimg.py"/>
   <service name="htimg"/>
   <reference target="text1" name="value"/>
  </component>
- <component x="190" y="230" name="htimg2" title="html img" color="magenta1">
+ <component x="190" y="230" name="htimg2" title="html img" color="cyan1">
   <implementation.python script="nuvem/htimg.py"/>
   <service name="htimg"/>
   <reference target="htattrs1" name="value"/>
  </component>
- <component x="180" y="50" name="htlink1" title="html link" color="magenta1">
+ <component x="180" y="50" name="htlink1" title="html link" color="cyan1">
   <implementation.python script="nuvem/htlink.py"/>
   <service name="htlink"/>
-  <reference target="pair1" name="value"/>
+  <reference target="list21" name="value"/>
  </component>
- <component x="400" y="330" name="htstyle1" title="html style" color="magenta1">
+ <component x="400" y="330" name="htstyle1" title="html style" color="cyan1">
   <implementation.python script="nuvem/htstyle.py"/>
   <service name="htstyle"/>
   <reference target="list2" name="value"/>
  </component>
- <component x="100" y="10" name="item1" title="{propval} :" color="orange1">
+ <component x="100" y="10" name="item1" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htimg1" name="value"/>
   <property>testdynimg</property>
  </component>
- <component x="100" y="170" name="item10" title="{propval} :" color="orange1">
+ <component x="100" y="170" name="item10" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htcheck1" name="value"/>
   <property>testdyncheckbox</property>
  </component>
- <component x="110" y="230" name="item2" title="{propval} :" color="orange1">
+ <component x="110" y="230" name="item2" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htimg2" name="value"/>
   <property>teststyledimg</property>
  </component>
- <component x="400" y="300" name="item3" title="{propval} :" color="orange1">
+ <component x="400" y="300" name="item3" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text3" name="value"/>
   <property>onclick</property>
  </component>
- <component x="510" y="290" name="item4" title="{propval} :" color="orange1">
+ <component x="510" y="290" name="item4" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text4" name="value"/>
   <property>width</property>
  </component>
- <component x="510" y="320" name="item5" title="{propval} :" color="orange1">
+ <component x="510" y="320" name="item5" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text5" name="value"/>
   <property>height</property>
  </component>
- <component x="400" y="220" name="item6" title="{propval} :" color="orange1">
+ <component x="400" y="220" name="item6" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text10" name="value"/>
   <property>id</property>
  </component>
- <component x="400" y="260" name="item7" title="{propval} :" color="orange1">
+ <component x="400" y="260" name="item7" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="text2" name="value"/>
   <property>src</property>
  </component>
- <component x="90" y="50" name="item8" title="{propval} :" color="orange1">
+ <component x="90" y="50" name="item8" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htlink1" name="value"/>
   <property>testdynlink</property>
  </component>
- <component x="90" y="120" name="item9" title="{propval} :" color="orange1">
+ <component x="90" y="120" name="item9" title="{propval}:" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
   <reference target="htbutton1" name="value"/>
@@ -140,9 +140,9 @@
   <reference target="item5" name="item" clonable="true"/>
   <reference name="item" clonable="true"/>
  </component>
- <component x="240" y="50" name="pair1" title="pair" color="yellow1">
+ <component x="240" y="50" name="list21" title="list2" color="yellow1">
   <implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
+  <service name="list2"/>
   <reference target="text6" name="name"/>
   <reference target="text7" name="value"/>
  </component>