Cleanup and organize sample components, apps and html pages.

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

2 files changed, 57 insertions, 7 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.composite b/sca-cpp/trunk/modules/edit/apps/test/app.composite
index 7e4828573a..253168ff21 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/test/app.composite
@@ -17,11 +17,48 @@
  * 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" name="app" targetNamespace="http://app">
- <service name="text3" promote="text3"/>
- <component t:x="27" t:y="12" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>Hello World</property>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+ <service name="comment1" promote="comment1"/>
+ <service name="start1" promote="start1"/>
+ <component x="10" y="0" name="comment1" title="{propval}" color="white">
+  <implementation.python script="nuvem/comment.py"/>
+  <service name="comment" visible="false"/>
+  <property>Change this example to do what you want</property>
+ </component>
+ <component name="item1" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="user1" name="value"/>
+  <property>me</property>
+ </component>
+ <component name="item2" title="{propval} :" color="orange1">
+  <implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <reference target="now1" name="value"/>
+  <property>time</property>
+ </component>
+ <component name="list2" title="list" color="yellow1">
+  <implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="item1" name="item" clonable="true"/>
+  <reference target="item2" name="item" clonable="true"/>
+  <reference name="item" clonable="true"/>
+ </component>
+ <component name="now1" title="now" color="orange1">
+  <implementation.python script="nuvem/now.py"/>
+  <service name="now"/>
+  <reference name="format"/>
+ </component>
+ <component x="10" y="40" name="start1" title="start" color="green1">
+  <implementation.python script="nuvem/start.py"/>
+  <service name="start" visible="false">
+   <binding.http uri="start"/>
+  </service>
+  <reference target="list2" name="content"/>
+ </component>
+ <component name="user1" title="user" color="green1">
+  <implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user" visible="false"/>
  </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
index 5c7c7219bb..de39e20956 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
@@ -17,4 +17,17 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page"/>
+<DIV id="page">
+ <SPAN id="page:h1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+  <H1>Hello</H1>
+ </SPAN>
+ <SPAN id="me" class="h1" style="position: absolute; top: 0px; left: 56px; ">
+  <H1>=me</H1>
+ </SPAN>
+ <SPAN id="page:text" class="text" style="position: absolute; top: 36px; left: 2px; ">
+  <SPAN>The time is:</SPAN>
+ </SPAN>
+ <SPAN id="time" class="text" style="position: absolute; top: 36px; left: 74px; ">
+  <SPAN>=time</SPAN>
+ </SPAN>
+</DIV>