Minimal support for implementation.widget, using simplified (and generic) JSONRPC and ATOMPub Javascript proxies. Minor changes to the server runtime to serve reference requests from widgets. Adjust and simplified samples using the widget support.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@959521 13f79535-47bb-0310-9956-ffa450edef68
author: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2010-07-01 06:04:35 +0000
committer: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2010-07-01 06:04:35 +0000
commit: ac8bb2ddecac09d60760ef83319b627548d0fd77 (patch)
tree: b15d73262f02989d8dfe554e127e82e70b5aebe4 /sca-cpp/trunk/samples/store-nosql
parent: 54561e00c9714c9230dc1ed39f3bb548a59adeed (diff)
7 files changed, 12 insertions, 680 deletions
diff --git a/sca-cpp/trunk/samples/store-nosql/Makefile.am b/sca-cpp/trunk/samples/store-nosql/Makefile.am
index 6d8efe115a..db87e58d70 100644
--- a/sca-cpp/trunk/samples/store-nosql/Makefile.am
+++ b/sca-cpp/trunk/samples/store-nosql/Makefile.am
@@ -18,7 +18,7 @@
 dist_sample_SCRIPTS = start stop ssl-start
 sampledir = $(prefix)/samples/store-nosql
 
-nobase_dist_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/.htaccess htdocs/*.html htdocs/*.js
+nobase_dist_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/.htaccess htdocs/*.html
 
 dist_noinst_SCRIPTS = server-test
 TESTS = server-test
diff --git a/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm b/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm
index d79ff1b677..1e84fc7d5e 100644
--- a/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm
+++ b/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm
@@ -17,7 +17,7 @@
 
 ; Catalog implementation
 
-(define (get converter currencyCode)
+(define (getcatalog converter currencyCode)
   (define code (currencyCode))
   (define (convert price) (converter "convert" "USD" code price))
   (define symbol (converter "symbol" code))
@@ -28,6 +28,3 @@
   )
 )
 
-; TODO remove these JSON-RPC specific functions
-(define (listMethods converter currencyCode) (list "Service.get"))
-
diff --git a/sca-cpp/trunk/samples/store-nosql/htdocs/store.html b/sca-cpp/trunk/samples/store-nosql/htdocs/store.html
index 21eabca7a7..4e2ee6795a 100644
--- a/sca-cpp/trunk/samples/store-nosql/htdocs/store.html
+++ b/sca-cpp/trunk/samples/store-nosql/htdocs/store.html
@@ -20,10 +20,12 @@
 <head>
 <title>Store</title>
 
-<script type="text/javascript" src="store.js"></script>
+<script type="text/javascript" src="/js/tuscany-ref.js"></script>
 
 <script language="JavaScript">
 
+    var component = new tuscany.sca.Component("Store");
+
 	//@Reference
 	var catalog = new tuscany.sca.Reference("catalog");
 	
@@ -35,7 +37,7 @@
 	
 	var catalogItems;
 
-	function catalog_getResponse(items,exception) {
+	function catalog_getcatalogResponse(items,exception) {
 		if(exception){
 			alert(exception.message);
 			return;
@@ -50,8 +52,7 @@
 		document.getElementById('catalog').innerHTML=catalog;
 		catalogItems = items;
 
-		// TEMP		
-		shoppingTotal.gettotal(shoppingTotal_getTotalResponse);
+		shoppingTotal.apply("gettotal", shoppingTotal_gettotalResponse);
 	}
 	
 	function shoppingCart_getResponse(feed) {
@@ -68,7 +69,7 @@
 
 			if (entries.length != 0) {			
 					try	{
-						shoppingTotal.gettotal(shoppingTotal_getTotalResponse);
+						shoppingTotal.apply("gettotal", shoppingTotal_gettotalResponse);
 					}
 					catch(e){
 						alert(e);
@@ -77,7 +78,7 @@
 		}
 	}
 	
-	function shoppingTotal_getTotalResponse(total,exception) {
+	function shoppingTotal_gettotalResponse(total,exception) {
 		if(exception) { 
 			alert(exception.message); 
 			return;
@@ -130,7 +131,7 @@
 	function init() {
 			
 			try	{
-				catalog.get(catalog_getResponse);
+				catalog.apply("getcatalog", catalog_getcatalogResponse);
 				shoppingCart.get("", shoppingCart_getResponse);
 			}
 			catch(e){
diff --git a/sca-cpp/trunk/samples/store-nosql/htdocs/store.js b/sca-cpp/trunk/samples/store-nosql/htdocs/store.js
deleted file mode 100644
index 9cd8eb526d..0000000000
--- a/sca-cpp/trunk/samples/store-nosql/htdocs/store.js
+++ /dev/null
@@ -1,661 +0,0 @@
-
-/* Apache Tuscany SCA Widget header */
-
-/*
- * JSON-RPC JavaScript client
- *
- * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
- *
- * Copyright (c) 2003-2004 Jan-Klaas Kollhof
- * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
- *
- * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
- *
- * Licensed 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.
- *
- */
-
-/*
- * Modifications for Apache Tuscany:
- * - JSONRpcClient_createMethod changed so callback is last arg
- */
-
-/* escape a character */
-
-escapeJSONChar =
-function escapeJSONChar(c)
-{
-    if(c == "\"" || c == "\\") return "\\" + c;
-    else if (c == "\b") return "\\b";
-    else if (c == "\f") return "\\f";
-    else if (c == "\n") return "\\n";
-    else if (c == "\r") return "\\r";
-    else if (c == "\t") return "\\t";
-    var hex = c.charCodeAt(0).toString(16);
-    if(hex.length == 1) return "\\u000" + hex;
-    else if(hex.length == 2) return "\\u00" + hex;
-    else if(hex.length == 3) return "\\u0" + hex;
-    else return "\\u" + hex;
-};
-
-
-/* encode a string into JSON format */
-
-escapeJSONString =
-function escapeJSONString(s)
-{
-    /* The following should suffice but Safari's regex is b0rken
-       (doesn't support callback substitutions)
-       return "\"" + s.replace(/([^\u0020-\u007f]|[\\\"])/g,
-       escapeJSONChar) + "\"";
-    */
-
-    /* Rather inefficient way to do it */
-    var parts = s.split("");
-    for(var i=0; i < parts.length; i++) {
-	var c =parts[i];
-	if(c == '"' ||
-	   c == '\\' ||
-	   c.charCodeAt(0) < 32 ||
-	   c.charCodeAt(0) >= 128)
-	    parts[i] = escapeJSONChar(parts[i]);
-    }
-    return "\"" + parts.join("") + "\"";
-};
-
-
-/* Marshall objects to JSON format */
-
-toJSON = function toJSON(o)
-{
-    if(o == null) {
-	return "null";
-    } else if(o.constructor == String) {
-	return escapeJSONString(o);
-    } else if(o.constructor == Number) {
-	return o.toString();
-    } else if(o.constructor == Boolean) {
-	return o.toString();
-    } else if(o.constructor == Date) {
-	return '{javaClass: "java.util.Date", time: ' + o.valueOf() +'}';
-    } else if(o.constructor == Array) {
-	var v = [];
-	for(var i = 0; i < o.length; i++) v.push(toJSON(o[i]));
-	return "[" + v.join(", ") + "]";
-    } else {
-	var v = [];
-	for(attr in o) {
-	    if(o[attr] == null) v.push("\"" + attr + "\": null");
-	    else if(typeof o[attr] == "function"); /* skip */
-	    else v.push(escapeJSONString(attr) + ": " + toJSON(o[attr]));
-	}
-	return "{" + v.join(", ") + "}";
-    }
-};
-
-
-/* JSONRpcClient constructor */
-
-JSONRpcClient =
-function JSONRpcClient_ctor(serverURL, user, pass, objectID)
-{
-    this.serverURL = serverURL;
-    this.user = user;
-    this.pass = pass;
-    this.objectID = objectID;
-
-    /* Add standard methods */
-    if(this.objectID) {
-	this._addMethods(["listMethods"]);
-	var req = this._makeRequest("listMethods", []);
-    } else {
-	this._addMethods(["system.listMethods"]);
-	var req = this._makeRequest("system.listMethods", []);
-    }
-    var m = this._sendRequest(req);
-    this._addMethods(m);
-};
-
-
-/* JSONRpcCLient.Exception */
-
-JSONRpcClient.Exception =
-function JSONRpcClient_Exception_ctor(code, message, javaStack)
-{
-    this.code = code;
-    var name;
-    if(javaStack) {
-	this.javaStack = javaStack;
-	var m = javaStack.match(/^([^:]*)/);
-	if(m) name = m[0];
-    }
-    if(name) this.name = name;
-    else this.name = "JSONRpcClientException";
-    this.message = message;
-};
-
-JSONRpcClient.Exception.CODE_REMOTE_EXCEPTION = 490;
-JSONRpcClient.Exception.CODE_ERR_CLIENT = 550;
-JSONRpcClient.Exception.CODE_ERR_PARSE = 590;
-JSONRpcClient.Exception.CODE_ERR_NOMETHOD = 591;
-JSONRpcClient.Exception.CODE_ERR_UNMARSHALL = 592;
-JSONRpcClient.Exception.CODE_ERR_MARSHALL = 593;
-
-JSONRpcClient.Exception.prototype = new Error();
-
-JSONRpcClient.Exception.prototype.toString =
-function JSONRpcClient_Exception_toString(code, msg)
-{
-    return this.name + ": " + this.message;
-};
-
-
-/* Default top level exception handler */
-
-JSONRpcClient.default_ex_handler =
-function JSONRpcClient_default_ex_handler(e) { alert(e); };
-
-
-/* Client settable variables */
-
-JSONRpcClient.toplevel_ex_handler = JSONRpcClient.default_ex_handler;
-JSONRpcClient.profile_async = false;
-JSONRpcClient.max_req_active = 1;
-JSONRpcClient.requestId = 1;
-
-
-/* JSONRpcClient implementation */
-
-JSONRpcClient.prototype._createMethod =
-function JSONRpcClient_createMethod(methodName)
-{
-    var fn=function()
-    {
-	var args = [];
-	var callback = null;
-	for(var i=0;i<arguments.length;i++) args.push(arguments[i]);
-
-/*	TUSCANY change callback to be last arg instead of first to match binding.ajax
-	if(typeof args[0] == "function") callback = args.shift();
-*/
-	if(typeof args[arguments.length-1] == "function") callback = args.pop();
-
-	var req = fn.client._makeRequest.call(fn.client, fn.methodName,
-					      args, callback);
-	if(callback == null) {
-	    return fn.client._sendRequest.call(fn.client, req);
-	} else {
-	    JSONRpcClient.async_requests.push(req);
-	    JSONRpcClient.kick_async();
-	    return req.requestId;
-	}
-    };
-    fn.client = this;
-    fn.methodName = methodName;
-    return fn;
-};
-
-JSONRpcClient.prototype._addMethods =
-function JSONRpcClient_addMethods(methodNames)
-{
-    for(var i=0; i<methodNames.length; i++) {
-	var obj = this;
-	var names = methodNames[i].split(".");
-	for(var n=0; n<names.length-1; n++) {
-	    var name = names[n];
-	    if(obj[name]) {
-		obj = obj[name];
-	    } else {
-		obj[name]  = new Object();
-		obj = obj[name];
-	    }
-	}
-	var name = names[names.length-1];
-	if(!obj[name]) {
-	    var method = this._createMethod(methodNames[i]);
-	    obj[name] = method;
-	}
-    }
-};
-
-JSONRpcClient._getCharsetFromHeaders =
-function JSONRpcClient_getCharsetFromHeaders(http)
-{
-    try {
-	var contentType = http.getResponseHeader("Content-type");
-	var parts = contentType.split(/\s*;\s*/);
-	for(var i =0; i < parts.length; i++) {
-	    if(parts[i].substring(0, 8) == "charset=")
-		return parts[i].substring(8, parts[i].length);
-	}
-    } catch (e) {}
-    return "UTF-8"; /* default */
-};
-
-/* Async queue globals */
-JSONRpcClient.async_requests = [];
-JSONRpcClient.async_inflight = {};
-JSONRpcClient.async_responses = [];
-JSONRpcClient.async_timeout = null;
-JSONRpcClient.num_req_active = 0;
-
-JSONRpcClient._async_handler =
-function JSONRpcClient_async_handler()
-{
-    JSONRpcClient.async_timeout = null;
-
-    while(JSONRpcClient.async_responses.length > 0) {
-	var res = JSONRpcClient.async_responses.shift();
-	if(res.canceled) continue;
-	if(res.profile) res.profile.dispatch = new Date();
-	try {
-	    res.cb(res.result, res.ex, res.profile);
-	} catch(e) {
-	    JSONRpcClient.toplevel_ex_handler(e);
-	}
-    }
-
-    while(JSONRpcClient.async_requests.length > 0 &&
-	  JSONRpcClient.num_req_active < JSONRpcClient.max_req_active) {
-	var req = JSONRpcClient.async_requests.shift();
-	if(req.canceled) continue;
-	req.client._sendRequest.call(req.client, req);
-    }
-};
-
-JSONRpcClient.kick_async =
-function JSONRpcClient_kick_async()
-{
-    if(JSONRpcClient.async_timeout == null)
-	JSONRpcClient.async_timeout =
-	    setTimeout(JSONRpcClient._async_handler, 0);
-};
-
-JSONRpcClient.cancelRequest =
-function JSONRpcClient_cancelRequest(requestId)
-{
-    /* If it is in flight then mark it as canceled in the inflight map
-       and the XMLHttpRequest callback will discard the reply. */
-    if(JSONRpcClient.async_inflight[requestId]) {
-	JSONRpcClient.async_inflight[requestId].canceled = true;
-	return true;
-    }
-
-    /* If its not in flight yet then we can just mark it as canceled in
-       the the request queue and it will get discarded before being sent. */
-    for(var i in JSONRpcClient.async_requests) {
-	if(JSONRpcClient.async_requests[i].requestId == requestId) {
-	    JSONRpcClient.async_requests[i].canceled = true;
-	    return true;
-	}
-    }
-
-    /* It may have returned from the network and be waiting for its callback
-       to be dispatched, so mark it as canceled in the response queue
-       and the response will get discarded before calling the callback. */
-    for(var i in JSONRpcClient.async_responses) {
-	if(JSONRpcClient.async_responses[i].requestId == requestId) {
-	    JSONRpcClient.async_responses[i].canceled = true;
-	    return true;
-	}
-    }
-
-    return false;
-};
-
-JSONRpcClient.prototype._makeRequest =
-function JSONRpcClient_makeRequest(methodName, args, cb)
-{
-    var req = {};
-    req.client = this;
-    req.requestId = JSONRpcClient.requestId++;
-
-    var obj = {};
-    obj.id = req.requestId;
-    if (this.objectID)
-	obj.method = ".obj#" + this.objectID + "." + methodName;
-    else
-	obj.method = methodName;
-    obj.params = args;
-
-    if (cb) req.cb = cb;
-    if (JSONRpcClient.profile_async)
-	req.profile = { "submit": new Date() };
-    req.data = toJSON(obj);
-
-    return req;
-};
-
-JSONRpcClient.prototype._sendRequest =
-function JSONRpcClient_sendRequest(req)
-{
-    if(req.profile) req.profile.start = new Date();
-
-    /* Get free http object from the pool */
-    var http = JSONRpcClient.poolGetHTTPRequest();
-    JSONRpcClient.num_req_active++;
-
-    /* Send the request */
-    if (typeof(this.user) == "undefined") {
-	http.open("POST", this.serverURL, (req.cb != null));
-    } else {
-	http.open("POST", this.serverURL, (req.cb != null), this.user, this.pass);
-    }
-
-    /* setRequestHeader is missing in Opera 8 Beta */
-    try { http.setRequestHeader("Content-type", "text/plain"); } catch(e) {}
-
-    /* Construct call back if we have one */
-    if(req.cb) {
-	var self = this;
-	http.onreadystatechange = function() {
-	    if(http.readyState == 4) {
-		http.onreadystatechange = function () {};
-		var res = { "cb": req.cb, "result": null, "ex": null};
-		if (req.profile) {
-		    res.profile = req.profile;
-		    res.profile.end = new Date();
-		}
-		try { res.result = self._handleResponse(http); }
-		catch(e) { res.ex = e; }
-		if(!JSONRpcClient.async_inflight[req.requestId].canceled)
-		    JSONRpcClient.async_responses.push(res);
-		delete JSONRpcClient.async_inflight[req.requestId];
-		JSONRpcClient.kick_async();
-	    }
-	};
-    } else {
-	http.onreadystatechange = function() {};
-    }
-
-    JSONRpcClient.async_inflight[req.requestId] = req;
-	
-    try {
-	http.send(req.data);
-    } catch(e) {
-	JSONRpcClient.poolReturnHTTPRequest(http);
-	JSONRpcClient.num_req_active--;
-	throw new JSONRpcClient.Exception
-	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
-    }
-
-    if(!req.cb) return this._handleResponse(http);
-};
-
-JSONRpcClient.prototype._handleResponse =
-function JSONRpcClient_handleResponse(http)
-{
-    /* Get the charset */
-    if(!this.charset) {
-	this.charset = JSONRpcClient._getCharsetFromHeaders(http);
-    }
-
-    /* Get request results */
-    var status, statusText, data;
-    try {
-	status = http.status;
-	statusText = http.statusText;
-	data = http.responseText;
-    } catch(e) {
-	JSONRpcClient.poolReturnHTTPRequest(http);
-	JSONRpcClient.num_req_active--;
-	JSONRpcClient.kick_async();
-	throw new JSONRpcClient.Exception
-	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
-    }
-
-    /* Return http object to the pool; */
-    JSONRpcClient.poolReturnHTTPRequest(http);
-    JSONRpcClient.num_req_active--;
-
-    /* Unmarshall the response */
-    if(status != 200) {
-	throw new JSONRpcClient.Exception(status, statusText);
-    }
-    var obj;
-    try {
-	eval("obj = " + data);
-    } catch(e) {
-	throw new JSONRpcClient.Exception(550, "error parsing result");
-    }
-    if(obj.error)
-	throw new JSONRpcClient.Exception(obj.error.code, obj.error.msg,
-					  obj.error.trace);
-    var res = obj.result;
-
-    /* Handle CallableProxy */
-    if(res && res.objectID && res.JSONRPCType == "CallableReference")
-	return new JSONRpcClient(this.serverURL, this.user,
-				 this.pass, res.objectID);
-
-    return res;
-};
-
-
-/* XMLHttpRequest wrapper code */
-
-/* XMLHttpRequest pool globals */
-JSONRpcClient.http_spare = [];
-JSONRpcClient.http_max_spare = 8;
-
-JSONRpcClient.poolGetHTTPRequest =
-function JSONRpcClient_pool_getHTTPRequest()
-{
-    if(JSONRpcClient.http_spare.length > 0) {
-	return JSONRpcClient.http_spare.pop();
-    }
-    return JSONRpcClient.getHTTPRequest();
-};
-
-JSONRpcClient.poolReturnHTTPRequest =
-function JSONRpcClient_poolReturnHTTPRequest(http)
-{
-    if(JSONRpcClient.http_spare.length >= JSONRpcClient.http_max_spare)
-	delete http;
-    else
-	JSONRpcClient.http_spare.push(http);
-};
-
-JSONRpcClient.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
-			     "MSXML2.XMLHTTP.4.0",
-			     "MSXML2.XMLHTTP.3.0",
-			     "MSXML2.XMLHTTP",
-			     "Microsoft.XMLHTTP" ];
-
-JSONRpcClient.getHTTPRequest =
-function JSONRpcClient_getHTTPRequest()
-{
-    /* Mozilla XMLHttpRequest */
-    try {
-	JSONRpcClient.httpObjectName = "XMLHttpRequest";
-	return new XMLHttpRequest();
-    } catch(e) {}
-
-    /* Microsoft MSXML ActiveX */
-    for (var i=0;i < JSONRpcClient.msxmlNames.length; i++) {
-	try {
-	    JSONRpcClient.httpObjectName = JSONRpcClient.msxmlNames[i];
-	    return new ActiveXObject(JSONRpcClient.msxmlNames[i]);
-	} catch (e) {}
-    }
-
-    /* None found */
-    JSONRpcClient.httpObjectName = null;
-    throw new JSONRpcClient.Exception(0, "Can't create XMLHttpRequest object");
-};
-
-
-/*
- * 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.    
- */
-	
-function AtomClient(uri) {
-
-	this.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
-                        "MSXML2.XMLHTTP.4.0",
-                        "MSXML2.XMLHTTP.3.0",
-                        "MSXML2.XMLHTTP",
-                        "Microsoft.XMLHTTP" ];
-			            
-	this.uri=uri;
-	
-	this.get = function(id, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-				    var strDocument = xhr.responseText;
-				    var xmlDocument = xhr.responseXML;
-				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
-                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
-                    } 
-                    if (responseFunction != null) responseFunction(xmlDocument);
-				} else {
-                    alert("get - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("GET", uri + '/' + id, true);
-		xhr.send(null);
-	}	
-
-	this.post = function (entry, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 201) {
-				    var strDocument = xhr.responseText;
-				    var xmlDocument = xhr.responseXML;
-				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
-                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
-                    } 
-					if (responseFunction != null) responseFunction(xmlDocument);
-				} else {
-					alert("post - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("POST", uri, true);
-		xhr.setRequestHeader("Content-Type", "application/atom+xml");
-		xhr.send(entry);
-	}	
-
-	this.put = function (id, entry, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-				    var strDocument = xhr.responseText;
-				    var xmlDocument = xhr.responseXML;
-				    if(!xmlDocument || xmlDocument.childNodes.length==0){ 
-                        xmlDocument = (new DOMParser()).parseFromString(strDocument, "text/xml");
-                    } 
-					if (responseFunction != null) responseFunction(xmlDocument);
-				} else {
-					alert("put - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("PUT", uri + '/' + id, true);
-		xhr.setRequestHeader("Content-Type", "application/atom+xml");
-		xhr.send(entry);
-	}	
-
-	this.del = function (id, responseFunction) {       
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-					if (responseFunction != null) responseFunction();
-				} else {
-					alert("delete - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("DELETE", uri + '/' + id, true);		
-		xhr.send(null);
-	}
-	this.createXMLHttpRequest = function () {
-        /* Mozilla XMLHttpRequest */
-        try {return new XMLHttpRequest();} catch(e) {}      
-		
-        /* Microsoft MSXML ActiveX */
-        for (var i=0;i < this.msxmlNames.length; i++) {
-            try {return new ActiveXObject(this.msxmlNames[i]);} catch (e) {}
-        }
-        alert("XML http request not supported");
-        return null;
-	}
-	if (typeof DOMParser == "undefined") {
-	   DOMParser = function () {}
-	
-	   DOMParser.prototype.parseFromString = function (str, contentType) {
-	      if (typeof ActiveXObject != "undefined") {
-	         var d = new ActiveXObject("MSXML.DomDocument");
-	         d.loadXML(str);
-	         return d;
-	      } else if (typeof XMLHttpRequest != "undefined") {
-	         var req = new XMLHttpRequest;
-	         req.open("GET", "data:" + (contentType || "application/xml") +
-	                         ";charset=utf-8," + encodeURIComponent(str), false);
-	         if (req.overrideMimeType) {
-	            req.overrideMimeType(contentType);
-	         }
-	         req.send(null);
-	         return req.responseXML;
-	      }
-      }
-   }
-}
-
-
-
-/* Tuscany Reference/Property injection code */
-
-if (!tuscany) { 
-var tuscany = {}; 
-}
-if (!tuscany.sca) { 
-tuscany.sca = {}; 
-}
-
-tuscany.sca.propertyMap = new String();
-tuscany.sca.Property = function (name) {
-    return tuscany.sca.propertyMap[name];
-}
-
-tuscany.sca.referenceMap = new Object();
-tuscany.sca.referenceMap.catalog = new JSONRpcClient("/catalog").Service;
-tuscany.sca.referenceMap.shoppingCart = new AtomClient("/shoppingCart");
-tuscany.sca.referenceMap.shoppingTotal = new JSONRpcClient("/total").Service;
-tuscany.sca.Reference = function (name) {
-    return tuscany.sca.referenceMap[name];
-}
-
-/** End of Apache Tuscany SCA Widget */
-
diff --git a/sca-cpp/trunk/samples/store-nosql/shopping-cart.scm b/sca-cpp/trunk/samples/store-nosql/shopping-cart.scm
index 484044d420..ec85d463fc 100644
--- a/sca-cpp/trunk/samples/store-nosql/shopping-cart.scm
+++ b/sca-cpp/trunk/samples/store-nosql/shopping-cart.scm
@@ -80,5 +80,3 @@
   (sum cart)
 )
 
-; TODO remove these JSON-RPC specific functions
-(define (listMethods cache) (list "Service.gettotal"))
diff --git a/sca-cpp/trunk/samples/store-nosql/store.composite b/sca-cpp/trunk/samples/store-nosql/store.composite
index 85a6e278d4..90e4323318 100644
--- a/sca-cpp/trunk/samples/store-nosql/store.composite
+++ b/sca-cpp/trunk/samples/store-nosql/store.composite
@@ -43,7 +43,7 @@
      
     <component name="ShoppingCart">
         <t:implementation.scheme script="shopping-cart.scm"/>
-        <service name="ShoppingCart">
+        <service name="Cart">
             <t:binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
diff --git a/sca-cpp/trunk/samples/store-nosql/store.scm b/sca-cpp/trunk/samples/store-nosql/store.scm
index d851dc7ed6..8bfbb3d5fd 100644
--- a/sca-cpp/trunk/samples/store-nosql/store.scm
+++ b/sca-cpp/trunk/samples/store-nosql/store.scm
@@ -30,7 +30,7 @@
 )
 
 (define (getcatalog catalog shoppingCart shoppingTotal)
-  (catalog "get")
+  (catalog "getcatalog")
 )
 
 (define (gettotal catalog shoppingCart shoppingTotal)
@@ -45,6 +45,3 @@
   (shoppingCart "delete" id)
 )
 
-; TODO remove these JSON-RPC specific functions
-(define (listMethods catalog shoppingCart shoppingTotal) (list "Service.getcatalog" "Service.gettotal"))
-
author	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2010-07-01 06:04:35 +0000
committer	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2010-07-01 06:04:35 +0000
commit	ac8bb2ddecac09d60760ef83319b627548d0fd77 (patch)
tree	b15d73262f02989d8dfe554e127e82e70b5aebe4 /sca-cpp/trunk/samples/store-nosql
parent	54561e00c9714c9230dc1ed39f3bb548a59adeed (diff)