From b9658ecfef810c2db5518b1e4874929d20b38fb7 Mon Sep 17 00:00:00 2001 From: fmoga Date: Tue, 24 Aug 2010 19:55:01 +0000 Subject: 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 --- .../sca/binding/comet/runtime/javascript/JavascriptResource.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca') 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) { -- cgit v1.2.3