Updating item value object to allow better representation of monetary information

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

6 files changed, 29 insertions, 6 deletions

diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/Workaround.java b/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/Workaround.java
new file mode 100644
index 0000000000..2f345ecedd
--- /dev/null
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/Workaround.java
@@ -0,0 +1,22 @@
+/*
+ * 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.    
+ */
+
+public class Workaround {
+
+}
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/WEB-INF/appengine-web.xml b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/WEB-INF/appengine-web.xml
index 85626f6b1c..bfec5c4e26 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/WEB-INF/appengine-web.xml
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/WEB-INF/appengine-web.xml
@@ -19,7 +19,7 @@
 -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 	<application>tuscany-store</application>
-	<version>4</version>
+	<version>5</version>
 	
 	<!-- Configure java.util.logging -->
 	<system-properties>
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/WEB-INF/logging.properties b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/WEB-INF/logging.properties
index 03808336ec..bd3b8308fc 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/WEB-INF/logging.properties
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/WEB-INF/logging.properties
@@ -33,5 +33,5 @@
 .level = WARNING
 
 #tuscany debug messages
-org.apache.tuscany.level=WARNING
+org.apache.tuscany.level = WARNING
 
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/log4j.properties b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/log4j.properties
index 036b48afd7..036b48afd7 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/log4j.properties
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/log4j.properties
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.composite
index 8705f9a52a..8705f9a52a 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/store.composite
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.composite
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.html b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.html
index 050d451899..0afe661540 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.html
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.html
@@ -63,7 +63,7 @@
 		var catalogCallback = function(items) {
 			var catalog = "";
 			for (var i=0; i<items.length; i++) {
-				var item = items[i].name + ' - ' + items[i].price;
+				var item = items[i].name + ' - ' + items[i].currencySymbol + items[i].price;
 				catalog += '<input name="items" type="checkbox" value="' + 
 							item + '">' + item + ' <br>';
 			}
@@ -84,8 +84,9 @@
 			var item = items[i].data;
 			// process its attributes
 			var name = item.name;
+			var symbol = item.currencySymbol;
 			var price = item.price
-			list += name + ' - ' + price + ' <br>';
+			list += name + ' - ' + symbol + price + ' <br>';
 		}
 		document.getElementById("shoppingCart").innerHTML = list;
 
@@ -132,10 +133,10 @@
 					'<br>'+
 					'<input type="submit" value="Continue Shopping">'+ 
 				'</form>';
-		shoppingCart.del("");
+		shoppingCart.delete("");
 	}
 	function deleteCart() {
-		shoppingCart.del("");
+		shoppingCart.delete("");
 		document.getElementById('shoppingCart').innerHTML = "";
 		document.getElementById('total').innerHTML = "";	
 	}