Refactor and cleanup edit module, add text components, store page and app run page.

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

5 files changed, 179 insertions, 31 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.html b/sca-cpp/trunk/modules/edit/apps/test/app.html
index 5c7c7219bb..a43eca03e0 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/test/app.html
@@ -17,4 +17,19 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="table" class="table" style="position: absolute; top: 116px; left: 65px; ">
+  <TABLE class="datatable">
+   <TBODY>
+    <TR>
+     <TD>name</TD>
+     <TD>value</TD>
+    </TR>
+    <TR>
+     <TD>name</TD>
+     <TD>value</TD>
+    </TR>
+   </TBODY>
+  </TABLE>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
index d1121d9206..b2db2e0ee6 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
@@ -31,11 +31,6 @@
    <t:binding.http uri="https://graph.facebook.com"/>
   </reference>
  </component>
- <component t:x="169" t:y="17" name="name" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>facebook</property>
- </component>
  <component t:x="66" t:y="14" name="name3" t:title="name" t:color="orange1">
   <t:implementation.python script="nuvem/name.py"/>
   <service name="name"/>
@@ -50,16 +45,9 @@
  <service name="page" promote="page"/>
  <component t:x="0" t:y="12" name="page" t:title="when page opened" t:color="green1">
   <t:implementation.python script="nuvem/page.py"/>
-  <service name="page" t:visible="false">
-   <t:binding.http uri="index.html"/>
-  </service>
+  <service name="page" t:visible="false"/>
   <reference target="me360" name="content"/>
  </component>
- <component t:x="404" t:y="162" name="name2" t:title="name" t:color="orange1">
-  <t:implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>twitter</property>
- </component>
  <component t:x="505" t:y="204" name="text3" t:title="text" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
@@ -80,16 +68,26 @@
   <reference target="assoc2" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="260" t:y="57" 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="fbprofile" name="value"/>
- </component>
  <component t:x="262" t:y="152" 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="twprofile" name="value"/>
  </component>
+ <component t:x="311" t:y="148" name="name2" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>twprofile</property>
+ </component>
+ <component t:x="311" t:y="52" 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="256" t:y="52" 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="fbprofile" name="value"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html b/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
index 5c7c7219bb..bd02e095b0 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
@@ -17,4 +17,42 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="twprofile" class="table" style="position: absolute; top: 314px; left: 3px; ">
+  <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="h1" class="h1" style="position: absolute; top: 6px; left: 0px; ">
+  <H1>My social profiles</H1>
+ </SPAN>
+ <SPAN id="fbsection" class="section" style="position: absolute; top: 51px; left: 3px; ">
+  <SPAN>Facebook profile</SPAN>
+ </SPAN>
+ <SPAN id="fbprofile" class="table" style="position: absolute; top: 88px; left: 3px; ">
+  <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="section" class="section" style="position: absolute; top: 281px; left: 0px; ">
+  <SPAN>Twitter profile</SPAN>
+ </SPAN>
+</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite b/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
index f286689590..bcc16ccad4 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testtext/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://testtext" name="testtext">
  <service name="contains" promote="contains"/>
- <component t:x="34" t:y="14" name="contains" t:title="contains" t:color="magenta1">
+ <component t:x="34" t:y="33" name="contains" t:title="contains" t:color="magenta1">
   <t:implementation.python script="nuvem/contains.py"/>
   <service name="contains"/>
   <reference target="text10" name="search"/>
@@ -33,14 +33,14 @@
   <reference target="text12" name="string"/>
  </component>
  <service name="join" promote="join"/>
- <component t:x="543" t:y="20" name="join" t:title="join" t:color="magenta1">
+ <component t:x="488" t:y="25" name="join" t:title="join" t:color="magenta1">
   <t:implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference target="text6" name="separator"/>
   <reference target="list2" name="list"/>
  </component>
  <service name="replace" promote="replace"/>
- <component t:x="310" t:y="21" name="replace" t:title="replace" t:color="magenta1">
+ <component t:x="220" t:y="31" name="replace" t:title="replace" t:color="magenta1">
   <t:implementation.python script="nuvem/replace.py"/>
   <service name="replace"/>
   <reference target="text4" name="from"/>
@@ -48,13 +48,13 @@
   <reference target="text3" name="string"/>
  </component>
  <service name="lowercase" promote="lowercase"/>
- <component t:x="305" t:y="307" name="lowercase" t:title="lowercase" t:color="magenta1">
+ <component t:x="34" t:y="317" name="lowercase" t:title="lowercase" t:color="magenta1">
   <t:implementation.python script="nuvem/lowercase.py"/>
   <service name="lowercase"/>
   <reference target="text2" name="string"/>
  </component>
  <service name="uppercase" promote="uppercase"/>
- <component t:x="306" t:y="222" name="uppercase" t:title="uppercase" t:color="magenta1">
+ <component t:x="34" t:y="253" name="uppercase" t:title="uppercase" t:color="magenta1">
   <t:implementation.python script="nuvem/uppercase.py"/>
   <service name="uppercase"/>
   <reference target="text" name="string"/>
@@ -126,4 +126,101 @@
   <service name="text"/>
   <property>def</property>
  </component>
+ <service name="format" promote="format"/>
+ <component t:x="225" t:y="192" name="format" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text13" name="pattern"/>
+  <reference target="list" name="values"/>
+ </component>
+ <service name="format2" promote="format2"/>
+ <component t:x="493" t:y="207" name="format2" t:title="format" t:color="magenta1">
+  <t:implementation.python script="nuvem/format_.py"/>
+  <service name="format"/>
+  <reference target="text14" name="pattern"/>
+  <reference target="list3" name="values"/>
+ </component>
+ <component t:x="365" t:y="194" name="text13" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>The {0} brown {1}</property>
+ </component>
+ <component t:x="369" t:y="238" name="list" t:title="make list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="text15" name="item" t:clonable="true"/>
+  <reference target="text16" name="item" t:clonable="true"/>
+  <reference name="item" t:clonable="true"/>
+ </component>
+ <component t:x="444" t:y="236" name="text15" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>quick</property>
+ </component>
+ <component t:x="438" t:y="274" name="text16" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>fox</property>
+ </component>
+ <component t:x="599" t:y="198" name="text14" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>The {a} brown {b}</property>
+ </component>
+ <component t:x="603" t:y="239" name="list3" 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 name="item" t:clonable="true"/>
+ </component>
+ <component t:x="675" t:y="243" 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="text17" name="value"/>
+ </component>
+ <component t:x="673" t:y="287" 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="text18" name="value"/>
+ </component>
+ <component t:x="727" t:y="238" name="name" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>a</property>
+ </component>
+ <component t:x="727" t:y="326" name="name2" t:title="name" t:color="orange1">
+  <t:implementation.python script="nuvem/name.py"/>
+  <service name="name"/>
+  <property>b</property>
+ </component>
+ <component t:x="727" t:y="278" name="text17" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>quick</property>
+ </component>
+ <component t:x="727" t:y="366" name="text18" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>fox</property>
+ </component>
+ <service name="parse" promote="parse"/>
+ <component t:x="37" t:y="388" name="parse" t:title="parse" t:color="magenta1">
+  <t:implementation.python script="nuvem/parse.py"/>
+  <service name="parse"/>
+  <reference target="text19" name="regexp"/>
+  <reference target="text20" name="string"/>
+ </component>
+ <component t:x="89" t:y="428" name="text20" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>city San Francisco state CA</property>
+ </component>
+ <component t:x="89" t:y="388" name="text19" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>city (.*) state (.*)</property>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
index be3f503243..d0bb61b129 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
@@ -188,11 +188,6 @@
   <reference target="valueof" name="value1"/>
   <reference target="number6" name="value2"/>
  </component>
- <component t:x="254" t:y="287" name="reverse" t:title="reverse" t:color="yellow1">
-  <t:implementation.python script="nuvem/reverse.py"/>
-  <service name="reverse"/>
-  <reference target="range" name="list"/>
- </component>
  <component t:x="280" t:y="264" name="valueof" t:title="value of" t:color="orange1">
   <t:implementation.python script="nuvem/valueof.py"/>
   <service name="valueof"/>
@@ -263,4 +258,9 @@
   <reference target="multiply" name="transform"/>
   <reference target="reverse" name="list"/>
  </component>
+ <component t:x="252" t:y="352" name="reverse" t:title="reverse" t:color="yellow1">
+  <t:implementation.python script="nuvem/reverse.py"/>
+  <service name="reverse"/>
+  <reference target="range" name="list"/>
+ </component>
 </composite>