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, 107 insertions, 91 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.composite b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
index 6188773f22..fb03b89d3c 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/me360/app.composite
@@ -18,20 +18,9 @@
  * 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://me360" name="me360">
- <component t:x="616" t:y="72" name="text" t:title="text" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>100001053301307</property>
- </component>
- <component t:x="395" t:y="292" name="get" t:title="http get" t:color="green1">
-  <implementation.cpp path="lib/http" library="libhttpget"/>
-  <service name="get"/>
-  <reference target="format" name="url"/>
- </component>
  <component t:x="635" t:y="232" name="list" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="text4" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
  <component t:x="574" t:y="204" name="format" t:title="format" t:color="magenta1">
@@ -40,30 +29,15 @@
   <reference target="text3" name="pattern"/>
   <reference target="list" name="values"/>
  </component>
- <service name="page" promote="page"/>
- <component t:x="131" t:y="16" 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="pair4" name="content"/>
- </component>
- <component t:x="393" t:y="86" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>fbprofile</property>
- </component>
- <component t:x="241" t:y="69" name="name4" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>me360</property>
- </component>
- <component t:x="451" t:y="116" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>twitprofile</property>
+ <component t:x="453" t:y="45" name="fbprofile" t:title="facebook profile" t:color="blue1">
+  <t: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>
  </component>
- <component t:x="451" t:y="144" name="twprofile" t:title="twitter profile" t:color="blue1">
+ <component t:x="433" t:y="87" name="twprofile" t:title="twitter profile" t:color="blue1">
   <t:implementation.python script="nuvem/twprofile.py"/>
   <service name="twprofile"/>
   <reference target="text2" name="id"/>
@@ -71,64 +45,89 @@
    <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
   </reference>
  </component>
- <component t:x="451" t:y="72" name="fbprofile" t:title="facebook profile" t:color="blue1">
-  <t: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>
- </component>
- <component t:x="451" t:y="188" name="name3" t:title="name" t:color="orange1">
+ <component t:x="491" t:y="108" name="name" t:title="" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>buzzprofile</property>
- </component>
- <component t:x="392" t:y="44" name="pair" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name" name="name"/>
-  <reference target="fbprofile" name="value"/>
+  <property>buzz</property>
  </component>
- <component t:x="315" t:y="44" name="list2" t:title="list" t:color="yellow1">
+ <component t:x="242" t:y="23" name="list2" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
-  <reference target="pair" name="item" t:clonable="true"/>
-  <reference target="pair2" 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 t:x="256" t:y="16" name="pair4" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name4" name="name"/>
-  <reference target="list2" name="value"/>
+ <service name="appstart" promote="appstart"/>
+ <component t:x="126" t:y="23" name="appstart" t:title="start" t:color="green1">
+  <t:implementation.python script="nuvem/appstart.py"/>
+  <service name="appstart" t:visible="false">
+   <t:binding.http uri="appstart"/>
+  </service>
+  <reference target="list2" name="content"/>
  </component>
- <component t:x="392" t:y="116" name="pair2" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name2" name="name"/>
-  <reference target="twprofile" name="value"/>
+ <component t:x="224" t:y="222" name="get" t:title="get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="format" name="url"/>
  </component>
- <service name="pair3" promote="pair3"/>
- <component t:x="173" t:y="275" name="pair3" t:title="pair" t:color="yellow1">
-  <t:implementation.python script="nuvem/pair.py"/>
-  <service name="pair"/>
-  <reference target="name3" name="name"/>
-  <reference target="get" name="value"/>
+ <service name="buzz" promote="buzz"/>
+ <component name="buzz" t:x="127" t:y="220" t:title="{compname}" t:color="green1">
+  <t:implementation.python script="nuvem/service.py"/>
+  <service name="service" t:visible="false"/>
+  <reference target="get" name="content"/>
  </component>
- <component t:x="549" t:y="144" name="text2" t:title="text" t:color="orange1">
+ <component t:x="276" t:y="220" name="text3" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>jsdelfino</property>
+  <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
+ </component>
+ <service name="call" promote="call"/>
+ <component t:x="583" t:y="156" name="call" t:title="call" t:color="green1">
+  <t:implementation.python script="nuvem/call.py"/>
+  <service name="call"/>
+  <reference target="name" name="name"/>
+  <reference name="proxy" wiredByImpl="true" t:visible="false"/>
+ </component>
+ <component t:x="306" t:y="111" name="bzprofile" t:title="buzz profile" t:color="blue1">
+  <t:implementation.python script="nuvem/bzprofile.py"/>
+  <service name="bzprofile"/>
+  <reference target="text4" name="id"/>
+  <reference name="bz" t:visible="false">
+   <t:binding.http uri="https://www.googleapis.com/buzz/v1/people"/>
+  </reference>
  </component>
- <component t:x="361" t:y="303" name="text3" t:title="text" t:color="orange1">
+ <component t:x="398" t:y="25" name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json</property>
+  <property>100001053301307</property>
+ </component>
+ <component t:x="213" t:y="23" name="property" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="fbprofile" name="value"/>
+  <property>fbprofile</property>
  </component>
- <component t:x="438" t:y="331" name="text4" t:title="text" t:color="orange1">
+ <component t:x="394" t:y="67" name="text2" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>jsdelfino</property>
  </component>
+ <component t:x="395" t:y="111" name="text4" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>jsdelfino</property>
+ </component>
+ <component t:x="213" t:y="67" name="property2" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="twprofile" name="value"/>
+  <property>twitprofile</property>
+ </component>
+ <component t:x="213" t:y="111" name="property3" t:title="{propval} :" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="property"/>
+  <reference target="bzprofile" name="value"/>
+  <property>buzzprofile</property>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.html b/sca-cpp/trunk/modules/edit/apps/me360/app.html
index ebc98e5072..31ed5e58bd 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/me360/app.html
@@ -18,41 +18,58 @@
  * under the License.    
 -->
 <DIV id="page">
- <SPAN id="section" class="section" style="position: absolute; top: 52px; left: 0px; ">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Me360</H2>
+ </SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
   <SPAN>Facebook</SPAN>
  </SPAN>
- <SPAN id="fbprofile" class="table" style="position: absolute; top: 93px; left: 1px; ">
-  <TABLE class="datatable">
+ <SPAN id="section" class="section" style="position: absolute; top: 225px; width: 100%; left: 2px; ">
+  <SPAN>Twitter</SPAN>
+ </SPAN>
+ <SPAN id="fbprofile" class="table" style="position: absolute; top: 54px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="twitprofile" class="table" style="position: absolute; top: 292px; left: 2px; ">
-  <TABLE class="datatable">
+ <SPAN id="twitprofile" class="table" style="position: absolute; top: 252px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
    <TBODY>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>table</TD>
+     <TD>...</TD>
     </TR>
     <TR>
-     <TD>name</TD>
-     <TD>value</TD>
+     <TD>...</TD>
+     <TD>...</TD>
     </TR>
    </TBODY>
   </TABLE>
  </SPAN>
- <SPAN id="section" class="section" style="position: absolute; top: 253px; left: 1px; ">
-  <SPAN>Twitter</SPAN>
+ <SPAN id="section" class="section" style="position: absolute; top: 1143px; width: 100%; left: 2px; ">
+  <SPAN>Buzz</SPAN>
  </SPAN>
- <SPAN id="h2" class="h2" style="position: absolute; top: 11px; left: 0px; ">
-  <H2>Me360</H2>
+ <SPAN id="buzzprofile" class="table" style="position: absolute; top: 1170px; left: 2px; ">
+  <TABLE class="datatable" style="width: 100%; ">
+   <TBODY>
+    <TR>
+     <TD>table</TD>
+     <TD>...</TD>
+    </TR>
+    <TR>
+     <TD>...</TD>
+     <TD>...</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
  </SPAN>
 </DIV>