Refactor sample app definitions into proper ATOM entries.

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

3 files changed, 176 insertions, 162 deletions

diff --git a/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.composite b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.composite
index 2a7ce11f1f..57ea520209 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.composite
+++ b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.composite
@@ -17,147 +17,154 @@
  * 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="start" promote="start"/>
- <component name="append" title="+" color="yellow1">
-  <implementation.python script="nuvem/append.py"/>
-  <service name="append"/>
-  <reference target="values" name="first"/>
-  <reference target="values2" name="second"/>
- </component>
- <component name="flkalbum" title="flicker album" color="blue1">
-  <implementation.python script="nuvem/flkalbum.py"/>
-  <service name="flkalbum"/>
-  <reference target="text7" name="id"/>
-  <reference name="flk" visible="false">
-   <binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
-  </reference>
- </component>
- <component x="200" y="70" name="htattrs1" title="attrs:" color="white1">
-  <implementation.python script="nuvem/htattrs.py"/>
-  <service name="htattrs"/>
-  <reference target="list12" name="value"/>
- </component>
- <component x="140" y="40" name="htimg2" title="img" color="white1">
-  <implementation.python script="nuvem/htimg.py"/>
-  <service name="htimg"/>
-  <reference target="list21" name="value"/>
- </component>
- <component x="260" y="70" name="htstyle2" title="style" color="white1">
-  <implementation.python script="nuvem/htstyle.py"/>
-  <service name="htstyle"/>
-  <reference target="item1" name="value"/>
- </component>
- <component name="item" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="map2" name="value"/>
-  <property>images</property>
- </component>
- <component x="310" y="70" name="item1" title="{propval}:" color="orange1">
-  <implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <reference target="pixels1" name="value"/>
-  <property>width</property>
- </component>
- <component x="240" y="70" name="list12" title="list" color="yellow1">
-  <implementation.python script="nuvem/single.py"/>
-  <service name="list1"/>
-  <reference target="htstyle2" name="value"/>
- </component>
- <component x="170" y="40" name="list21" title="list" color="yellow1">
-  <implementation.python script="nuvem/pair.py"/>
-  <service name="list2"/>
-  <reference target="valueof2" name="first"/>
-  <reference target="htattrs1" name="second"/>
- </component>
- <component name="map2" title="map" color="yellow1">
-  <implementation.python script="nuvem/map_.py"/>
-  <service name="map"/>
-  <reference target="name5" name="item"/>
-  <reference target="htimg2" name="transform"/>
-  <reference target="shuffle" name="list"/>
- </component>
- <component name="name3" title="" color="orange1">
-  <implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>src</property>
- </component>
- <component name="name4" title="" color="orange1">
-  <implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>m</property>
- </component>
- <component name="name5" title="" color="orange1">
-  <implementation.python script="nuvem/name.py"/>
-  <service name="name"/>
-  <property>image</property>
- </component>
- <component x="420" y="70" name="number1" title="#" color="orange1">
-  <implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>320</property>
- </component>
- <component name="picalbum" title="picasa album" color="blue1">
-  <implementation.python script="nuvem/picalbum.py"/>
-  <service name="picalbum"/>
-  <reference target="text5" name="id"/>
-  <reference name="pic" visible="false">
-   <binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
-  </reference>
- </component>
- <component x="280" y="70" name="pixels1" title="pixels" color="white1">
-  <implementation.python script="nuvem/pixels.py"/>
-  <service name="pixels"/>
-  <reference target="number1" name="value"/>
- </component>
- <component name="select" title="select" color="yellow1">
-  <implementation.python script="nuvem/select.py"/>
-  <service name="select"/>
-  <reference target="name3" name="path"/>
-  <reference target="picalbum" name="list"/>
- </component>
- <component name="select2" title="select" color="yellow1">
-  <implementation.python script="nuvem/select.py"/>
-  <service name="select"/>
-  <reference target="name4" name="path"/>
-  <reference target="flkalbum" name="list"/>
- </component>
- <component x="180" y="180" name="shuffle" title="shuffle" color="yellow1">
-  <implementation.python script="nuvem/shuffle_.py"/>
-  <service name="shuffle"/>
-  <reference target="append" name="list"/>
- </component>
- <component x="10" y="10" name="start" title="start" color="green1">
-  <implementation.python script="nuvem/start.py"/>
-  <service name="start" visible="false">
-   <binding.http uri="start"/>
-  </service>
-  <reference target="item" name="content"/>
- </component>
- <component name="text5" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>jsdelfino</property>
- </component>
- <component name="text7" title=" '{propval}'" color="orange1">
-  <implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>61049883@N06</property>
- </component>
- <component x="470" y="30" name="valueof2" title="valueof" color="orange1">
-  <implementation.python script="nuvem/valueof.py"/>
-  <service name="valueof"/>
-  <property>image</property>
- </component>
- <component name="values" title="values" color="yellow1">
-  <implementation.python script="nuvem/values.py"/>
-  <service name="values"/>
-  <reference target="select" name="list"/>
- </component>
- <component name="values2" title="values" color="yellow1">
-  <implementation.python script="nuvem/values.py"/>
-  <service name="values"/>
-  <reference target="select2" name="list"/>
- </component>
-</composite>
+<entry xmlns="http://www.w3.org/2005/Atom">
+ <title type="text">ourphotos</title>
+ <id>ourphotos</id>
+ <content type="application/xml">
+  <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="app" targetNamespace="http://app">
+   <service name="start" promote="start"/>
+   <component name="append" title="+" color="yellow1">
+    <implementation.python script="nuvem/append.py"/>
+    <service name="append"/>
+    <reference target="values" name="first"/>
+    <reference target="values2" name="second"/>
+   </component>
+   <component name="flkalbum" title="flicker album" color="blue1">
+    <implementation.python script="nuvem/flkalbum.py"/>
+    <service name="flkalbum"/>
+    <reference target="text7" name="id"/>
+    <reference name="flk" visible="false">
+     <binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/>
+    </reference>
+   </component>
+   <component x="200" y="70" name="htattrs1" title="attrs:" color="white1">
+    <implementation.python script="nuvem/htattrs.py"/>
+    <service name="htattrs"/>
+    <reference target="list12" name="value"/>
+   </component>
+   <component x="140" y="40" name="htimg2" title="img" color="white1">
+    <implementation.python script="nuvem/htimg.py"/>
+    <service name="htimg"/>
+    <reference target="list21" name="value"/>
+   </component>
+   <component x="260" y="70" name="htstyle2" title="style" color="white1">
+    <implementation.python script="nuvem/htstyle.py"/>
+    <service name="htstyle"/>
+    <reference target="item1" name="value"/>
+   </component>
+   <component name="item" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="map2" name="value"/>
+    <property>images</property>
+   </component>
+   <component x="310" y="70" name="item1" title="{propval}:" color="orange1">
+    <implementation.python script="nuvem/item.py"/>
+    <service name="item"/>
+    <reference target="pixels1" name="value"/>
+    <property>width</property>
+   </component>
+   <component x="240" y="70" name="list12" title="list" color="yellow1">
+    <implementation.python script="nuvem/single.py"/>
+    <service name="list1"/>
+    <reference target="htstyle2" name="value"/>
+   </component>
+   <component x="170" y="40" name="list21" title="list" color="yellow1">
+    <implementation.python script="nuvem/pair.py"/>
+    <service name="list2"/>
+    <reference target="valueof2" name="first"/>
+    <reference target="htattrs1" name="second"/>
+   </component>
+   <component name="map2" title="map" color="yellow1">
+    <implementation.python script="nuvem/map_.py"/>
+    <service name="map"/>
+    <reference target="name5" name="item"/>
+    <reference target="htimg2" name="transform"/>
+    <reference target="shuffle" name="list"/>
+   </component>
+   <component name="name3" title="" color="orange1">
+    <implementation.python script="nuvem/name.py"/>
+    <service name="name"/>
+    <property>src</property>
+   </component>
+   <component name="name4" title="" color="orange1">
+    <implementation.python script="nuvem/name.py"/>
+    <service name="name"/>
+    <property>m</property>
+   </component>
+   <component name="name5" title="" color="orange1">
+    <implementation.python script="nuvem/name.py"/>
+    <service name="name"/>
+    <property>image</property>
+   </component>
+   <component x="420" y="70" name="number1" title="#" color="orange1">
+    <implementation.python script="nuvem/number.py"/>
+    <service name="number"/>
+    <property>320</property>
+   </component>
+   <component name="picalbum" title="picasa album" color="blue1">
+    <implementation.python script="nuvem/picalbum.py"/>
+    <service name="picalbum"/>
+    <reference target="text5" name="id"/>
+    <reference name="pic" visible="false">
+     <binding.http uri="https://picasaweb.google.com/data/feed/api/user"/>
+    </reference>
+   </component>
+   <component x="280" y="70" name="pixels1" title="pixels" color="white1">
+    <implementation.python script="nuvem/pixels.py"/>
+    <service name="pixels"/>
+    <reference target="number1" name="value"/>
+   </component>
+   <component name="select" title="select" color="yellow1">
+    <implementation.python script="nuvem/select.py"/>
+    <service name="select"/>
+    <reference target="name3" name="path"/>
+    <reference target="picalbum" name="list"/>
+   </component>
+   <component name="select2" title="select" color="yellow1">
+    <implementation.python script="nuvem/select.py"/>
+    <service name="select"/>
+    <reference target="name4" name="path"/>
+    <reference target="flkalbum" name="list"/>
+   </component>
+   <component x="180" y="180" name="shuffle" title="shuffle" color="yellow1">
+    <implementation.python script="nuvem/shuffle_.py"/>
+    <service name="shuffle"/>
+    <reference target="append" name="list"/>
+   </component>
+   <component x="10" y="10" name="start" title="start" color="green1">
+    <implementation.python script="nuvem/start.py"/>
+    <service name="start" visible="false">
+     <binding.http uri="start"/>
+    </service>
+    <reference target="item" name="content"/>
+   </component>
+   <component name="text5" title=" '{propval}'" color="orange1">
+    <implementation.python script="nuvem/text.py"/>
+    <service name="text"/>
+    <property>jsdelfino</property>
+   </component>
+   <component name="text7" title=" '{propval}'" color="orange1">
+    <implementation.python script="nuvem/text.py"/>
+    <service name="text"/>
+    <property>61049883@N06</property>
+   </component>
+   <component x="470" y="30" name="valueof2" title="valueof" color="orange1">
+    <implementation.python script="nuvem/valueof.py"/>
+    <service name="valueof"/>
+    <property>image</property>
+   </component>
+   <component name="values" title="values" color="yellow1">
+    <implementation.python script="nuvem/values.py"/>
+    <service name="values"/>
+    <reference target="select" name="list"/>
+   </component>
+   <component name="values2" title="values" color="yellow1">
+    <implementation.python script="nuvem/values.py"/>
+    <service name="values"/>
+    <reference target="select2" name="list"/>
+   </component>
+  </composite>
+ </content>
+ <link href="ourphotos"/>
+</entry>
diff --git a/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.stats b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.stats
index e685d930dd..6986fbea1b 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.stats
+++ b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/app.stats
@@ -1 +1 @@
-((entry (title "Our photos of an event") (id "ourphotos")))
\ No newline at end of file
+((entry (title "Our photos of an event") (id "ourphotos") (author "admin@example.com") (updated "Jan 01, 2012") (content (stats (description "Sample app")))))
diff --git a/sca-cpp/trunk/hosting/server/data/apps/ourphotos/htdocs/app.html b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/htdocs/app.html
index 1ddb89fa30..a226d6daaf 100644
--- a/sca-cpp/trunk/hosting/server/data/apps/ourphotos/htdocs/app.html
+++ b/sca-cpp/trunk/hosting/server/data/apps/ourphotos/htdocs/app.html
@@ -17,20 +17,27 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<DIV id="page">
- <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Our Photos</H2>
- </SPAN>
- <SPAN id="images" class="list" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
-  <TABLE class="datatable" style="width: 100%; ">
-   <TBODY>
-    <TR>
-     <TD>=images</TD>
-    </TR>
-    <TR>
-     <TD>...</TD>
-    </TR>
-   </TBODY>
-  </TABLE>
- </SPAN>
-</DIV>
+<entry xmlns="http://www.w3.org/2005/Atom">
+ <title type="text">ourphotos</title>
+ <id>ourphotos</id>
+ <content type="application/xml">
+  <DIV id="page">
+   <SPAN id="page:h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+    <H2>Our Photos</H2>
+   </SPAN>
+   <SPAN id="images" class="list" style="position: absolute; top: 27px; width: 100%; left: 2px; ">
+    <TABLE class="datatable" style="width: 100%; ">
+     <TBODY>
+      <TR>
+       <TD>=images</TD>
+      </TR>
+      <TR>
+       <TD>...</TD>
+      </TR>
+     </TBODY>
+    </TABLE>
+   </SPAN>
+  </DIV>
+ </content>
+ <link href="ourphotos"/>
+</entry>