summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/hosting/server/data
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-01-30 15:56:11 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-01-30 15:56:11 +0000
commitf4c4803ce0c14585e3c2af3641d94b651877e04c (patch)
tree9f10df32f2d34a3c697aaee897bad0b180922095 /sca-cpp/trunk/hosting/server/data
parent1b10f18fce6baeb721a725661ded630614831304 (diff)
Refactor server hosting module, rename it and move it under a hosting dir, and refactor its datastore components into a single component.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1237740 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rwxr-xr-xsca-cpp/trunk/hosting/server/data-backup (renamed from sca-cpp/trunk/modules/edit/data-backup)2
-rw-r--r--sca-cpp/trunk/hosting/server/data/accounts/jane@localhost/user.account (renamed from sca-cpp/trunk/modules/edit/accounts/jane@localhost/user.account)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/accounts/jane@sca-store.com/user.account (renamed from sca-cpp/trunk/modules/edit/accounts/jane@sca-store.com/user.account)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/accounts/john@localhost/user.account (renamed from sca-cpp/trunk/modules/edit/accounts/john@localhost/user.account)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/accounts/john@sca-store.com/user.account (renamed from sca-cpp/trunk/modules/edit/accounts/john@sca-store.com/user.account)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/me360/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/me360/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/me360/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/me360/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/me360/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/nearme/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/nearme/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/nearme/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/nearme/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/nearme/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/nearme2/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/nearme2/app.composite)6
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/nearme2/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/nearme2/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/nearme2/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/new/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/new/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/new/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/new/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/new/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/ourphotos/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/ourphotos/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/shoppingcart/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite)6
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/shoppingcart/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/shoppingcart/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/shoppingcart/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/slice/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/slice/app.composite)8
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/slice/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/slice/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/slice/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/test/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/test/app.composite)18
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/test/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/test/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/test/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testanimation/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testanimation/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testanimation/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testanimation/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testanimation/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testanimation/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testdb/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testdb/app.composite)6
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testdb/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testdb/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testdb/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testevents/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testevents/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testevents/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testevents/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testevents/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testhttp/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testhttp/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testhttp/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testhttp/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testhttp/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testlogic/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testlogic/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testlogic/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testlogic/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testlogic/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testsearch/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testsearch/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testsearch/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testsearch/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testsearch/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testsms/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testsms/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testsms/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testsms/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testsms/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testsms/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testsocial/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testsocial/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testsocial/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testsocial/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testsocial/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testtext/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testtext/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testtext/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testtext/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testtext/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testurl/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testurl/app.composite)26
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testurl/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testurl/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testurl/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testvalues/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testvalues/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testvalues/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testvalues/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testvalues/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testwidgets/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testwidgets/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testwidgets/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testwidgets/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testwidgets2/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testwidgets2/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/testwidgets3/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/testwidgets3/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/testwidgets3/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/twsms/app.composite (renamed from sca-cpp/trunk/modules/edit/apps/twsms/app.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/twsms/app.stats (renamed from sca-cpp/trunk/modules/edit/apps/twsms/app.stats)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/apps/twsms/htdocs/app.html (renamed from sca-cpp/trunk/modules/edit/apps/twsms/htdocs/app.html)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/dashboards/jane@localhost/user.apps (renamed from sca-cpp/trunk/modules/edit/dashboards/jane@localhost/user.apps)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/dashboards/jane@sca-store.com/user.apps (renamed from sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com/user.apps)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/dashboards/john@localhost/user.apps (renamed from sca-cpp/trunk/modules/edit/dashboards/john@localhost/user.apps)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/dashboards/john@sca-store.com/user.apps (renamed from sca-cpp/trunk/modules/edit/dashboards/john@sca-store.com/user.apps)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/animation/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/animation/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/control/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/control/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/database/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/database/palette.composite)6
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/http/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/http/palette.composite)32
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/lists/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/lists/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/logic/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/logic/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/math/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/math/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/python/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/python/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/search/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/search/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/social/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/social/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/talk/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/talk/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/text/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/text/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/transform/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/transform/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/palettes/values/palette.composite (renamed from sca-cpp/trunk/modules/edit/palettes/values/palette.composite)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/store/all/store.apps (renamed from sca-cpp/trunk/modules/edit/store/all/store.apps)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/store/featured/store.apps (renamed from sca-cpp/trunk/modules/edit/store/featured/store.apps)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/store/new/store.apps (renamed from sca-cpp/trunk/modules/edit/store/new/store.apps)0
-rw-r--r--sca-cpp/trunk/hosting/server/data/store/top/store.apps (renamed from sca-cpp/trunk/modules/edit/store/top/store.apps)0
96 files changed, 43 insertions, 67 deletions
diff --git a/sca-cpp/trunk/modules/edit/data-backup b/sca-cpp/trunk/hosting/server/data-backup
index 18cba8fbbe..f66e947f84 100755
--- a/sca-cpp/trunk/modules/edit/data-backup
+++ b/sca-cpp/trunk/hosting/server/data-backup
@@ -18,5 +18,5 @@
# under the License.
cd ../../
-tar czf ../data-backup.tar.gz modules/edit/accounts modules/edit/apps modules/edit/dashboards modules/edit/store modules/edit/tmp/appdata
+tar czf ../data-backup.tar.gz hosting/server/data
diff --git a/sca-cpp/trunk/modules/edit/accounts/jane@localhost/user.account b/sca-cpp/trunk/hosting/server/data/accounts/jane@localhost/user.account
index 5fca389f04..5fca389f04 100644
--- a/sca-cpp/trunk/modules/edit/accounts/jane@localhost/user.account
+++ b/sca-cpp/trunk/hosting/server/data/accounts/jane@localhost/user.account
diff --git a/sca-cpp/trunk/modules/edit/accounts/jane@sca-store.com/user.account b/sca-cpp/trunk/hosting/server/data/accounts/jane@sca-store.com/user.account
index e0d25671b6..e0d25671b6 100644
--- a/sca-cpp/trunk/modules/edit/accounts/jane@sca-store.com/user.account
+++ b/sca-cpp/trunk/hosting/server/data/accounts/jane@sca-store.com/user.account
diff --git a/sca-cpp/trunk/modules/edit/accounts/john@localhost/user.account b/sca-cpp/trunk/hosting/server/data/accounts/john@localhost/user.account
index 35d6f30f0b..35d6f30f0b 100644
--- a/sca-cpp/trunk/modules/edit/accounts/john@localhost/user.account
+++ b/sca-cpp/trunk/hosting/server/data/accounts/john@localhost/user.account
diff --git a/sca-cpp/trunk/modules/edit/accounts/john@sca-store.com/user.account b/sca-cpp/trunk/hosting/server/data/accounts/john@sca-store.com/user.account
index 273335e1c7..273335e1c7 100644
--- a/sca-cpp/trunk/modules/edit/accounts/john@sca-store.com/user.account
+++ b/sca-cpp/trunk/hosting/server/data/accounts/john@sca-store.com/user.account
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.composite b/sca-cpp/trunk/hosting/server/data/apps/me360/app.composite
index c0fb6a425c..c0fb6a425c 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/me360/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.stats b/sca-cpp/trunk/hosting/server/data/apps/me360/app.stats
index a46c727280..a46c727280 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/me360/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/me360/htdocs/app.html
index e57e246328..e57e246328 100644
--- a/sca-cpp/trunk/modules/edit/apps/me360/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/me360/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite b/sca-cpp/trunk/hosting/server/data/apps/nearme/app.composite
index 51fc2791fb..51fc2791fb 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/app.stats b/sca-cpp/trunk/hosting/server/data/apps/nearme/app.stats
index a072636788..a072636788 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/nearme/htdocs/app.html
index fba4b0464c..fba4b0464c 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite b/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.composite
index d75af57321..8038387e4a 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme2/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.composite
@@ -36,19 +36,19 @@
<component x="120" y="10" name="filedb2" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="410" y="260" name="filedb4" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="400" y="370" name="filedb5" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="270" y="260" name="get3" title="get" color="pink1">
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats b/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.stats
index 9eb239d22c..9eb239d22c 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme2/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme2/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/nearme2/htdocs/app.html
index a4c407a7a4..a4c407a7a4 100644
--- a/sca-cpp/trunk/modules/edit/apps/nearme2/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/nearme2/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/new/app.composite b/sca-cpp/trunk/hosting/server/data/apps/new/app.composite
index 4beacfdf77..4beacfdf77 100644
--- a/sca-cpp/trunk/modules/edit/apps/new/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/new/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/new/app.stats b/sca-cpp/trunk/hosting/server/data/apps/new/app.stats
index 513c902468..513c902468 100644
--- a/sca-cpp/trunk/modules/edit/apps/new/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/new/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/new/htdocs/app.html
index eeb7becae5..eeb7becae5 100644
--- a/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/new/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.composite
index 2a7ce11f1f..2a7ce11f1f 100644
--- a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.stats b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.stats
index e685d930dd..e685d930dd 100644
--- a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/htdocs/app.html
index 1ddb89fa30..1ddb89fa30 100644
--- a/sca-cpp/trunk/modules/edit/apps/ourphotos/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/hosting/server/data/apps/shoppingcart/app.composite
index 15da95cdcc..230004315d 100644
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/shoppingcart/app.composite
@@ -169,19 +169,19 @@
<component name="filedb" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component name="filedb2" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component name="filedb3" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="130" y="420" name="format1" title="format" color="cyan1">
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.stats b/sca-cpp/trunk/hosting/server/data/apps/shoppingcart/app.stats
index 4529005b54..4529005b54 100644
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/shoppingcart/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/shoppingcart/htdocs/app.html
index 0464f3e4c4..0464f3e4c4 100644
--- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/shoppingcart/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/slice/app.composite b/sca-cpp/trunk/hosting/server/data/apps/slice/app.composite
index 9680b52008..714629767b 100644
--- a/sca-cpp/trunk/modules/edit/apps/slice/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/slice/app.composite
@@ -85,25 +85,25 @@
<component x="240" y="100" name="filedb1" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="270" y="150" name="filedb2" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="890" y="350" name="filedb3" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="1100" y="190" name="filedb4" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="710" y="160" name="frames1" title="frames" color="white1">
diff --git a/sca-cpp/trunk/modules/edit/apps/slice/app.stats b/sca-cpp/trunk/hosting/server/data/apps/slice/app.stats
index c7d1996716..c7d1996716 100644
--- a/sca-cpp/trunk/modules/edit/apps/slice/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/slice/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/slice/htdocs/app.html
index b4bc5908f6..b4bc5908f6 100644
--- a/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/slice/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.composite b/sca-cpp/trunk/hosting/server/data/apps/test/app.composite
index 83a9c51e80..8fd7505562 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/test/app.composite
@@ -1,22 +1,4 @@
<?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" name="app" targetNamespace="http://app">
<service name="comment1" promote="comment1"/>
<service name="start1" promote="start1"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/test/app.stats b/sca-cpp/trunk/hosting/server/data/apps/test/app.stats
index 9adad8c1a6..9adad8c1a6 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/test/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/test/htdocs/app.html
index d33d4d6da7..d33d4d6da7 100644
--- a/sca-cpp/trunk/modules/edit/apps/test/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/test/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testanimation/app.composite
index 5c8ebd59f3..5c8ebd59f3 100644
--- a/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testanimation/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testanimation/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testanimation/app.stats
index 493ef39d1a..493ef39d1a 100644
--- a/sca-cpp/trunk/modules/edit/apps/testanimation/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testanimation/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testanimation/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testanimation/htdocs/app.html
index c9f9420eb0..c9f9420eb0 100644
--- a/sca-cpp/trunk/modules/edit/apps/testanimation/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testanimation/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testdb/app.composite
index 51535b124c..32a023f8a7 100644
--- a/sca-cpp/trunk/modules/edit/apps/testdb/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testdb/app.composite
@@ -30,19 +30,19 @@
<component name="filedb" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component name="filedb2" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component name="filedb3" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="20" y="120" name="get" title="get" color="pink1">
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testdb/app.stats
index 1128933dfd..1128933dfd 100644
--- a/sca-cpp/trunk/modules/edit/apps/testdb/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testdb/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testdb/htdocs/app.html
index 856966ff50..856966ff50 100644
--- a/sca-cpp/trunk/modules/edit/apps/testdb/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testdb/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testevents/app.composite
index 61cd17ec81..61cd17ec81 100644
--- a/sca-cpp/trunk/modules/edit/apps/testevents/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testevents/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testevents/app.stats
index 51d6a0388e..51d6a0388e 100644
--- a/sca-cpp/trunk/modules/edit/apps/testevents/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testevents/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testevents/htdocs/app.html
index 6698c6faa8..6698c6faa8 100644
--- a/sca-cpp/trunk/modules/edit/apps/testevents/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testevents/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testhttp/app.composite
index 6aabf6d4bb..6aabf6d4bb 100644
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testhttp/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testhttp/app.stats
index be1fc6d254..be1fc6d254 100644
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testhttp/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testhttp/htdocs/app.html
index b0c20ef5e6..b0c20ef5e6 100644
--- a/sca-cpp/trunk/modules/edit/apps/testhttp/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testhttp/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testlogic/app.composite
index 659fcbacba..659fcbacba 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testlogic/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testlogic/app.stats
index e557346327..e557346327 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testlogic/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testlogic/htdocs/app.html
index 4e9efdaa22..4e9efdaa22 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testlogic/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testsearch/app.composite
index 493e9a253a..493e9a253a 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testsearch/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testsearch/app.stats
index 691c43875d..691c43875d 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsearch/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testsearch/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testsearch/htdocs/app.html
index ca5462f07a..ca5462f07a 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsearch/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testsearch/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testsms/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testsms/app.composite
index d2abbaae28..d2abbaae28 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsms/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testsms/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testsms/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testsms/app.stats
index be1fc6d254..be1fc6d254 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsms/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testsms/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testsms/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testsms/htdocs/app.html
index dd8f5f9f26..dd8f5f9f26 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsms/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testsms/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testsocial/app.composite
index 28ec9654d8..28ec9654d8 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testsocial/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testsocial/app.stats
index fa487f4d81..fa487f4d81 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testsocial/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testsocial/htdocs/app.html
index 5fe616ca16..5fe616ca16 100644
--- a/sca-cpp/trunk/modules/edit/apps/testsocial/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testsocial/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testtext/app.composite
index 7021ddb2e9..7021ddb2e9 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testtext/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testtext/app.stats
index 35e43ff383..35e43ff383 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testtext/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testtext/htdocs/app.html
index 1c7612d0e0..1c7612d0e0 100644
--- a/sca-cpp/trunk/modules/edit/apps/testtext/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testtext/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testurl/app.composite
index f42ba5fa4b..7b97b7a957 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testurl/app.composite
@@ -1,23 +1,6 @@
<?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" name="app" targetNamespace="http://app">
+ <service name="app1" promote="app1"/>
<service name="email" promote="email"/>
<service name="host" promote="host"/>
<service name="keychain1" promote="keychain1"/>
@@ -27,6 +10,11 @@
<service name="realm" promote="realm"/>
<service name="url" promote="url"/>
<service name="user" promote="user"/>
+ <component x="260" y="100" name="app1" title="app" color="green1">
+ <implementation.python script="nuvem/app.py"/>
+ <service name="app"/>
+ <property name="app" visible="false"/>
+ </component>
<component x="17" y="223" name="email" title="email" color="green1">
<implementation.python script="nuvem/email.py"/>
<service name="email"/>
@@ -92,7 +80,7 @@
<service name="params"/>
<property name="params"/>
</component>
- <component x="17" y="48" name="path" title="path" color="green1">
+ <component x="20" y="50" name="path" title="path" color="green1">
<implementation.python script="nuvem/path.py"/>
<service name="path"/>
<property name="path"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testurl/app.stats
index b4142f40cf..b4142f40cf 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testurl/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testurl/htdocs/app.html
index 8c47186044..8c47186044 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testurl/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testvalues/app.composite
index 4ee8a0a619..4ee8a0a619 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testvalues/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testvalues/app.stats
index 4b7a09cd38..4b7a09cd38 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testvalues/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testvalues/htdocs/app.html
index 79bb081a97..79bb081a97 100644
--- a/sca-cpp/trunk/modules/edit/apps/testvalues/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testvalues/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testwidgets/app.composite
index 1cb1aee017..1cb1aee017 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testwidgets/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testwidgets/app.stats
index 6a66748ab1..6a66748ab1 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testwidgets/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testwidgets/htdocs/app.html
index d1422c10ac..d1422c10ac 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testwidgets/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.composite
index f387e876ed..f387e876ed 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.stats
index 18f0cb50f8..18f0cb50f8 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/htdocs/app.html
index 7efb62d247..7efb62d247 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testwidgets2/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.composite
index e367b69a9c..e367b69a9c 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.stats b/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.stats
index 2e772401c9..2e772401c9 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets3/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/htdocs/app.html
index 393d63c2d1..393d63c2d1 100644
--- a/sca-cpp/trunk/modules/edit/apps/testwidgets3/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/testwidgets3/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/apps/twsms/app.composite b/sca-cpp/trunk/hosting/server/data/apps/twsms/app.composite
index 66523f4754..66523f4754 100644
--- a/sca-cpp/trunk/modules/edit/apps/twsms/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/twsms/app.composite
diff --git a/sca-cpp/trunk/modules/edit/apps/twsms/app.stats b/sca-cpp/trunk/hosting/server/data/apps/twsms/app.stats
index 85c97c2457..85c97c2457 100644
--- a/sca-cpp/trunk/modules/edit/apps/twsms/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/twsms/app.stats
diff --git a/sca-cpp/trunk/modules/edit/apps/twsms/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/twsms/htdocs/app.html
index d2eaebcdd0..d2eaebcdd0 100644
--- a/sca-cpp/trunk/modules/edit/apps/twsms/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/twsms/htdocs/app.html
diff --git a/sca-cpp/trunk/modules/edit/dashboards/jane@localhost/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/jane@localhost/user.apps
index 710de5f62e..710de5f62e 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/jane@localhost/user.apps
+++ b/sca-cpp/trunk/hosting/server/data/dashboards/jane@localhost/user.apps
diff --git a/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/jane@sca-store.com/user.apps
index 710de5f62e..710de5f62e 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com/user.apps
+++ b/sca-cpp/trunk/hosting/server/data/dashboards/jane@sca-store.com/user.apps
diff --git a/sca-cpp/trunk/modules/edit/dashboards/john@localhost/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/john@localhost/user.apps
index 710de5f62e..710de5f62e 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/john@localhost/user.apps
+++ b/sca-cpp/trunk/hosting/server/data/dashboards/john@localhost/user.apps
diff --git a/sca-cpp/trunk/modules/edit/dashboards/john@sca-store.com/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/john@sca-store.com/user.apps
index 710de5f62e..710de5f62e 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/john@sca-store.com/user.apps
+++ b/sca-cpp/trunk/hosting/server/data/dashboards/john@sca-store.com/user.apps
diff --git a/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/animation/palette.composite
index 75cbf497b6..75cbf497b6 100644
--- a/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/animation/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/control/palette.composite
index f89cae2c5d..f89cae2c5d 100644
--- a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/control/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/database/palette.composite
index cca0b174b8..926fb3fa14 100644
--- a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/database/palette.composite
@@ -34,7 +34,7 @@
<component x="80" y="10" name="filedb" title="file" color="pink1">
<implementation.python script="nuvem/filedb.py"/>
<service name="filedb"/>
- <reference name="db" target="AppDataFileCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="80" y="60" name="get" title="get" color="pink1">
@@ -46,7 +46,7 @@
<component x="140" y="10" name="nosqldb" title="index **" color="pink1">
<implementation.python script="nuvem/nosqldb.py"/>
<service name="nosqldb"/>
- <reference name="db" target="AppDataNoSQLCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
<component x="200" y="60" name="post" title="post" color="pink1">
@@ -66,7 +66,7 @@
<component x="210" y="10" name="sqldb" title="sql **" color="pink1">
<implementation.python script="nuvem/sqldb.py"/>
<service name="sqldb"/>
- <reference name="db" target="AppDataSQLCache" visible="false"/>
+ <reference name="db" target="Cache" visible="false"/>
<property name="host" visible="false"/>
</component>
</composite>
diff --git a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/http/palette.composite
index 6c8cbaa553..13f92e8954 100644
--- a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/http/palette.composite
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="app" promote="app"/>
<service name="delete" promote="delete"/>
<service name="email" promote="email"/>
<service name="get" promote="get"/>
@@ -31,73 +32,78 @@
<service name="put" promote="put"/>
<service name="url" promote="url"/>
<service name="user" promote="user"/>
- <component x="80" y="170" name="delete" title="delete" color="green1">
+ <component x="80" y="10" name="app" title="app" color="green1">
+ <implementation.python script="nuvem/app.py"/>
+ <service name="app"/>
+ <property name="app" visible="false"/>
+ </component>
+ <component x="80" y="220" name="delete" title="delete" color="green1">
<implementation.cpp path="lib/http" library="libhttpdelete"/>
<service name="delete"/>
<reference name="url"/>
</component>
- <component x="130" y="60" name="email" title="email" color="green1">
+ <component x="140" y="110" name="email" title="email" color="green1">
<implementation.python script="nuvem/email.py"/>
<service name="email"/>
<property name="email" visible="false"/>
</component>
- <component x="80" y="120" name="get" title="get" color="green1">
+ <component x="80" y="170" name="get" title="get" color="green1">
<implementation.cpp path="lib/http" library="libhttpget"/>
<service name="get"/>
<reference name="url"/>
</component>
- <component x="80" y="10" name="host" title="host" color="green1">
+ <component x="130" y="10" name="host" title="host" color="green1">
<implementation.python script="nuvem/host.py"/>
<service name="host"/>
<property name="host" visible="false"/>
</component>
- <component x="190" y="60" name="keychain" title="keychain" color="green1">
+ <component x="210" y="110" name="keychain" title="keychain" color="green1">
<implementation.python script="nuvem/keychain.py"/>
<service name="keychain"/>
<reference name="name"/>
<reference name="account" target="Accounts" visible="false"/>
</component>
- <component x="250" y="10" name="param" title="?param" color="green1">
+ <component x="150" y="60" name="param" title="?param" color="green1">
<implementation.python script="nuvem/param.py"/>
<service name="param"/>
<property>x</property>
<property name="query" visible="false"/>
</component>
- <component x="180" y="10" name="params" title="?params" color="green1">
+ <component x="80" y="60" name="params" title="?params" color="green1">
<implementation.python script="nuvem/params.py"/>
<service name="params"/>
<property name="query" visible="false"/>
</component>
- <component x="260" y="120" name="patch" title="patch" color="green1">
+ <component x="260" y="170" name="patch" title="patch" color="green1">
<implementation.cpp path="lib/http" library="libhttppatch"/>
<service name="patch"/>
<reference name="url"/>
<reference name="content"/>
</component>
- <component x="130" y="10" name="path" title="path" color="green1">
+ <component x="190" y="10" name="path" title="path" color="green1">
<implementation.python script="nuvem/path.py"/>
<service name="path"/>
<property name="path" visible="false"/>
</component>
- <component x="200" y="120" name="post" title="post" color="green1">
+ <component x="200" y="170" name="post" title="post" color="green1">
<implementation.cpp path="lib/http" library="libhttppost"/>
<service name="post"/>
<reference name="url"/>
<reference name="content"/>
</component>
- <component x="140" y="120" name="put" title="put" color="green1">
+ <component x="140" y="170" name="put" title="put" color="green1">
<implementation.cpp path="lib/http" library="libhttpput"/>
<service name="put"/>
<reference name="url"/>
<reference name="content"/>
</component>
- <component x="270" y="60" name="url" title="url" color="green1">
+ <component x="250" y="10" name="url" title="url" color="green1">
<implementation.python script="nuvem/url.py"/>
<service name="url"/>
<reference name="address"/>
<reference name="args"/>
</component>
- <component x="80" y="60" name="user" title="user" color="green1">
+ <component x="80" y="110" name="user" title="user" color="green1">
<implementation.python script="nuvem/user.py"/>
<service name="user"/>
<property name="user" visible="false"/>
diff --git a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/lists/palette.composite
index 2f4051d7b9..2f4051d7b9 100644
--- a/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/lists/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/logic/palette.composite
index 4d84272fd5..4d84272fd5 100644
--- a/sca-cpp/trunk/modules/edit/palettes/logic/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/logic/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/math/palette.composite
index 7dc4e88f2f..7dc4e88f2f 100644
--- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/math/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/python/palette.composite
index 2cc03ae365..2cc03ae365 100644
--- a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/python/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/search/palette.composite
index db58cdcd08..db58cdcd08 100644
--- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/search/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/social/palette.composite
index 5e02303857..5e02303857 100644
--- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/social/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/talk/palette.composite
index 90a48291ca..90a48291ca 100644
--- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/talk/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/text/palette.composite
index 6b9214f6e4..6b9214f6e4 100644
--- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/text/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/transform/palette.composite
index 566278c44b..566278c44b 100644
--- a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/transform/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite b/sca-cpp/trunk/hosting/server/data/palettes/values/palette.composite
index 4cd3a9d14e..4cd3a9d14e 100644
--- a/sca-cpp/trunk/modules/edit/palettes/values/palette.composite
+++ b/sca-cpp/trunk/hosting/server/data/palettes/values/palette.composite
diff --git a/sca-cpp/trunk/modules/edit/store/all/store.apps b/sca-cpp/trunk/hosting/server/data/store/all/store.apps
index caf7142403..caf7142403 100644
--- a/sca-cpp/trunk/modules/edit/store/all/store.apps
+++ b/sca-cpp/trunk/hosting/server/data/store/all/store.apps
diff --git a/sca-cpp/trunk/modules/edit/store/featured/store.apps b/sca-cpp/trunk/hosting/server/data/store/featured/store.apps
index 18bd47e8dd..18bd47e8dd 100644
--- a/sca-cpp/trunk/modules/edit/store/featured/store.apps
+++ b/sca-cpp/trunk/hosting/server/data/store/featured/store.apps
diff --git a/sca-cpp/trunk/modules/edit/store/new/store.apps b/sca-cpp/trunk/hosting/server/data/store/new/store.apps
index 18bd47e8dd..18bd47e8dd 100644
--- a/sca-cpp/trunk/modules/edit/store/new/store.apps
+++ b/sca-cpp/trunk/hosting/server/data/store/new/store.apps
diff --git a/sca-cpp/trunk/modules/edit/store/top/store.apps b/sca-cpp/trunk/hosting/server/data/store/top/store.apps
index 18bd47e8dd..18bd47e8dd 100644
--- a/sca-cpp/trunk/modules/edit/store/top/store.apps
+++ b/sca-cpp/trunk/hosting/server/data/store/top/store.apps