Minor refactoring and cleanup of edit module and its test composites. Add HTML generation and messaging components and a few more tests.

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

1 files changed, 52 insertions, 35 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
index 84d87bf184..45a4bdb153 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
@@ -19,46 +19,18 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
  <service name="start" promote="start"/>
- <component name="list" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <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" clonable="true"/>
-  <reference target="text4" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="list4" title="list" color="yellow1">
-  <implementation.python script="nuvem/list_.py"/>
-  <service name="list"/>
-  <reference target="item6" name="item" clonable="true"/>
-  <reference target="item7" name="item" clonable="true"/>
-  <reference name="item" clonable="true"/>
- </component>
- <component name="number3" title="#" color="orange1">
-  <implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>1</property>
- </component>
- <component name="number4" title="#" color="orange1">
-  <implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>2</property>
- </component>
- <component name="item" title="{propval} :" color="orange1">
+ <component x="100" y="310" 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 x="100" y="290" name="item1" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="text1" name="value"/>
+  <property>testselect</property>
+ </component>
  <component name="item2" title="{propval} :" color="orange1">
   <implementation.python script="nuvem/item.py"/>
   <service name="item"/>
@@ -95,6 +67,41 @@
   <reference target="number4" name="value"/>
   <property>b</property>
  </component>
+ <component name="list" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <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="item1" 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" clonable="true"/>
+  <reference target="text4" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="list4" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="item6" name="item" clonable="true"/>
+  <reference target="item7" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="number3" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>1</property>
+ </component>
+ <component name="number4" title="#" color="orange1">
+  <implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>2</property>
+ </component>
  <component x="13" y="8" name="start" title="start" color="green1">
   <implementation.python script="nuvem/start.py"/>
   <service name="start" visible="false">
@@ -107,6 +114,11 @@
   <service name="text"/>
   <property>test value</property>
  </component>
+ <component x="170" y="280" name="text1" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test select</property>
+ </component>
  <component name="text2" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
@@ -127,4 +139,9 @@
   <service name="text"/>
   <property>http://www.cnn.com</property>
  </component>
+ <component x="760" y="170" name="text9" title=" '{propval}'" color="orange1">
+  <implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>dynamic checkbox</property>
+ </component>
 </composite>