Add a few sample and test apps. Refactor some of the utility components and adjusted apps to use them.

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

2 files changed, 49 insertions, 18 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
index f8b354f3e1..a5ab623b3c 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
@@ -19,7 +19,7 @@
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testlogic" name="testlogic">
  <service name="if" promote="if"/>
- <component t:x="34" t:y="24" name="if" t:title="if" t:color="magenta1">
+ <component t:x="22" t:y="45" name="if" t:title="if" t:color="magenta1">
   <t:implementation.python script="nuvem/if_.py"/>
   <service name="if"/>
   <reference target="greater" name="condition"/>
@@ -32,92 +32,119 @@
   <reference target="number2" name="value1"/>
   <reference target="number" name="value2"/>
  </component>
- <component t:x="118" t:y="66" name="number" t:title="number" t:color="orange1">
+ <component t:x="118" t:y="66" name="number" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component t:x="78" t:y="118" name="text" t:title="text" t:color="orange1">
+ <component t:x="78" t:y="118" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>greater than 5</property>
  </component>
- <component t:x="76" t:y="162" name="text2" t:title="text" t:color="orange1">
+ <component t:x="76" t:y="162" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>not greater than 5</property>
  </component>
- <component t:x="88" t:y="25" name="number2" t:title="number" t:color="orange1">
+ <component t:x="88" t:y="25" name="number2" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>3</property>
  </component>
  <service name="eval" promote="eval"/>
- <component t:x="287" t:y="37" name="eval" t:title="py expr" t:color="magenta1">
+ <component t:x="235" t:y="46" name="eval" t:title="expr" t:color="magenta1">
   <t:implementation.python script="nuvem/eval_.py"/>
   <service name="eval"/>
   <reference target="text3" name="py"/>
   <reference name="ref"/>
  </component>
  <service name="eval2" promote="eval2"/>
- <component t:x="287" t:y="130" name="eval2" t:title="py expr" t:color="magenta1">
+ <component t:x="454" t:y="46" name="eval2" t:title="expr" t:color="magenta1">
   <t:implementation.python script="nuvem/eval_.py"/>
   <service name="eval"/>
   <reference target="text4" name="py"/>
   <reference target="number3" name="ref"/>
  </component>
- <component t:x="350" t:y="160" name="number3" t:title="number" t:color="orange1">
+ <component t:x="350" t:y="160" name="number3" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
  <service name="exec" promote="exec"/>
- <component t:x="289" t:y="365" name="exec" t:title="py script" t:color="magenta1">
+ <component t:x="234" t:y="233" name="exec" t:title="script" t:color="magenta1">
   <t:implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference target="get" name="py"/>
   <reference target="number4" name="ref"/>
  </component>
- <component t:x="357" t:y="289" name="number4" t:title="number" t:color="orange1">
+ <component t:x="357" t:y="289" name="number4" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component t:x="358" t:y="267" name="get" t:title="http get" t:color="green1">
+ <component t:x="358" t:y="267" name="get" t:title="get" t:color="green1">
   <implementation.cpp path="lib/http" library="libhttpget"/>
   <service name="get"/>
   <reference target="text5" name="url"/>
  </component>
  <service name="exec2" promote="exec2"/>
- <component t:x="287" t:y="245" name="exec2" t:title="py script" t:color="magenta1">
+ <component t:x="236" t:y="146" name="exec2" t:title="script" t:color="magenta1">
   <t:implementation.python script="nuvem/exec_.py"/>
   <service name="exec"/>
   <reference target="text6" name="py"/>
   <reference target="number5" name="ref"/>
  </component>
- <component t:x="350" t:y="37" name="text3" t:title="text" t:color="orange1">
+ <component t:x="350" t:y="37" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>3.14116 * 5 * 5</property>
  </component>
- <component t:x="350" t:y="130" name="text4" t:title="text" t:color="orange1">
+ <component t:x="350" t:y="130" name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
- <component t:x="359" t:y="286" name="number5" t:title="number" t:color="orange1">
+ <component t:x="359" t:y="286" name="number5" t:title="#" t:color="orange1">
   <t:implementation.python script="nuvem/number.py"/>
   <service name="number"/>
   <property>5</property>
  </component>
- <component t:x="357" t:y="245" name="text6" t:title="text" t:color="orange1">
+ <component t:x="357" t:y="245" name="text6" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>val = 3.14116 * ref.get(r) * ref.get(r)</property>
  </component>
- <component t:x="423" t:y="365" name="text5" t:title="text" t:color="orange1">
+ <component t:x="423" t:y="365" name="text5" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>http://people.apache.org/~jsdelfino/tuscany/test/surface.py</property>
  </component>
+ <service name="random" promote="random"/>
+ <component t:x="43" t:y="208" name="random" t:title="rand" t:color="magenta1">
+  <t:implementation.python script="nuvem/random_.py"/>
+  <service name="random"/>
+ </component>
+ <service name="sin" promote="sin"/>
+ <component t:x="44" t:y="258" name="sin" t:title="sin" t:color="magenta1">
+  <t:implementation.python script="nuvem/sin_.py"/>
+  <service name="sin"/>
+  <reference target="number6" name="x"/>
+ </component>
+ <component t:x="70" t:y="258" name="number6" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0.5</property>
+ </component>
+ <service name="cos" promote="cos"/>
+ <component t:x="40" t:y="316" name="cos" t:title="cos" t:color="magenta1">
+  <t:implementation.python script="nuvem/cos_.py"/>
+  <service name="cos"/>
+  <reference target="number7" name="x"/>
+ </component>
+ <component t:x="81" t:y="316" name="number7" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>0.5</property>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html b/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
index 5c7c7219bb..c2dc3a21c2 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
@@ -17,4 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test logic components</H2>
+ </SPAN>
+</DIV>