You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2011/02/26 21:59:28 UTC

svn commit: r1074923 [1/3] - in /tuscany/sca-cpp/trunk/modules/edit: ./ apps/myprofile/ apps/myprofile2/ apps/nearme/ apps/nearme2/ apps/store/ apps/store2/ apps/store3/ apps/test/ apps/testlogic/ apps/testsocial/ apps/testtext/ apps/testurl/ apps/test...

Author: jsdelfino
Date: Sat Feb 26 20:59:26 2011
New Revision: 1074923

URL: http://svn.apache.org/viewvc?rev=1074923&view=rev
Log:
Some improvements to the edit module. Add a few sample apps and test cases, show current user and links to app data.

Added:
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/test/
    tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/test/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/
    tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/
    tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testtext/
    tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testtext/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testurl/
    tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testurl/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/
    tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/testvalues/app.html
Modified:
    tuscany/sca-cpp/trunk/modules/edit/apps.py
    tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/store/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/store/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.html
    tuscany/sca-cpp/trunk/modules/edit/apps/travel/app.composite
    tuscany/sca-cpp/trunk/modules/edit/apps/travel/app.html
    tuscany/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
    tuscany/sca-cpp/trunk/modules/edit/edit.composite
    tuscany/sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html
    tuscany/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
    tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html
    tuscany/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js
    tuscany/sca-cpp/trunk/modules/edit/htdocs/menu.html
    tuscany/sca-cpp/trunk/modules/edit/palettes/events/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/url/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
    tuscany/sca-cpp/trunk/modules/edit/ssl-start
    tuscany/sca-cpp/trunk/modules/edit/start
    tuscany/sca-cpp/trunk/modules/edit/user.py

Modified: tuscany/sca-cpp/trunk/modules/edit/apps.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps.py?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps.py (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps.py Sat Feb 26 20:59:26 2011
@@ -18,23 +18,37 @@
 # Apps collection implementation
 import uuid
 import sys
+import os
 from util import *
 
 # Convert an id to an app id
 def appid(id):
     return ("'" + car(id), "'app.composite")
 
+# Link implementation resources into an app
+def mkapplink(id):
+    try:
+        os.symlink('../../../../../nuvem/nuvem-parallel/nuvem', 'apps/' + car(id) + '/nuvem')
+        os.mkdir('apps/' + car(id) + '/htdocs')
+        os.symlink('../../../htdocs/login', 'apps/' + car(id) + '/htdocs/login');
+        os.symlink('../../../htdocs/logout', 'apps/' + car(id) + '/htdocs/logout');
+    except:
+        pass
+    return True
+
 # Post a new app to the apps db
 def post(collection, app, cache):
     id = appid((str(uuid.uuid1()),))
     comp = caddr(app)
     cache.put((id,), comp)
+    mkapplink((id,))
     return id
 
 # Put an app into the apps db
 def put(id, app, cache):
     comp = caddr(app)
     cache.put(appid(id), comp)
+    mkapplink(id)
     return True
 
 # Get an app from the apps db

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.composite Sat Feb 26 20:59:26 2011
@@ -18,47 +18,47 @@
  * 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="240" t:y="57" name="text" t:title="text" t:color="orange1">
-    <t:implementation.python script="text.py"/>
-    <service name="text"/>
-    <property>12345678</property>
-  </component>
-  <service name="opened" promote="opened"/>
-  <component t:x="3" t:y="2" name="opened" t:title="when page opened" t:color="green1">
-    <t:implementation.python script="opened.py"/>
-    <service name="opened" t:visible="false"/>
-    <reference target="assoc2" name="content"/>
-  </component>
-  <component t:x="135" t:y="2" name="assoc2" t:title="assoc" t:color="orange1">
-    <t:implementation.python script="assoc.py"/>
-    <service name="assoc"/>
-    <reference target="name2" name="name"/>
-    <reference target="append" name="value"/>
-  </component>
-  <component t:x="225" t:y="52" name="append" t:title="append" t:color="yellow1">
-    <t:implementation.python script="append.py"/>
-    <service name="append"/>
-    <reference target="fbprofile" name="first"/>
-    <reference target="twprofile" name="second"/>
-  </component>
-  <component t:x="297" t:y="53" name="fbprofile" t:title="facebook profile" t:color="blue1">
-    <t:implementation.python script="fbprofile.py"/>
-    <service name="fbprofile"/>
-    <reference target="text" name="id"/>
-  </component>
-  <component t:x="293" t:y="105" name="twprofile" t:title="twitter profile" t:color="blue1">
-    <t:implementation.python script="twprofile.py"/>
-    <service name="twprofile"/>
-    <reference target="text2" name="id"/>
-  </component>
-  <component t:x="219" t:y="0" name="name2" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>profiles</property>
-  </component>
-  <component t:x="358" t:y="98" name="text2" t:title="text" t:color="orange1">
-    <t:implementation.python script="text.py"/>
-    <service name="text"/>
-    <property>joe</property>
-  </component>
+ <component t:x="240" t:y="57" name="text" t:title="text" t:color="orange1">
+  <t:implementation.python script="text.py"/>
+  <service name="text"/>
+  <property>12345678</property>
+ </component>
+ <service name="opened" promote="opened"/>
+ <component t:x="3" t:y="2" name="opened" t:title="when page opened" t:color="green1">
+  <t:implementation.python script="opened.py"/>
+  <service name="opened" t:visible="false"/>
+  <reference target="assoc2" name="content"/>
+ </component>
+ <component t:x="135" t:y="2" name="assoc2" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name2" name="name"/>
+  <reference target="append" name="value"/>
+ </component>
+ <component t:x="225" t:y="52" name="append" t:title="append" t:color="yellow1">
+  <t:implementation.python script="append.py"/>
+  <service name="append"/>
+  <reference target="fbprofile" name="first"/>
+  <reference target="twprofile" name="second"/>
+ </component>
+ <component t:x="297" t:y="53" name="fbprofile" t:title="facebook profile" t:color="blue1">
+  <t:implementation.python script="fbprofile.py"/>
+  <service name="fbprofile"/>
+  <reference target="text" name="id"/>
+ </component>
+ <component t:x="293" t:y="105" name="twprofile" t:title="twitter profile" t:color="blue1">
+  <t:implementation.python script="twprofile.py"/>
+  <service name="twprofile"/>
+  <reference target="text2" name="id"/>
+ </component>
+ <component t:x="219" t:y="0" name="name2" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>profiles</property>
+ </component>
+ <component t:x="358" t:y="98" name="text2" t:title="text" t:color="orange1">
+  <t:implementation.python script="text.py"/>
+  <service name="text"/>
+  <property>joe</property>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/myprofile/app.html Sat Feb 26 20:59:26 2011
@@ -18,28 +18,28 @@
  * under the License.    
 -->
 <DIV id="page">
-  <SPAN id="h1" class="h1" style="position: absolute; top: 6px; left: 0px; ">
-    <H1>My social profiles</H1>
-  </SPAN>
-  <SPAN id="getProfiles" class="button" style="position: absolute; top: 144px; left: 0px; ">
-    <INPUT type="button" value="Get my profiles"/>
-  </SPAN>
-  <SPAN id="h2" class="h2" style="position: absolute; top: 198px; left: 0px; ">
-    <H2>Facebook profile</H2>
-  </SPAN>
-  <SPAN id="fbprofile" class="text" style="position: absolute; top: 240px; left: 3px; ">
-    <SPAN>text</SPAN>
-  </SPAN>
-  <SPAN id="h2" class="h2" style="position: absolute; top: 283px; left: 1px; ">
-    <H2>Twitter profile</H2>
-  </SPAN>
-  <SPAN id="twprofile" class="text" style="position: absolute; top: 331px; left: 2px; ">
-    <SPAN>text</SPAN>
-  </SPAN>
-  <SPAN id="twid" class="entry" style="position: absolute; top: 99px; left: 0px; ">
-    <INPUT type="text" value="field" size="5"/>
-  </SPAN>
-  <SPAN id="fbid" class="entry" style="position: absolute; top: 56px; left: 0px; ">
-    <INPUT type="text" value="field" size="5"/>
-  </SPAN>
+ <SPAN id="h1" class="h1" style="position: absolute; top: 6px; left: 0px; ">
+  <H1>My social profiles</H1>
+ </SPAN>
+ <SPAN id="getProfiles" class="button" style="position: absolute; top: 144px; left: 0px; ">
+  <INPUT type="button" value="Get my profiles"/>
+ </SPAN>
+ <SPAN id="h2" class="h2" style="position: absolute; top: 198px; left: 0px; ">
+  <H2>Facebook profile</H2>
+ </SPAN>
+ <SPAN id="fbprofile" class="text" style="position: absolute; top: 240px; left: 3px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="h2" class="h2" style="position: absolute; top: 283px; left: 1px; ">
+  <H2>Twitter profile</H2>
+ </SPAN>
+ <SPAN id="twprofile" class="text" style="position: absolute; top: 331px; left: 2px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="twid" class="entry" style="position: absolute; top: 99px; left: 0px; ">
+  <INPUT type="text" value="field" size="5"/>
+ </SPAN>
+ <SPAN id="fbid" class="entry" style="position: absolute; top: 56px; left: 0px; ">
+  <INPUT type="text" value="field" size="5"/>
+ </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.composite Sat Feb 26 20:59:26 2011
@@ -18,101 +18,101 @@
  * 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://myprofile2" name="myprofile2">
-  <service name="opened" promote="opened"/>
-  <component t:x="0" t:y="13" name="opened" t:title="when page opened" t:color="green1">
-    <t:implementation.python script="opened.py"/>
-    <service name="opened" t:visible="false"/>
-    <reference target="nothing" name="content"/>
-  </component>
-  <component t:x="133" t:y="11" name="nothing" t:color="orange1">
-    <t:implementation.python script="text.py"/>
-    <service name="nothing"/>
-  </component>
-  <service name="getProfiles" promote="getProfiles"/>
-  <component name="getProfiles" t:x="0" t:y="99" t:title="when clicked" t:color="green1">
-    <t:implementation.python script="clicked.py"/>
-    <service name="clicked" t:visible="false"/>
-    <property>getProfiles</property>
-    <reference target="list5" name="content"/>
-  </component>
-  <component t:x="98" t:y="100" name="list5" t:title="make list" t:color="yellow1">
-    <t:implementation.python script="list_.py"/>
-    <service name="list"/>
-    <reference target="assoc" name="first"/>
-    <reference target="list6" name="rest"/>
-  </component>
-  <component t:x="223" t:y="140" name="fbprofile2" t:title="facebook profile" t:color="blue1">
-    <t:implementation.python script="fbprofile.py"/>
-    <service name="fbprofile"/>
-    <reference target="find3" name="id"/>
-  </component>
-  <component t:x="176" t:y="144" name="list6" t:title="make list" t:color="yellow1">
-    <t:implementation.python script="list_.py"/>
-    <service name="list"/>
-    <reference target="assoc2" name="first"/>
-    <reference target="empty" name="rest"/>
-  </component>
-  <component t:x="176" t:y="99" name="assoc" t:title="assoc" t:color="orange1">
-    <t:implementation.python script="assoc.py"/>
-    <service name="assoc"/>
-    <reference target="name" name="name"/>
-    <reference target="fbprofile2" name="value"/>
-  </component>
-  <component t:x="299" t:y="269" name="twprofile2" t:title="twitter profile" t:color="blue1">
-    <t:implementation.python script="twprofile.py"/>
-    <service name="twprofile"/>
-    <reference target="find4" name="id"/>
-  </component>
-  <component t:x="337" t:y="142" name="find3" t:title="find by name" t:color="yellow1">
-    <t:implementation.python script="find.py"/>
-    <service name="find"/>
-    <reference target="name4" name="name"/>
-    <reference target="params3" name="assoc"/>
-  </component>
-  <component t:x="439" t:y="140" name="name4" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>fbid</property>
-  </component>
-  <component t:x="399" t:y="344" name="find4" t:title="find by name" t:color="yellow1">
-    <t:implementation.python script="find.py"/>
-    <service name="find"/>
-    <reference target="name5" name="name"/>
-    <reference target="params4" name="assoc"/>
-  </component>
-  <component t:x="495" t:y="345" name="name5" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>twid</property>
-  </component>
-  <component t:x="221" t:y="99" name="name" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>fbprofile</property>
-  </component>
-  <component t:x="256" t:y="262" name="assoc2" t:title="assoc" t:color="orange1">
-    <t:implementation.python script="assoc.py"/>
-    <service name="assoc"/>
-    <reference target="name3" name="name"/>
-    <reference target="twprofile2" name="value"/>
-  </component>
-  <component t:x="256" t:y="424" name="empty" t:title="empty list" t:color="yellow1">
-    <t:implementation.python script="empty.py"/>
-    <service name="empty"/>
-  </component>
-  <component t:x="298" t:y="261" name="name3" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>twprofile</property>
-  </component>
-  <component t:x="436" t:y="183" name="params3" t:title="?params" t:color="green1">
-    <t:implementation.python script="params.py"/>
-    <service name="params"/>
-    <property>fbid=1234567&amp;twid=joe</property>
-  </component>
-  <component t:x="495" t:y="345" name="params4" t:title="?params" t:color="green1">
-    <t:implementation.python script="params.py"/>
-    <service name="params"/>
-    <property>fbid=1234567&amp;twid=joe</property>
-  </component>
+ <service name="opened" promote="opened"/>
+ <component t:x="0" t:y="13" name="opened" t:title="when page opened" t:color="green1">
+  <t:implementation.python script="opened.py"/>
+  <service name="opened" t:visible="false"/>
+  <reference target="nothing" name="content"/>
+ </component>
+ <component t:x="133" t:y="11" name="nothing" t:color="orange1">
+  <t:implementation.python script="text.py"/>
+  <service name="nothing"/>
+ </component>
+ <service name="getProfiles" promote="getProfiles"/>
+ <component name="getProfiles" t:x="0" t:y="99" t:title="when clicked" t:color="green1">
+  <t:implementation.python script="clicked.py"/>
+  <service name="clicked" t:visible="false"/>
+  <property>getProfiles</property>
+  <reference target="list5" name="content"/>
+ </component>
+ <component t:x="98" t:y="100" name="list5" t:title="make list" t:color="yellow1">
+  <t:implementation.python script="list_.py"/>
+  <service name="list"/>
+  <reference target="assoc" name="first"/>
+  <reference target="list6" name="rest"/>
+ </component>
+ <component t:x="223" t:y="140" name="fbprofile2" t:title="facebook profile" t:color="blue1">
+  <t:implementation.python script="fbprofile.py"/>
+  <service name="fbprofile"/>
+  <reference target="find3" name="id"/>
+ </component>
+ <component t:x="176" t:y="144" name="list6" t:title="make list" t:color="yellow1">
+  <t:implementation.python script="list_.py"/>
+  <service name="list"/>
+  <reference target="assoc2" name="first"/>
+  <reference target="empty" name="rest"/>
+ </component>
+ <component t:x="176" t:y="99" name="assoc" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name" name="name"/>
+  <reference target="fbprofile2" name="value"/>
+ </component>
+ <component t:x="299" t:y="269" name="twprofile2" t:title="twitter profile" t:color="blue1">
+  <t:implementation.python script="twprofile.py"/>
+  <service name="twprofile"/>
+  <reference target="find4" name="id"/>
+ </component>
+ <component t:x="337" t:y="142" name="find3" t:title="find by name" t:color="yellow1">
+  <t:implementation.python script="find.py"/>
+  <service name="find"/>
+  <reference target="name4" name="name"/>
+  <reference target="params3" name="assoc"/>
+ </component>
+ <component t:x="439" t:y="140" name="name4" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>fbid</property>
+ </component>
+ <component t:x="399" t:y="344" name="find4" t:title="find by name" t:color="yellow1">
+  <t:implementation.python script="find.py"/>
+  <service name="find"/>
+  <reference target="name5" name="name"/>
+  <reference target="params4" name="assoc"/>
+ </component>
+ <component t:x="495" t:y="345" name="name5" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>twid</property>
+ </component>
+ <component t:x="221" t:y="99" name="name" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>fbprofile</property>
+ </component>
+ <component t:x="256" t:y="262" name="assoc2" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name3" name="name"/>
+  <reference target="twprofile2" name="value"/>
+ </component>
+ <component t:x="256" t:y="424" name="empty" t:title="empty list" t:color="yellow1">
+  <t:implementation.python script="empty.py"/>
+  <service name="empty"/>
+ </component>
+ <component t:x="298" t:y="261" name="name3" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>twprofile</property>
+ </component>
+ <component t:x="436" t:y="183" name="params3" t:title="?params" t:color="green1">
+  <t:implementation.python script="params.py"/>
+  <service name="params"/>
+  <property>fbid=1234567&amp;twid=joe</property>
+ </component>
+ <component t:x="495" t:y="345" name="params4" t:title="?params" t:color="green1">
+  <t:implementation.python script="params.py"/>
+  <service name="params"/>
+  <property>fbid=1234567&amp;twid=joe</property>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/myprofile2/app.html Sat Feb 26 20:59:26 2011
@@ -18,28 +18,28 @@
  * under the License.    
 -->
 <DIV id="page">
-  <SPAN id="h1" class="h1" style="position: absolute; top: 6px; left: 0px; ">
-    <H1>My social profiles</H1>
-  </SPAN>
-  <SPAN id="getProfiles" class="button" style="position: absolute; top: 144px; left: 0px; ">
-    <INPUT type="button" value="Get my profiles"/>
-  </SPAN>
-  <SPAN id="h2" class="h2" style="position: absolute; top: 198px; left: 0px; ">
-    <H2>Facebook profile</H2>
-  </SPAN>
-  <SPAN id="fbprofile" class="text" style="position: absolute; top: 240px; left: 3px; ">
-    <SPAN>text</SPAN>
-  </SPAN>
-  <SPAN id="h2" class="h2" style="position: absolute; top: 283px; left: 1px; ">
-    <H2>Twitter profile</H2>
-  </SPAN>
-  <SPAN id="twprofile" class="text" style="position: absolute; top: 331px; left: 2px; ">
-    <SPAN>text</SPAN>
-  </SPAN>
-  <SPAN id="twid" class="entry" style="position: absolute; top: 99px; left: 0px; ">
-    <INPUT type="text" value="field" size="5"/>
-  </SPAN>
-  <SPAN id="fbid" class="entry" style="position: absolute; top: 56px; left: 0px; ">
-    <INPUT type="text" value="field" size="5"/>
-  </SPAN>
+ <SPAN id="h1" class="h1" style="position: absolute; top: 6px; left: 0px; ">
+  <H1>My social profiles</H1>
+ </SPAN>
+ <SPAN id="getProfiles" class="button" style="position: absolute; top: 144px; left: 0px; ">
+  <INPUT type="button" value="Get my profiles"/>
+ </SPAN>
+ <SPAN id="h2" class="h2" style="position: absolute; top: 198px; left: 0px; ">
+  <H2>Facebook profile</H2>
+ </SPAN>
+ <SPAN id="fbprofile" class="text" style="position: absolute; top: 240px; left: 3px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="h2" class="h2" style="position: absolute; top: 283px; left: 1px; ">
+  <H2>Twitter profile</H2>
+ </SPAN>
+ <SPAN id="twprofile" class="text" style="position: absolute; top: 331px; left: 2px; ">
+  <SPAN>text</SPAN>
+ </SPAN>
+ <SPAN id="twid" class="entry" style="position: absolute; top: 99px; left: 0px; ">
+  <INPUT type="text" value="field" size="5"/>
+ </SPAN>
+ <SPAN id="fbid" class="entry" style="position: absolute; top: 56px; left: 0px; ">
+  <INPUT type="text" value="field" size="5"/>
+ </SPAN>
 </DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.composite Sat Feb 26 20:59:26 2011
@@ -18,105 +18,105 @@
  * 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://nearme" name="nearme">
-  <component t:x="234" t:y="25" name="fbfriend" t:color="yellow1">
-    <t:implementation.python script="item.py"/>
-    <service name="item"/>
-    <property name="property"/>
-  </component>
-  <component t:x="233" t:y="97" name="fbfriends" t:title="facebook friends" t:color="blue1">
-    <t:implementation.python script="fbfriends.py"/>
-    <service name="fbfriends"/>
-    <reference target="find" name="id"/>
-  </component>
-  <component t:x="352" t:y="96" name="find" t:title="find by name" t:color="yellow1">
-    <t:implementation.python script="find.py"/>
-    <service name="find"/>
-    <reference target="name" name="name"/>
-    <reference target="params" name="assoc"/>
-  </component>
-  <component t:x="453" t:y="97" name="name" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>fbid</property>
-  </component>
-  <component t:x="453" t:y="138" name="params" t:title="?params" t:color="green1">
-    <t:implementation.python script="params.py"/>
-    <service name="params"/>
-    <property>fbid=1234567</property>
-  </component>
-  <component t:x="274" t:y="97" name="mile" t:title="number" t:color="orange1">
-    <t:implementation.python script="number.py"/>
-    <service name="number"/>
-    <property>1</property>
-  </component>
-  <component t:x="484" t:y="68" name="name2" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>id</property>
-  </component>
-  <component t:x="226" t:y="29" name="lesser" t:title="lt" t:color="magenta1">
-    <t:implementation.python script="lesser.py"/>
-    <service name="lesser"/>
-    <reference target="distance" name="value1"/>
-    <reference target="mile" name="value2"/>
-  </component>
-  <component t:x="378" t:y="25" name="text2" t:title="text" t:color="orange1">
-    <t:implementation.python script="text.py"/>
-    <service name="text"/>
-    <property>jane</property>
-  </component>
-  <component t:x="227" t:y="240" name="nothing" t:title="nothing" t:color="orange1">
-    <t:implementation.python script="text.py"/>
-    <service name="nothing"/>
-  </component>
-  <component t:x="132" t:y="31" name="if" t:title="if" t:color="magenta1">
-    <t:implementation.python script="if_.py"/>
-    <service name="if"/>
-    <reference target="lesser" name="condition"/>
-    <reference target="assoc" name="then"/>
-    <reference target="nothing" name="else"/>
-  </component>
-  <component t:x="600" t:y="113" name="text" t:title="text" t:color="orange1">
-    <t:implementation.python script="text.py"/>
-    <service name="text"/>
-    <property>joe</property>
-  </component>
-  <service name="opened" promote="opened"/>
-  <component t:x="0" t:y="22" name="opened" t:title="when page opened" t:color="green1">
-    <t:implementation.python script="opened.py"/>
-    <service name="opened" t:visible="false"/>
-    <reference target="if" name="content"/>
-  </component>
-  <component t:x="175" t:y="198" name="assoc" t:title="assoc" t:color="orange1">
-    <t:implementation.python script="assoc.py"/>
-    <service name="assoc"/>
-    <reference target="name3" name="name"/>
-    <reference target="text3" name="value"/>
-  </component>
-  <component t:x="331" t:y="383" name="text3" t:title="text" t:color="orange1">
-    <t:implementation.python script="text.py"/>
-    <service name="text"/>
-    <property>jane</property>
-  </component>
-  <component t:x="218" t:y="195" name="name3" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>near</property>
-  </component>
-  <component t:x="216" t:y="23" name="distance" t:title="distance" t:color="red1">
-    <t:implementation.python script="distance.py"/>
-    <service name="distance"/>
-    <reference target="location" name="location1"/>
-    <reference target="location2" name="location2"/>
-  </component>
-  <component t:x="430" t:y="178" name="location" t:title="location" t:color="red1">
-    <t:implementation.python script="location.py"/>
-    <service name="location"/>
-    <reference target="text2" name="user"/>
-  </component>
-  <component t:x="429" t:y="234" name="location2" t:title="location" t:color="red1">
-    <t:implementation.python script="location.py"/>
-    <service name="location"/>
-    <reference target="text" name="user"/>
-  </component>
+ <component t:x="234" t:y="25" name="fbfriend" t:color="yellow1">
+  <t:implementation.python script="item.py"/>
+  <service name="item"/>
+  <property name="property"/>
+ </component>
+ <component t:x="233" t:y="97" name="fbfriends" t:title="facebook friends" t:color="blue1">
+  <t:implementation.python script="fbfriends.py"/>
+  <service name="fbfriends"/>
+  <reference target="find" name="id"/>
+ </component>
+ <component t:x="352" t:y="96" name="find" t:title="find by name" t:color="yellow1">
+  <t:implementation.python script="find.py"/>
+  <service name="find"/>
+  <reference target="name" name="name"/>
+  <reference target="params" name="assoc"/>
+ </component>
+ <component t:x="453" t:y="97" name="name" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>fbid</property>
+ </component>
+ <component t:x="453" t:y="138" name="params" t:title="?params" t:color="green1">
+  <t:implementation.python script="params.py"/>
+  <service name="params"/>
+  <property>fbid=1234567</property>
+ </component>
+ <component t:x="274" t:y="97" name="mile" t:title="number" t:color="orange1">
+  <t:implementation.python script="number.py"/>
+  <service name="number"/>
+  <property>1</property>
+ </component>
+ <component t:x="484" t:y="68" name="name2" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>id</property>
+ </component>
+ <component t:x="226" t:y="29" name="lesser" t:title="lt" t:color="magenta1">
+  <t:implementation.python script="lesser.py"/>
+  <service name="lesser"/>
+  <reference target="distance" name="value1"/>
+  <reference target="mile" name="value2"/>
+ </component>
+ <component t:x="378" t:y="25" name="text2" t:title="text" t:color="orange1">
+  <t:implementation.python script="text.py"/>
+  <service name="text"/>
+  <property>jane</property>
+ </component>
+ <component t:x="227" t:y="240" name="nothing" t:title="nothing" t:color="orange1">
+  <t:implementation.python script="text.py"/>
+  <service name="nothing"/>
+ </component>
+ <component t:x="132" t:y="31" name="if" t:title="if" t:color="magenta1">
+  <t:implementation.python script="if_.py"/>
+  <service name="if"/>
+  <reference target="lesser" name="condition"/>
+  <reference target="assoc" name="then"/>
+  <reference target="nothing" name="else"/>
+ </component>
+ <component t:x="600" t:y="113" name="text" t:title="text" t:color="orange1">
+  <t:implementation.python script="text.py"/>
+  <service name="text"/>
+  <property>joe</property>
+ </component>
+ <service name="opened" promote="opened"/>
+ <component t:x="0" t:y="22" name="opened" t:title="when page opened" t:color="green1">
+  <t:implementation.python script="opened.py"/>
+  <service name="opened" t:visible="false"/>
+  <reference target="if" name="content"/>
+ </component>
+ <component t:x="175" t:y="198" name="assoc" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name3" name="name"/>
+  <reference target="text3" name="value"/>
+ </component>
+ <component t:x="331" t:y="383" name="text3" t:title="text" t:color="orange1">
+  <t:implementation.python script="text.py"/>
+  <service name="text"/>
+  <property>jane</property>
+ </component>
+ <component t:x="218" t:y="195" name="name3" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>near</property>
+ </component>
+ <component t:x="216" t:y="23" name="distance" t:title="distance" t:color="red1">
+  <t:implementation.python script="distance.py"/>
+  <service name="distance"/>
+  <reference target="location" name="location1"/>
+  <reference target="location2" name="location2"/>
+ </component>
+ <component t:x="430" t:y="178" name="location" t:title="location" t:color="red1">
+  <t:implementation.python script="location.py"/>
+  <service name="location"/>
+  <reference target="text2" name="user"/>
+ </component>
+ <component t:x="429" t:y="234" name="location2" t:title="location" t:color="red1">
+  <t:implementation.python script="location.py"/>
+  <service name="location"/>
+  <reference target="text" name="user"/>
+ </component>
 </composite>

Added: tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html?rev=1074923&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme/app.html Sat Feb 26 20:59:26 2011
@@ -0,0 +1,20 @@
+<?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"/>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite Sat Feb 26 20:59:26 2011
@@ -18,106 +18,106 @@
  * 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://nearme2" name="nearme2">
-  <service name="every" promote="every"/>
-  <component t:x="0" t:y="25" name="every" t:title="every n secs" t:color="green1">
-    <t:implementation.python script="every.py"/>
-    <service name="every" t:visible="false"/>
-    <property>60</property>
-    <reference target="gtalksend" name="content"/>
-  </component>
-  <component t:x="100" t:y="25" name="gtalksend" t:title="send gtalk" t:color="blue1">
-    <t:implementation.python script="gtalksend.py"/>
-    <service name="gtalksend"/>
-    <reference target="filter" name="jid"/>
-    <reference target="user" name="to"/>
-    <reference target="text" name="msg"/>
-  </component>
-  <component t:x="184" t:y="54" name="user" t:title="user" t:color="green1">
-    <t:implementation.python script="user.py"/>
-    <service name="user"/>
-    <property name="user"/>
-  </component>
-  <component t:x="183" t:y="97" name="text" t:title="text" t:color="orange1">
-    <t:implementation.python script="text.py"/>
-    <service name="text"/>
-    <property>Hey I'm here!</property>
-  </component>
-  <component t:x="184" t:y="24" name="filter" t:title="filter" t:color="yellow1">
-    <t:implementation.python script="filter_.py"/>
-    <service name="filter"/>
-    <reference target="fbfriend" name="item"/>
-    <reference target="lesser" name="condition"/>
-    <reference target="fbfriends" name="list"/>
-  </component>
-  <component t:x="234" t:y="25" name="fbfriend" t:color="yellow1">
-    <t:implementation.python script="item.py"/>
-    <service name="item"/>
-    <property name="property"/>
-  </component>
-  <component t:x="233" t:y="97" name="fbfriends" t:title="facebook friends" t:color="blue1">
-    <t:implementation.python script="fbfriends.py"/>
-    <service name="fbfriends"/>
-    <reference target="find" name="id"/>
-  </component>
-  <component t:x="352" t:y="96" name="find" t:title="find by name" t:color="yellow1">
-    <t:implementation.python script="find.py"/>
-    <service name="find"/>
-    <reference target="name" name="name"/>
-    <reference target="params" name="assoc"/>
-  </component>
-  <component t:x="453" t:y="97" name="name" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>fbid</property>
-  </component>
-  <component t:x="453" t:y="138" name="params" t:title="?params" t:color="green1">
-    <t:implementation.python script="params.py"/>
-    <service name="params"/>
-    <property>fbid=1234567</property>
-  </component>
-  <component t:x="235" t:y="67" name="lesser" t:title="lt" t:color="magenta1">
-    <t:implementation.python script="lesser.py"/>
-    <service name="lesser"/>
-    <reference target="subtract" name="value1"/>
-    <reference target="mile" name="value2"/>
-  </component>
-  <component t:x="274" t:y="97" name="mile" t:title="number" t:color="orange1">
-    <t:implementation.python script="number.py"/>
-    <service name="number"/>
-    <property>1</property>
-  </component>
-  <component t:x="274" t:y="67" name="subtract" t:title="-" t:color="magenta1">
-    <t:implementation.python script="subtract.py"/>
-    <service name="subtract">
-      <documentation>-</documentation>
-    </service>
-    <reference target="location" name="value1"/>
-    <reference target="location2" name="value2"/>
-  </component>
-  <component t:x="316" t:y="68" name="location" t:title="location" t:color="red1">
-    <t:implementation.python script="location.py"/>
-    <service name="location"/>
-    <reference target="find2" name="user"/>
-  </component>
-  <component t:x="316" t:y="122" name="location2" t:title="location" t:color="red1">
-    <t:implementation.python script="location.py"/>
-    <service name="location"/>
-    <reference target="user2" name="user"/>
-  </component>
-  <component t:x="386" t:y="118" name="user2" t:title="user" t:color="green1">
-    <t:implementation.python script="user.py"/>
-    <service name="user"/>
-    <property name="user"/>
-  </component>
-  <component t:x="386" t:y="69" name="find2" t:title="find by name" t:color="yellow1">
-    <t:implementation.python script="find.py"/>
-    <service name="find"/>
-    <reference target="name2" name="name"/>
-    <reference target="fbfriend" name="assoc"/>
-  </component>
-  <component t:x="484" t:y="68" name="name2" t:title="name" t:color="orange1">
-    <t:implementation.python script="name.py"/>
-    <service name="name"/>
-    <property>id</property>
-  </component>
+ <service name="every" promote="every"/>
+ <component t:x="0" t:y="25" name="every" t:title="every n secs" t:color="green1">
+  <t:implementation.python script="every.py"/>
+  <service name="every" t:visible="false"/>
+  <property>60</property>
+  <reference target="gtalksend" name="content"/>
+ </component>
+ <component t:x="100" t:y="25" name="gtalksend" t:title="send gtalk" t:color="blue1">
+  <t:implementation.python script="gtalksend.py"/>
+  <service name="gtalksend"/>
+  <reference target="filter" name="jid"/>
+  <reference target="user" name="to"/>
+  <reference target="text" name="msg"/>
+ </component>
+ <component t:x="184" t:y="54" name="user" t:title="user" t:color="green1">
+  <t:implementation.python script="user.py"/>
+  <service name="user"/>
+  <property name="user"/>
+ </component>
+ <component t:x="183" t:y="97" name="text" t:title="text" t:color="orange1">
+  <t:implementation.python script="text.py"/>
+  <service name="text"/>
+  <property>Hey I'm here!</property>
+ </component>
+ <component t:x="184" t:y="24" name="filter" t:title="filter" t:color="yellow1">
+  <t:implementation.python script="filter_.py"/>
+  <service name="filter"/>
+  <reference target="fbfriend" name="item"/>
+  <reference target="lesser" name="condition"/>
+  <reference target="fbfriends" name="list"/>
+ </component>
+ <component t:x="234" t:y="25" name="fbfriend" t:color="yellow1">
+  <t:implementation.python script="item.py"/>
+  <service name="item"/>
+  <property name="property"/>
+ </component>
+ <component t:x="233" t:y="97" name="fbfriends" t:title="facebook friends" t:color="blue1">
+  <t:implementation.python script="fbfriends.py"/>
+  <service name="fbfriends"/>
+  <reference target="find" name="id"/>
+ </component>
+ <component t:x="352" t:y="96" name="find" t:title="find by name" t:color="yellow1">
+  <t:implementation.python script="find.py"/>
+  <service name="find"/>
+  <reference target="name" name="name"/>
+  <reference target="params" name="assoc"/>
+ </component>
+ <component t:x="453" t:y="97" name="name" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>fbid</property>
+ </component>
+ <component t:x="453" t:y="138" name="params" t:title="?params" t:color="green1">
+  <t:implementation.python script="params.py"/>
+  <service name="params"/>
+  <property>fbid=1234567</property>
+ </component>
+ <component t:x="235" t:y="67" name="lesser" t:title="lt" t:color="magenta1">
+  <t:implementation.python script="lesser.py"/>
+  <service name="lesser"/>
+  <reference target="subtract" name="value1"/>
+  <reference target="mile" name="value2"/>
+ </component>
+ <component t:x="274" t:y="97" name="mile" t:title="number" t:color="orange1">
+  <t:implementation.python script="number.py"/>
+  <service name="number"/>
+  <property>1</property>
+ </component>
+ <component t:x="274" t:y="67" name="subtract" t:title="-" t:color="magenta1">
+  <t:implementation.python script="subtract.py"/>
+  <service name="subtract">
+   <documentation>-</documentation>
+  </service>
+  <reference target="location" name="value1"/>
+  <reference target="location2" name="value2"/>
+ </component>
+ <component t:x="316" t:y="68" name="location" t:title="location" t:color="red1">
+  <t:implementation.python script="location.py"/>
+  <service name="location"/>
+  <reference target="find2" name="user"/>
+ </component>
+ <component t:x="316" t:y="122" name="location2" t:title="location" t:color="red1">
+  <t:implementation.python script="location.py"/>
+  <service name="location"/>
+  <reference target="user2" name="user"/>
+ </component>
+ <component t:x="386" t:y="118" name="user2" t:title="user" t:color="green1">
+  <t:implementation.python script="user.py"/>
+  <service name="user"/>
+  <property name="user"/>
+ </component>
+ <component t:x="386" t:y="69" name="find2" t:title="find by name" t:color="yellow1">
+  <t:implementation.python script="find.py"/>
+  <service name="find"/>
+  <reference target="name2" name="name"/>
+  <reference target="fbfriend" name="assoc"/>
+ </component>
+ <component t:x="484" t:y="68" name="name2" t:title="name" t:color="orange1">
+  <t:implementation.python script="name.py"/>
+  <service name="name"/>
+  <property>id</property>
+ </component>
 </composite>

Added: tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.html?rev=1074923&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.html (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/nearme2/app.html Sat Feb 26 20:59:26 2011
@@ -0,0 +1,20 @@
+<?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"/>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/store/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/store/app.composite?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/store/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/store/app.composite Sat Feb 26 20:59:26 2011
@@ -17,54 +17,44 @@
  * 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://store"
-  name="store">
-
-    <service name="Store" promote="Store"/>
-    <service name="ShoppingCart" promote="ShoppingCart"/>
-
-    <component name="Store" t:color="green1">
-        <t:implementation.python script="store.py"/>
-        <service name="Widget">
-            <t:binding.http uri="store"/>
-        </service>
-        <reference name="catalog" target="Catalog"/>
-        <reference name="shoppingCart" target="ShoppingCart"/>
-        <reference name="shoppingTotal" target="ShoppingCart"/>
-    </component>
-    
-    <component name="Catalog" t:color="yellow1">
-        <t:implementation.python script="fruits-catalog.py"/> 
-        <property name="currencyCode">USD</property>
-        <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
-        </service>
-        <reference name="currencyConverter" target="CurrencyConverter"/>
-    </component> 
-     
-    <component name="ShoppingCart" t:color="magenta1">
-        <t:implementation.python script="shopping-cart.py"/>
-        <service name="ShoppingCart">
-            <t:binding.http uri="shoppingCart"/>
-        </service>        
-        <reference name="cache" target="Cache"/>
-    </component>
-    
-    <component name="CurrencyConverter" t:color="blue1">
-        <t:implementation.python script="currency-converter.py"/>
-        <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
-        </service>        
-    </component>     
-
-    <component name="Cache" t:color="orange1">
-        <implementation.cpp path="../../components/cache" library="libmemcache"/>
-        <service name="Cache">
-            <t:binding.atom uri="cache"/>
-        </service>
-        <property name="servers">localhost:11211</property>
-    </component>     
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://store" name="store">
+ <service name="Store" promote="Store"/>
+ <service name="ShoppingCart" promote="ShoppingCart"/>
+ <component name="Store" t:color="green1">
+  <t:implementation.python script="store.py"/>
+  <service name="Widget">
+   <t:binding.http uri="store"/>
+  </service>
+  <reference name="catalog" target="Catalog"/>
+  <reference name="shoppingCart" target="ShoppingCart"/>
+  <reference name="shoppingTotal" target="ShoppingCart"/>
+ </component>
+ <component name="Catalog" t:color="yellow1">
+  <t:implementation.python script="fruits-catalog.py"/>
+  <property>USD</property>
+  <service name="Catalog">
+   <t:binding.jsonrpc uri="catalog"/>
+  </service>
+  <reference name="currencyConverter" target="CurrencyConverter"/>
+ </component>
+ <component name="ShoppingCart" t:color="magenta1">
+  <t:implementation.python script="shopping-cart.py"/>
+  <service name="ShoppingCart">
+   <t:binding.http uri="shoppingCart"/>
+  </service>
+  <reference name="cache" target="Cache"/>
+ </component>
+ <component name="CurrencyConverter" t:color="blue1">
+  <t:implementation.python script="currency-converter.py"/>
+  <service name="CurrencyConverter">
+   <t:binding.jsonrpc uri="currencyConverter"/>
+  </service>
+ </component>
+ <component name="Cache" t:color="orange1">
+  <implementation.cpp path="../../components/cache" library="libmemcache"/>
+  <service name="Cache">
+   <t:binding.atom uri="cache"/>
+  </service>
+  <property>localhost:11211</property>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/store/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/store/app.html?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/store/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/store/app.html Sat Feb 26 20:59:26 2011
@@ -1,32 +1,47 @@
+<?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.    
+ * 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="storeh1" class="h1" style="position:absolute; left: 0px; top: 0px"><h1>Store</h1></span>
-<span id="catalogh2" class="h2" style="position:absolute; left: 0px; top: 40px"><h2>Catalog</h2></span>
-<span id="addToCart" class="button" style="position:absolute; left: 0px; top: 160px"><input type="button" value="Add to Cart"/></span>
-  
-<span id="carth2" class="h2" style="position:absolute; left: 0px; top: 200px"><h2>Your Shopping Cart</h2></span>
-<span id="total" class="text" style="position:absolute; left: 0px; top: 300px"><span>total</span></span>
-
-<span id="checkout" class="button" style="position:absolute; left: 0px; top: 340px"><input type="button" value="Checkout"/></span>
-<span id="empty" class="button" style="position:absolute; left: 120px; top: 340px"><input type="button" value="Empty"/></span>
-<span id="feed" class="link" style="position:absolute; left: 240px; top: 340px"><a href="shoppingCart/"><span>(feed)</span></a></span>
-
-</div>
+<DIV id="page">
+ <SPAN id="storeh1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+  <H1>Store</H1>
+ </SPAN>
+ <SPAN id="catalogh2" class="h2" style="position: absolute; top: 40px; left: 0px; ">
+  <H2>Catalog</H2>
+ </SPAN>
+ <SPAN id="addToCart" class="button" style="position: absolute; top: 160px; left: 0px; ">
+  <INPUT type="button" value="Add to Cart"/>
+ </SPAN>
+ <SPAN id="carth2" class="h2" style="position: absolute; top: 200px; left: 0px; ">
+  <H2>Your Shopping Cart</H2>
+ </SPAN>
+ <SPAN id="total" class="text" style="position: absolute; top: 300px; left: 0px; ">
+  <SPAN>total</SPAN>
+ </SPAN>
+ <SPAN id="checkout" class="button" style="position: absolute; top: 340px; left: 0px; ">
+  <INPUT type="button" value="Checkout"/>
+ </SPAN>
+ <SPAN id="empty" class="button" style="position: absolute; top: 340px; left: 120px; ">
+  <INPUT type="button" value="Empty"/>
+ </SPAN>
+ <SPAN id="feed" class="link" style="position: absolute; top: 340px; left: 240px; ">
+  <A href="shoppingCart/">
+   <SPAN>(feed)</SPAN>
+  </A>
+ </SPAN>
+</DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.composite?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.composite Sat Feb 26 20:59:26 2011
@@ -17,54 +17,44 @@
  * 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://store"
-  name="store">
-
-    <service name="Store" promote="Store"/>
-    <service name="ShoppingCart" promote="ShoppingCart"/>
-
-    <component name="Store" t:color="green1">
-        <t:implementation.python script="store.py"/>
-        <service name="Widget">
-            <t:binding.http uri="store"/>
-        </service>
-        <reference name="catalog" target="Catalog" t:align="bottom"/>
-        <reference name="shoppingCart" target="ShoppingCart"/>
-        <reference name="shoppingTotal" target="ShoppingCart"/>
-    </component>
-    
-    <component name="Catalog" t:color="yellow1">
-        <t:implementation.python script="fruits-catalog.py"/> 
-        <property name="currencyCode">USD</property>
-        <service name="Catalog" t:align="top">
-            <t:binding.jsonrpc uri="catalog"/>
-        </service>
-        <reference name="currencyConverter" t:align="bottom" target="CurrencyConverter"/>
-    </component> 
-     
-    <component name="ShoppingCart" t:color="magenta1">
-        <t:implementation.python script="shopping-cart.py"/>
-        <service name="ShoppingCart">
-            <t:binding.http uri="shoppingCart"/>
-        </service>        
-        <reference name="cache" target="Cache"/>
-    </component>
-    
-    <component name="CurrencyConverter" t:color="blue1">
-        <t:implementation.python script="currency-converter.py"/>
-        <service name="CurrencyConverter" t:align="top">
-            <t:binding.jsonrpc uri="currencyConverter"/>
-        </service>        
-    </component>     
-
-    <component name="Cache" t:color="orange1">
-        <implementation.cpp path="../../components/cache" library="libmemcache"/>
-        <service name="Cache">
-            <t:binding.atom uri="cache"/>
-        </service>
-        <property name="servers">localhost:11211</property>
-    </component>     
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://store" name="store">
+ <service name="Store" promote="Store"/>
+ <service name="ShoppingCart" promote="ShoppingCart"/>
+ <component name="Store" t:color="green1">
+  <t:implementation.python script="store.py"/>
+  <service name="Widget">
+   <t:binding.http uri="store"/>
+  </service>
+  <reference name="catalog" target="Catalog" t:align="bottom"/>
+  <reference name="shoppingCart" target="ShoppingCart"/>
+  <reference name="shoppingTotal" target="ShoppingCart"/>
+ </component>
+ <component name="Catalog" t:color="yellow1">
+  <t:implementation.python script="fruits-catalog.py"/>
+  <property>USD</property>
+  <service name="Catalog" t:align="top">
+   <t:binding.jsonrpc uri="catalog"/>
+  </service>
+  <reference name="currencyConverter" t:align="bottom" target="CurrencyConverter"/>
+ </component>
+ <component name="ShoppingCart" t:color="magenta1">
+  <t:implementation.python script="shopping-cart.py"/>
+  <service name="ShoppingCart">
+   <t:binding.http uri="shoppingCart"/>
+  </service>
+  <reference name="cache" target="Cache"/>
+ </component>
+ <component name="CurrencyConverter" t:color="blue1">
+  <t:implementation.python script="currency-converter.py"/>
+  <service name="CurrencyConverter" t:align="top">
+   <t:binding.jsonrpc uri="currencyConverter"/>
+  </service>
+ </component>
+ <component name="Cache" t:color="orange1">
+  <implementation.cpp path="../../components/cache" library="libmemcache"/>
+  <service name="Cache">
+   <t:binding.atom uri="cache"/>
+  </service>
+  <property>localhost:11211</property>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.html?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/store2/app.html Sat Feb 26 20:59:26 2011
@@ -1,32 +1,47 @@
+<?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.    
+ * 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="storeh1" class="h1" style="position:absolute; left: 0px; top: 0px"><h1>Store</h1></span>
-<span id="catalogh2" class="h2" style="position:absolute; left: 0px; top: 40px"><h2>Catalog</h2></span>
-<span id="addToCart" class="button" style="position:absolute; left: 0px; top: 160px"><input type="button" value="Add to Cart"/></span>
-  
-<span id="carth2" class="h2" style="position:absolute; left: 0px; top: 200px"><h2>Your Shopping Cart</h2></span>
-<span id="total" class="text" style="position:absolute; left: 0px; top: 300px"><span>total</span></span>
-
-<span id="checkout" class="button" style="position:absolute; left: 0px; top: 340px"><input type="button" value="Checkout"/></span>
-<span id="empty" class="button" style="position:absolute; left: 120px; top: 340px"><input type="button" value="Empty"/></span>
-<span id="feed" class="link" style="position:absolute; left: 240px; top: 340px"><a href="shoppingCart/"><span>(feed)</span></a></span>
-
-</div>
+<DIV id="page">
+ <SPAN id="storeh1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+  <H1>Store</H1>
+ </SPAN>
+ <SPAN id="catalogh2" class="h2" style="position: absolute; top: 40px; left: 0px; ">
+  <H2>Catalog</H2>
+ </SPAN>
+ <SPAN id="addToCart" class="button" style="position: absolute; top: 160px; left: 0px; ">
+  <INPUT type="button" value="Add to Cart"/>
+ </SPAN>
+ <SPAN id="carth2" class="h2" style="position: absolute; top: 200px; left: 0px; ">
+  <H2>Your Shopping Cart</H2>
+ </SPAN>
+ <SPAN id="total" class="text" style="position: absolute; top: 300px; left: 0px; ">
+  <SPAN>total</SPAN>
+ </SPAN>
+ <SPAN id="checkout" class="button" style="position: absolute; top: 340px; left: 0px; ">
+  <INPUT type="button" value="Checkout"/>
+ </SPAN>
+ <SPAN id="empty" class="button" style="position: absolute; top: 340px; left: 120px; ">
+  <INPUT type="button" value="Empty"/>
+ </SPAN>
+ <SPAN id="feed" class="link" style="position: absolute; top: 340px; left: 240px; ">
+  <A href="shoppingCart/">
+   <SPAN>(feed)</SPAN>
+  </A>
+ </SPAN>
+</DIV>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.composite?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.composite (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.composite Sat Feb 26 20:59:26 2011
@@ -17,54 +17,44 @@
  * 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://store"
-  name="store">
-
-    <service name="Store" promote="Store"/>
-    <service name="ShoppingCart" promote="ShoppingCart"/>
-
-    <component name="Store" t:color="green1">
-        <t:implementation.python script="store.py"/>
-        <service name="Widget">
-            <t:binding.http uri="store"/>
-        </service>
-        <reference name="catalog" target="Catalog"/>
-        <reference name="shoppingCart" target="ShoppingCart"/>
-        <reference name="shoppingTotal" target="ShoppingCart"/>
-    </component>
-    
-    <component name="Catalog" t:color="yellow1">
-        <t:implementation.python script="fruits-catalog.py"/> 
-        <property name="currencyCode">USD</property>
-        <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
-        </service>
-        <reference name="currencyConverter" t:align="bottom" target="CurrencyConverter"/>
-    </component> 
-     
-    <component name="ShoppingCart" t:color="magenta1">
-        <t:implementation.python script="shopping-cart.py"/>
-        <service name="ShoppingCart">
-            <t:binding.http uri="shoppingCart"/>
-        </service>        
-        <reference name="cache" target="Cache"/>
-    </component>
-    
-    <component name="CurrencyConverter" t:color="blue1">
-        <t:implementation.python script="currency-converter.py"/>
-        <service name="CurrencyConverter" t:align="top">
-            <t:binding.jsonrpc uri="currencyConverter"/>
-        </service>        
-    </component>     
-
-    <component name="Cache" t:color="orange1">
-        <implementation.cpp path="../../components/cache" library="libmemcache"/>
-        <service name="Cache">
-            <t:binding.atom uri="cache"/>
-        </service>
-        <property name="servers">localhost:11211</property>
-    </component>     
-
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://store" name="store">
+ <service name="Store" promote="Store"/>
+ <service name="ShoppingCart" promote="ShoppingCart"/>
+ <component name="Store" t:color="green1">
+  <t:implementation.python script="store.py"/>
+  <service name="Widget">
+   <t:binding.http uri="store"/>
+  </service>
+  <reference name="catalog" target="Catalog"/>
+  <reference name="shoppingCart" target="ShoppingCart"/>
+  <reference name="shoppingTotal" target="ShoppingCart"/>
+ </component>
+ <component name="Catalog" t:color="yellow1">
+  <t:implementation.python script="fruits-catalog.py"/>
+  <property>USD</property>
+  <service name="Catalog">
+   <t:binding.jsonrpc uri="catalog"/>
+  </service>
+  <reference name="currencyConverter" t:align="bottom" target="CurrencyConverter"/>
+ </component>
+ <component name="ShoppingCart" t:color="magenta1">
+  <t:implementation.python script="shopping-cart.py"/>
+  <service name="ShoppingCart">
+   <t:binding.http uri="shoppingCart"/>
+  </service>
+  <reference name="cache" target="Cache"/>
+ </component>
+ <component name="CurrencyConverter" t:color="blue1">
+  <t:implementation.python script="currency-converter.py"/>
+  <service name="CurrencyConverter" t:align="top">
+   <t:binding.jsonrpc uri="currencyConverter"/>
+  </service>
+ </component>
+ <component name="Cache" t:color="orange1">
+  <implementation.cpp path="../../components/cache" library="libmemcache"/>
+  <service name="Cache">
+   <t:binding.atom uri="cache"/>
+  </service>
+  <property>localhost:11211</property>
+ </component>
 </composite>

Modified: tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.html?rev=1074923&r1=1074922&r2=1074923&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.html (original)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/store3/app.html Sat Feb 26 20:59:26 2011
@@ -1,32 +1,47 @@
+<?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.    
+ * 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="storeh1" class="h1" style="position:absolute; left: 0px; top: 0px"><h1>Store</h1></span>
-<span id="catalogh2" class="h2" style="position:absolute; left: 0px; top: 40px"><h2>Catalog</h2></span>
-<span id="addToCart" class="button" style="position:absolute; left: 0px; top: 160px"><input type="button" value="Add to Cart"/></span>
-  
-<span id="carth2" class="h2" style="position:absolute; left: 0px; top: 200px"><h2>Your Shopping Cart</h2></span>
-<span id="total" class="text" style="position:absolute; left: 0px; top: 300px"><span>total</span></span>
-
-<span id="checkout" class="button" style="position:absolute; left: 0px; top: 340px"><input type="button" value="Checkout"/></span>
-<span id="empty" class="button" style="position:absolute; left: 120px; top: 340px"><input type="button" value="Empty"/></span>
-<span id="feed" class="link" style="position:absolute; left: 240px; top: 340px"><a href="shoppingCart/"><span>(feed)</span></a></span>
-
-</div>
+<DIV id="page">
+ <SPAN id="storeh1" class="h1" style="position: absolute; top: 0px; left: 0px; ">
+  <H1>Store</H1>
+ </SPAN>
+ <SPAN id="catalogh2" class="h2" style="position: absolute; top: 40px; left: 0px; ">
+  <H2>Catalog</H2>
+ </SPAN>
+ <SPAN id="addToCart" class="button" style="position: absolute; top: 160px; left: 0px; ">
+  <INPUT type="button" value="Add to Cart"/>
+ </SPAN>
+ <SPAN id="carth2" class="h2" style="position: absolute; top: 200px; left: 0px; ">
+  <H2>Your Shopping Cart</H2>
+ </SPAN>
+ <SPAN id="total" class="text" style="position: absolute; top: 300px; left: 0px; ">
+  <SPAN>total</SPAN>
+ </SPAN>
+ <SPAN id="checkout" class="button" style="position: absolute; top: 340px; left: 0px; ">
+  <INPUT type="button" value="Checkout"/>
+ </SPAN>
+ <SPAN id="empty" class="button" style="position: absolute; top: 340px; left: 120px; ">
+  <INPUT type="button" value="Empty"/>
+ </SPAN>
+ <SPAN id="feed" class="link" style="position: absolute; top: 340px; left: 240px; ">
+  <A href="shoppingCart/">
+   <SPAN>(feed)</SPAN>
+  </A>
+ </SPAN>
+</DIV>

Added: tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite?rev=1074923&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/test/app.composite Sat Feb 26 20:59:26 2011
@@ -0,0 +1,20 @@
+<?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://test" name="test"/>

Added: tuscany/sca-cpp/trunk/modules/edit/apps/test/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/test/app.html?rev=1074923&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/test/app.html (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/test/app.html Sat Feb 26 20:59:26 2011
@@ -0,0 +1,20 @@
+<?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"/>

Added: tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite?rev=1074923&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite Sat Feb 26 20:59:26 2011
@@ -0,0 +1,55 @@
+<?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://testlogic" name="testlogic">
+ <service name="if" promote="if"/>
+ <component t:x="34" t:y="24" name="if" t:title="if" t:color="magenta1">
+  <t:implementation.python script="nuvem/if_.py"/>
+  <service name="if"/>
+  <reference target="greater" name="condition"/>
+  <reference target="text" name="then"/>
+  <reference target="text2" name="else"/>
+ </component>
+ <component t:x="123" t:y="21" name="item" t:title="item" t:color="yellow1">
+  <t:implementation.python script="nuvem/item.py"/>
+  <service name="item"/>
+  <property>item</property>
+ </component>
+ <component t:x="75" t:y="24" name="greater" t:title="gt" t:color="magenta1">
+  <t:implementation.python script="nuvem/greater.py"/>
+  <service name="greater"/>
+  <reference target="item" name="value1"/>
+  <reference target="number" name="value2"/>
+ </component>
+ <component t:x="118" t:y="66" name="number" t:title="number" 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">
+  <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">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>not greater than 5</property>
+ </component>
+</composite>

Added: tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.html?rev=1074923&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.html (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testlogic/app.html Sat Feb 26 20:59:26 2011
@@ -0,0 +1,20 @@
+<?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"/>

Added: tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite?rev=1074923&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite Sat Feb 26 20:59:26 2011
@@ -0,0 +1,100 @@
+<?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://testsocial" name="testsocial">
+ <component t:x="317" t:y="44" 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="166" t:y="52" 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="111" t:y="18" 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="187" t:y="155" 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="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="68" t:y="350" name="list" t:title="make list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="assoc" name="first"/>
+  <reference target="list2" name="rest"/>
+ </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"/>
+  <property>me360</property>
+ </component>
+ <component t:x="131" t:y="12" name="me360" t:title="assoc" t:color="orange1">
+  <t:implementation.python script="nuvem/assoc.py"/>
+  <service name="assoc"/>
+  <reference target="name3" name="name"/>
+  <reference target="list" name="value"/>
+ </component>
+ <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>
+  <reference target="me360" name="content"/>
+ </component>
+ <component t:x="269" t:y="163" name="list2" t:title="make list" t:color="yellow1">
+  <t:implementation.python script="nuvem/list_.py"/>
+  <service name="list"/>
+  <reference target="assoc2" name="first"/>
+  <reference name="rest"/>
+ </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"/>
+  <property>jsdelfino</property>
+ </component>
+ <component t:x="410" t:y="205" name="twprofile" t:title="twitter profile" t:color="blue1">
+  <t:implementation.python script="nuvem/twprofile.py"/>
+  <service name="twprofile"/>
+  <reference target="text3" name="id"/>
+  <reference name="tw" t:visible="false">
+   <t:binding.http uri="http://api.twitter.com/1/users/show.json"/>
+  </reference>
+ </component>
+</composite>

Added: tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html?rev=1074923&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html (added)
+++ tuscany/sca-cpp/trunk/modules/edit/apps/testsocial/app.html Sat Feb 26 20:59:26 2011
@@ -0,0 +1,20 @@
+<?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"/>