Some improvements to the edit module. Add a few sample apps and test cases, show current user and links to app data.

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

2 files changed, 85 insertions, 80 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/store3/app.composite b/sca-cpp/trunk/modules/edit/apps/store3/app.composite
index 9ec440435e..735052fe03 100644
--- a/sca-cpp/trunk/modules/edit/apps/store3/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/store3/app.composite
@@ -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>
diff --git a/sca-cpp/trunk/modules/edit/apps/store3/app.html b/sca-cpp/trunk/modules/edit/apps/store3/app.html
index 3a57127751..593d0a6648 100644
--- a/sca-cpp/trunk/modules/edit/apps/store3/app.html
+++ b/sca-cpp/trunk/modules/edit/apps/store3/app.html
@@ -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>