svn commit: r1150609 - in /tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main: java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java resources/js/TuscanyWebsocketToolkit.js resources/js/jquery.json-2.2.min.js

[fmoga]

Author: fmoga
Date: Mon Jul 25 09:54:29 2011
New Revision: 1150609

URL: http://svn.apache.org/viewvc?rev=1150609&view=rev
Log:
Remove jquery json plugin dependency. The client side toolkit has no dependency 
now.

Removed:
    
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/jquery.json-2.2.min.js
Modified:
    
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java
    
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js

Modified: 
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java?rev=1150609&r1=1150608&r2=1150609&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java
 (original)
+++ 
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java
 Mon Jul 25 09:54:29 2011
@@ -51,10 +51,8 @@ import javax.servlet.http.HttpServletRes
 
 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 e
         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 e
         }
     }
 
-    private String getJsonPlugin() {
-        if (jsonPlugin == null) {
-            jsonPlugin = getResource(JSON_PLUGIN_PATH);
-        }
-        return jsonPlugin;
-    }
-
     private String getWebsocketToolkit() {
         if (websocketToolkit == null) {
             websocketToolkit = getResource(WEBSOCKET_TOOLKIT_PATH);

Modified: 
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js?rev=1150609&r1=1150608&r2=1150609&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js
 (original)
+++ 
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js
 Mon Jul 25 09:54:29 2011
@@ -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, me
             $(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 + ')');
         }
     }