Merging the 1.x delta on top of the equinox based modules

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

1 files changed, 14 insertions, 6 deletions

diff --git a/java/sca/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html b/java/sca/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
index e58f14a635..6bbc285377 100644
--- a/java/sca/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
+++ b/java/sca/modules/implementation-widget-runtime/src/test/resources/content/storeJS.html
@@ -21,15 +21,13 @@
 <title>Store</TITLE>

 

 <!-- one js include per sca component -->

-<script type="text/javascript" src="storeJS.js"></script>

-

-<!-- Include Tuscany JavaScript client model for Atom.  

+<!-- For Atom, the Tuscany JavaScript client includes the model for Atom.  

 	 Using this JavaScript model, users can use syntax such as:

 	 item += "name=" + entry.getName() + ", price=" + entry.getContent() 

 	 rather than

      item += entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;

 	-->

-<script type="text/javascript" src="atomModel.js"></script>

+<script type="text/javascript" src="storeJS.js"></script>

 

 <script language="JavaScript">

 

@@ -70,7 +68,7 @@
 			}

 			document.getElementById("shoppingCart").innerHTML = list;

 			// document.getElementById('total').innerHTML = feed.getElementsByTagName("subtitle")[0].firstChild.nodeValue;

-			var text =  feed.getSubTitle().getText();

+			var text =  feed.getSubtitle().getText();

 			document.getElementById('total').innerHTML = text;

 		}

 	}

@@ -84,6 +82,9 @@
 		var j = 0;

 		for (var i=0; i<items.length; i++)

 			if (items[i].checked) {

+				var entry = new Entry( "cart-item" );

+				entry.setContent( items[i].value );

+				var entryXML = entry.toXML();

 				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>cart-item</title><content type="text">'+items[i].value+'</content></entry>'

 				shoppingCart.post(entry, shoppingCart_postResponse);

 				items[i].checked = false;

@@ -109,7 +110,14 @@
 		document.getElementById('shoppingCart').innerHTML = "";

 		document.getElementById('total').innerHTML = "";	

 	}	

-
+	function testFeedtoXML() {

+		if(exception){

+			alert(exception.message);

+			return;

+		}

+    	document.getElementById('results').innerHTML = text;

+	}

+	

     //alert(locale);

 	catalog.get(catalog_getResponse);

 	shoppingCart.get("", shoppingCart_getResponse);