Add tests for HTTP components and widgets. Refactor and simplify some of the samples composites and component categories.

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

2 files changed, 248 insertions, 0 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
new file mode 100644
index 0000000000..6ad9b104eb
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testwidgets2" name="testwidgets2">
+ <component t:x="77" t:y="95" name="text" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test value</property>
+ </component>
+ <component t:x="74" t:y="10" name="name" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>testtable1</property>
+ </component>
+ <service name="page" promote="page"/>
+ <component t:x="109" t:y="0" name="page" t:title="when page opens" t:color="green1">
+  <t:implementation.python script="nuvem/page.py"/>
+  <service name="page" t:visible="false">
+   <t:binding.http uri="page"/>
+  </service>
+  <reference target="list" name="content"/>
+ </component>
+ <component t:x="305" t:y="202" name="assoc" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name" name="name"/>
+  <reference target="text" name="value"/>
+ </component>
+ <component t:x="355" t:y="129" name="name2" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>testtable2</property>
+ </component>
+ <component t:x="355" t:y="177" name="list2" t:title="make list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="assoc3" name="item" t:clonable="true"/>
+  <reference target="assoc4" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="435" t:y="165" name="assoc3" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name3" name="name"/>
+  <reference target="number" name="value"/>
+ </component>
+ <component t:x="486" t:y="167" name="name3" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>a</property>
+ </component>
+ <component t:x="493" t:y="201" name="number" t:title="number" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>1</property>
+ </component>
+ <component t:x="435" t:y="256" name="assoc4" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name4" name="name"/>
+  <reference target="number2" name="value"/>
+ </component>
+ <component t:x="488" t:y="288" name="number2" t:title="number" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>2</property>
+ </component>
+ <component t:x="303" t:y="126" name="assoc2" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name2" name="name"/>
+  <reference target="list2" name="value"/>
+ </component>
+ <component t:x="482" t:y="251" name="name4" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>b</property>
+ </component>
+ <component t:x="230" t:y="38" name="list" t:title="make list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="assoc" name="item" t:clonable="true"/>
+  <reference target="assoc2" name="item" t:clonable="true"/>
+  <reference target="assoc5" name="item" t:clonable="true"/>
+  <reference target="assoc6" name="item" t:clonable="true"/>
+  <reference target="assoc7" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="312" t:y="294" name="assoc5" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name5" name="name"/>
+  <reference target="text2" name="value"/>
+ </component>
+ <component t:x="377" t:y="292" name="name5" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>testhtml</property>
+ </component>
+ <component t:x="370" t:y="322" name="text2" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>&lt;b&gt;test bold text&lt;/b&gt;</property>
+ </component>
+ <component t:x="315" t:y="362" name="assoc6" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name6" name="name"/>
+  <reference target="list3" name="value"/>
+ </component>
+ <component t:x="371" t:y="362" name="name6" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>testlink</property>
+ </component>
+ <component t:x="449" t:y="389" name="text3" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.apache.org/</property>
+ </component>
+ <component t:x="369" t:y="387" name="list3" t:title="make list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text3" name="item" t:clonable="true"/>
+  <reference target="text4" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="735" t:y="335" name="text4" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>Apache</property>
+ </component>
+ <component t:x="319" t:y="478" name="assoc7" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name7" name="name"/>
+  <reference target="text5" name="value"/>
+ </component>
+ <component t:x="370" t:y="440" name="name7" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>testframe</property>
+ </component>
+ <component t:x="379" t:y="471" name="text5" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.cnn.com</property>
+ </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
new file mode 100644
index 0000000000..4e246df55e
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.html
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<DIV id="page">
+ <SPAN id="testtable1" class="table" style="position: absolute; top: 19px; left: 121px; ">
+  <TABLE class="datatable">
+   <TBODY>
+    <TR>
+     <TD>name</TD>
+     <TD>value</TD>
+    </TR>
+    <TR>
+     <TD>name</TD>
+     <TD>value</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="testlist" class="list" style="position: absolute; top: 20px; left: 15px; ">
+  <SELECT>
+   <OPTION>list</OPTION>
+  </SELECT>
+ </SPAN>
+ <SPAN id="testtable2" class="table" style="position: absolute; top: 115px; left: 122px; ">
+  <TABLE class="datatable">
+   <TBODY>
+    <TR>
+     <TD>name</TD>
+     <TD>value</TD>
+    </TR>
+    <TR>
+     <TD>name</TD>
+     <TD>value</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="b" class="table" style="position: absolute; top: 180px; left: 124px; ">
+  <TABLE class="datatable">
+   <TBODY>
+    <TR>
+     <TD>name</TD>
+     <TD>value</TD>
+    </TR>
+    <TR>
+     <TD>name</TD>
+     <TD>value</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+ <SPAN id="testhtml" class="text" style="position: absolute; top: 18px; left: 297px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="testlink" class="link" style="position: absolute; top: 90px; left: 302px; ">
+  <A href="/">
+   <SPAN>link</SPAN>
+  </A>
+ </SPAN>
+ <SPAN id="testframe" class="iframe" style="position: absolute; top: 142px; left: 301px; ">
+  <A href="/public/iframe.html">
+   <SPAN class="fakeframe">
+    <SPAN>frame ...</SPAN>
+   </SPAN>
+  </A>
+ </SPAN>
+</DIV>