Refactored the way jQuery dependency on the Javascript client is handled.

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

1 files changed, 3 insertions, 5 deletions

diff --git a/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java b/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
index 4333324377..9274009803 100644
--- a/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
+++ b/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
@@ -37,8 +37,8 @@ public class JavascriptResource {
     /**
      * Dependencies for the Tuscany Comet Javascript API.
      */
-    private static final String[] DEPENDENCIES = {"/jquery-1.4.2.min.js", "/jquery.atmosphere.js",
-                                                  "/jquery.json-2.2.min.js", "/cometComponentContext.js"};
+    private static final String[] DEPENDENCIES = {"/jquery.atmosphere.js", "/jquery.json-2.2.min.js",
+                                                  "/cometComponentContext.js"};
 
     /**
      * Method called when the Javascript toolkit is requested.
@@ -47,9 +47,7 @@ public class JavascriptResource {
      */
     @GET
     public InputStream getJavascript() {
-        // add namespace for embedded libraries
-        InputStream stream =
-            new ByteArrayInputStream(("var " + JavascriptGenerator.JS_NAMESPACE + " = new function() {\n").getBytes());
+        InputStream stream = null;
         // add dependencies in the specified order
         for (final String dependency : JavascriptResource.DEPENDENCIES) {
             if (stream == null) {