Fixes to the hosting module to correctly store ATOM feeds instead of raw collections and work with the sqldb component.

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

13 files changed, 12 insertions, 12 deletions

diff --git a/sca-cpp/trunk/hosting/server/data/apps/testevents/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testevents/app.composite
index 61cd17ec81..4a45bd3a8f 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/testevents/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testevents/app.composite
@@ -123,7 +123,7 @@
  <component name="name2" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>https://testhttp.sca-store.com:8453/components/property</property>
+  <property>https://testhttp.example.com:8453/components/property</property>
  </component>
  <component name="number" title="#" color="orange1">
   <implementation.python script="nuvem/number.py"/>
@@ -182,7 +182,7 @@
  <component name="text5" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>https://testhttp.sca-store.com:8453/components/property</property>
+  <property>https://testhttp.example.com:8453/components/property</property>
  </component>
  <component x="13" y="58" name="timer3" title="timer" color="green1">
   <implementation.python script="nuvem/timer.py"/>
diff --git a/sca-cpp/trunk/hosting/server/data/apps/testhttp/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testhttp/app.composite
index 6aabf6d4bb..11723c7207 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/testhttp/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testhttp/app.composite
@@ -146,7 +146,7 @@
  <component name="name" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
   <service name="name"/>
-  <property>https://testhttp.sca-store.com:8453/components/property</property>
+  <property>https://testhttp.example.com:8453/components/property</property>
  </component>
  <component x="630" y="350" name="name1" title="" color="orange1">
   <implementation.python script="nuvem/name.py"/>
diff --git a/sca-cpp/trunk/hosting/server/data/apps/testurl/app.composite b/sca-cpp/trunk/hosting/server/data/apps/testurl/app.composite
index 7b97b7a957..114fdcf20a 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/testurl/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/testurl/app.composite
@@ -93,7 +93,7 @@
  <component name="text" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>http://sca-store.com/</property>
+  <property>http://example.com/</property>
  </component>
  <component x="400" y="10" name="text1" title=" '{propval}'" color="orange1">
   <implementation.python script="nuvem/text.py"/>
diff --git a/sca-cpp/trunk/hosting/server/data/dashboards/jane@example.com/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/jane@example.com/user.apps
new file mode 100644
index 0000000000..6126c4b88c
--- /dev/null
+++ b/sca-cpp/trunk/hosting/server/data/dashboards/jane@example.com/user.apps
@@ -0,0 +1 @@
+((feed (title "Your Apps") (id "jane@example.com") (entry (title "An empty test app") (id "test"))))
diff --git a/sca-cpp/trunk/hosting/server/data/dashboards/jane@localhost/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/jane@localhost/user.apps
index 710de5f62e..c62dbfb6b8 100644
--- a/sca-cpp/trunk/hosting/server/data/dashboards/jane@localhost/user.apps
+++ b/sca-cpp/trunk/hosting/server/data/dashboards/jane@localhost/user.apps
@@ -1 +1 @@
-((entry (title "An empty test app") (id "test")))
+((feed (title "Your Apps") (id "jane@localhost") (entry (title "An empty test app") (id "test"))))
diff --git a/sca-cpp/trunk/hosting/server/data/dashboards/jane@sca-store.com/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/jane@sca-store.com/user.apps
deleted file mode 100644
index 710de5f62e..0000000000
--- a/sca-cpp/trunk/hosting/server/data/dashboards/jane@sca-store.com/user.apps
+++ /dev/null
@@ -1 +0,0 @@
-((entry (title "An empty test app") (id "test")))
diff --git a/sca-cpp/trunk/hosting/server/data/dashboards/john@example.com/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/john@example.com/user.apps
new file mode 100644
index 0000000000..bc4d3f64fa
--- /dev/null
+++ b/sca-cpp/trunk/hosting/server/data/dashboards/john@example.com/user.apps
@@ -0,0 +1 @@
+((feed (title "Your Apps") (id "john@example.com") (entry (title "An empty test app") (id "test"))))
diff --git a/sca-cpp/trunk/hosting/server/data/dashboards/john@localhost/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/john@localhost/user.apps
index 710de5f62e..ee20c1c2c5 100644
--- a/sca-cpp/trunk/hosting/server/data/dashboards/john@localhost/user.apps
+++ b/sca-cpp/trunk/hosting/server/data/dashboards/john@localhost/user.apps
@@ -1 +1 @@
-((entry (title "An empty test app") (id "test")))
+((feed (title "Your Apps") (id "john@localhost") (entry (title "An empty test app") (id "test"))))
diff --git a/sca-cpp/trunk/hosting/server/data/dashboards/john@sca-store.com/user.apps b/sca-cpp/trunk/hosting/server/data/dashboards/john@sca-store.com/user.apps
deleted file mode 100644
index 710de5f62e..0000000000
--- a/sca-cpp/trunk/hosting/server/data/dashboards/john@sca-store.com/user.apps
+++ /dev/null
@@ -1 +0,0 @@
-((entry (title "An empty test app") (id "test")))
diff --git a/sca-cpp/trunk/hosting/server/data/store/all/store.apps b/sca-cpp/trunk/hosting/server/data/store/all/store.apps
index caf7142403..50b108402b 100644
--- a/sca-cpp/trunk/hosting/server/data/store/all/store.apps
+++ b/sca-cpp/trunk/hosting/server/data/store/all/store.apps
@@ -1 +1 @@
-((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test SMS API") (id "testsms")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb")) (entry (title "Test HTML generator components") (id "testwidgets3")) (entry (title "Test animation components") (id "testanimation")))
+((feed (title "App Store") (id "all") (entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test SMS API") (id "testsms")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb")) (entry (title "Test HTML generator components") (id "testwidgets3")) (entry (title "Test animation components") (id "testanimation"))))
diff --git a/sca-cpp/trunk/hosting/server/data/store/featured/store.apps b/sca-cpp/trunk/hosting/server/data/store/featured/store.apps
index 18bd47e8dd..963b1615c2 100644
--- a/sca-cpp/trunk/hosting/server/data/store/featured/store.apps
+++ b/sca-cpp/trunk/hosting/server/data/store/featured/store.apps
@@ -1 +1 @@
-((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")))
+((feed (title "App Store") (id "featured") (entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms"))))
diff --git a/sca-cpp/trunk/hosting/server/data/store/new/store.apps b/sca-cpp/trunk/hosting/server/data/store/new/store.apps
index 18bd47e8dd..5a58805b74 100644
--- a/sca-cpp/trunk/hosting/server/data/store/new/store.apps
+++ b/sca-cpp/trunk/hosting/server/data/store/new/store.apps
@@ -1 +1 @@
-((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")))
+((feed (title "App Store") (id "new") (entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms"))))
diff --git a/sca-cpp/trunk/hosting/server/data/store/top/store.apps b/sca-cpp/trunk/hosting/server/data/store/top/store.apps
index 18bd47e8dd..95e6ff24d3 100644
--- a/sca-cpp/trunk/hosting/server/data/store/top/store.apps
+++ b/sca-cpp/trunk/hosting/server/data/store/top/store.apps
@@ -1 +1 @@
-((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")))
+((feed (title "App Store") (id "top") (entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Where are my friends") (id "nearme2")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms"))))