You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fm...@apache.org on 2010/08/15 13:27:46 UTC
svn commit: r985654 - in
/tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main:
java/org/apache/tuscany/sca/binding/comet/runtime/javascript/ resources/
Author: fmoga
Date: Sun Aug 15 11:27:45 2010
New Revision: 985654
URL: http://svn.apache.org/viewvc?rev=985654&view=rev
Log:
Added 'SCA' namespace to the embedded jquery, jquery extensions and tuscany API.
Modified:
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/resources/cometComponentContext.js
Modified: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java?rev=985654&r1=985653&r2=985654&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java Sun Aug 15 11:27:45 2010
@@ -5,20 +5,18 @@ import org.apache.tuscany.sca.interfaced
public class JavascriptGenerator {
+ public static final String JS_NAMESPACE = "SCA";
+ private static final String COMPONENT_CONTEXT = "this.CometComponentContext";
+ private static final String TUSCANY_COMET = "SCA.TuscanyComet";
+
public static StringBuffer javascript = new StringBuffer();
- private static final String COMPONENT_CONTEXT_NAMESPACE = "cometComponentContext";
- private static final String TUSCANY_COMET_NAMESPACE = "tuscanyComet";
public static void generateServiceProxy(ComponentService service) {
- javascript.append(COMPONENT_CONTEXT_NAMESPACE + "." + service.getName() + " = new Object();\n");
+ javascript.append(COMPONENT_CONTEXT + "." + service.getName() + " = new Object();\n");
}
public static void generateMethodProxy(ComponentService service, Operation operation) {
- javascript.append(COMPONENT_CONTEXT_NAMESPACE + "."
- + service.getName()
- + "."
- + operation.getName()
- + " = function(");
+ javascript.append(COMPONENT_CONTEXT + "." + service.getName() + "." + operation.getName() + " = function(");
for (int i = 0; i < operation.getInputType().getLogical().size(); i++) {
javascript.append("p" + i + ", ");
}
@@ -27,7 +25,7 @@ public class JavascriptGenerator {
for (int i = 0; i < operation.getInputType().getLogical().size(); i++) {
javascript.append(" params.push(p" + i + ");\n");
}
- javascript.append(" " + TUSCANY_COMET_NAMESPACE
+ javascript.append(" " + TUSCANY_COMET
+ ".callAsync('"
+ service.getName()
+ "/"
@@ -37,36 +35,3 @@ public class JavascriptGenerator {
}
}
-
-// cometComponentContext.c1 = new Object();
-// cometComponentContext.c1.TemperatureService = new Object();
-// cometComponentContext.c1.TemperatureService.getTemperatureCelsius =
-// function(p0, callbackMethod) {
-// tuscanyComet.callAsync('c1/TemperatureService/getTemperatureCelsius', x,
-// callbackMethod);
-// }
-// cometComponentContext.c1.TemperatureService.getTemperatureFahrenheit =
-// function(callbackMethod) {
-// tuscanyComet.callAsync('c1/TemperatureService/getTemperatureFahrenheit', x,
-// callbackMethod);
-// }
-//
-// if (cometComponentContext.c1 == null) {
-// cometComponentContext.c1 = new Object();
-// }
-// cometComponentContext.c1.HumidityService = new Object();
-// cometComponentContext.c1.HumidityService.getHumidity = function(p0,
-// callbackMethod) {
-// var params = [];
-// params.push(p0);
-// tuscanyComet.callAsync('c1/HumidityService/getHumidity', $.toJSON(params),
-// callbackMethod);
-// }
-//
-// cometComponentContext.c2 = new Object();
-// cometComponentContext.c2.PrecipitationService = new Object();
-// cometComponentContext.c2.PrecipitationService.getPrecipitation =
-// function(callbackMethod) {
-// tuscanyComet.callAsync('c2/PrecipitationService/getPrecipitation', x,
-// callbackMethod);
-// }
Modified: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java?rev=985654&r1=985653&r2=985654&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java Sun Aug 15 11:27:45 2010
@@ -26,7 +26,8 @@ public class JavascriptResource {
@GET
public InputStream getJavascript(@PathParam("file") PathSegment fileName) {
- InputStream stream = null;
+ InputStream stream =
+ new ByteArrayInputStream(("var " + JavascriptGenerator.JS_NAMESPACE + " = new function() {\n").getBytes());
for (String dependency : DEPENDENCIES) {
if (stream == null) {
stream = getClass().getResourceAsStream(dependency);
@@ -34,7 +35,7 @@ public class JavascriptResource {
stream = new SequenceInputStream(stream, getClass().getResourceAsStream(dependency));
}
}
- String generatedJs = ((StringBuffer)sc.getAttribute(ServletFactory.JS_KEY)).toString();
+ String generatedJs = ((StringBuffer)sc.getAttribute(ServletFactory.JS_KEY)).toString() + "\n}";
return new SequenceInputStream(stream, new ByteArrayInputStream(generatedJs.getBytes()));
}
}
Modified: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/resources/cometComponentContext.js
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/resources/cometComponentContext.js?rev=985654&r1=985653&r2=985654&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/resources/cometComponentContext.js (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/resources/cometComponentContext.js Sun Aug 15 11:27:45 2010
@@ -1,4 +1,5 @@
-var tuscanyComet = {
+
+this.TuscanyComet = {
appUrl: 'tuscany-comet',
connectedEndpoint : null,
connect : function(transport) {
@@ -23,4 +24,4 @@ var tuscanyComet = {
}
};
-var cometComponentContext = new Object();
+this.CometComponentContext = new Object();