diff options
Diffstat (limited to 'sca-java-2.x/contrib/modules')
3 files changed, 3 insertions, 58 deletions
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java b/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java index def2783a81..800b42b098 100644 --- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java +++ b/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java @@ -51,10 +51,8 @@ import javax.servlet.http.HttpServletResponse; public class JavascriptResourceServlet extends HttpServlet {
- private static final String JSON_PLUGIN_PATH = "js/jquery.json-2.2.min.js";
private static final String WEBSOCKET_TOOLKIT_PATH = "js/TuscanyWebsocketToolkit.js";
- private String jsonPlugin;
private String websocketToolkit;
@Override
@@ -62,7 +60,6 @@ public class JavascriptResourceServlet extends HttpServlet { try {
resp.setContentType("text/javascript");
OutputStream os = resp.getOutputStream();
- os.write(getJsonPlugin().getBytes());
os.write("var Tuscany = new function() {\n".getBytes());
os.write(getWebsocketToolkit().getBytes());
os.write(JavascriptGenerator.getServiceProxies().getBytes());
@@ -72,13 +69,6 @@ public class JavascriptResourceServlet extends HttpServlet { }
}
- private String getJsonPlugin() {
- if (jsonPlugin == null) {
- jsonPlugin = getResource(JSON_PLUGIN_PATH);
- }
- return jsonPlugin;
- }
-
private String getWebsocketToolkit() {
if (websocketToolkit == null) {
websocketToolkit = getResource(WEBSOCKET_TOOLKIT_PATH);
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js b/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js index 501250f3cf..ede28579d3 100644 --- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js +++ b/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js @@ -20,9 +20,9 @@ var channels = []; function buildRequest(operation, message) { - return $.toJSON({ + return JSON.stringify({ operation: operation, - payload: $.toJSON(message) + payload: JSON.stringify(message) }); } @@ -34,7 +34,7 @@ function sendMessage(port, operation, message) { $(document).trigger('' + port); } ws.onmessage = function (message) { - var response = $.evalJSON(message.data); + var response = eval('(' + message.data + ')'); eval('Tuscany.WebsocketComponentContext.' + response.operation + '.responseHandler(' + response.payload + ')'); } } diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/jquery.json-2.2.min.js b/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/jquery.json-2.2.min.js deleted file mode 100644 index b176b7ace5..0000000000 --- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/jquery.json-2.2.min.js +++ /dev/null @@ -1,45 +0,0 @@ -/* - * jQuery JSON Plugin - * version: 2.2 (2009-08-14) - * - * This document is licensed as free software under the terms of the - * MIT License: http://www.opensource.org/licenses/mit-license.php - * - * Brantley Harris wrote this plugin. It is based somewhat on the JSON.org - * website's http://www.json.org/json2.js, which proclaims: - * "NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.", a sentiment that - * I uphold. - * - * It is also influenced heavily by MochiKit's serializeJSON, which is - * copyrighted 2005 by Bob Ippolito. - */ -(function($){$.toJSON=function(o) -{if(typeof(JSON)=='object'&&JSON.stringify) -return JSON.stringify(o);var type=typeof(o);if(o===null) -return"null";if(type=="undefined") -return undefined;if(type=="number"||type=="boolean") -return o+"";if(type=="string") -return $.quoteString(o);if(type=='object') -{if(typeof o.toJSON=="function") -return $.toJSON(o.toJSON());if(o.constructor===Date) -{var month=o.getUTCMonth()+1;if(month<10)month='0'+month;var day=o.getUTCDate();if(day<10)day='0'+day;var year=o.getUTCFullYear();var hours=o.getUTCHours();if(hours<10)hours='0'+hours;var minutes=o.getUTCMinutes();if(minutes<10)minutes='0'+minutes;var seconds=o.getUTCSeconds();if(seconds<10)seconds='0'+seconds;var milli=o.getUTCMilliseconds();if(milli<100)milli='0'+milli;if(milli<10)milli='0'+milli;return'"'+year+'-'+month+'-'+day+'T'+ -hours+':'+minutes+':'+seconds+'.'+milli+'Z"';} -if(o.constructor===Array) -{var ret=[];for(var i=0;i<o.length;i++) -ret.push($.toJSON(o[i])||"null");return"["+ret.join(",")+"]";} -var pairs=[];for(var k in o){var name;var type=typeof k;if(type=="number") -name='"'+k+'"';else if(type=="string") -name=$.quoteString(k);else -continue;if(typeof o[k]=="function") -continue;var val=$.toJSON(o[k]);pairs.push(name+":"+val);} -return"{"+pairs.join(", ")+"}";}};$.evalJSON=function(src) -{if(typeof(JSON)=='object'&&JSON.parse) -return JSON.parse(src);return eval("("+src+")");};$.secureEvalJSON=function(src) -{if(typeof(JSON)=='object'&&JSON.parse) -return JSON.parse(src);var filtered=src;filtered=filtered.replace(/\\["\\\/bfnrtu]/g,'@');filtered=filtered.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']');filtered=filtered.replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered)) -return eval("("+src+")");else -throw new SyntaxError("Error parsing JSON, source is not valid.");};$.quoteString=function(string) -{if(string.match(_escapeable)) -{return'"'+string.replace(_escapeable,function(a) -{var c=_meta[a];if(typeof c==='string')return c;c=a.charCodeAt();return'\\u00'+Math.floor(c/16).toString(16)+(c%16).toString(16);})+'"';} -return'"'+string+'"';};var _escapeable=/["\\\x00-\x1f\x7f-\x9f]/g;var _meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};})(jQuery);
\ No newline at end of file |