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/14 10:34:04 UTC
svn commit: r985445 [1/3] - in
/tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime: ./
src/main/java/org/apache/tuscany/sca/binding/comet/runtime/
src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/
src/main/java/org/apache/tusc...
Author: fmoga
Date: Sat Aug 14 08:34:04 2010
New Revision: 985445
URL: http://svn.apache.org/viewvc?rev=985445&view=rev
Log:
Added singleton servlet to serve javascript files.
Added sequential loading of javascript dependencies.
Changed snapshot version of atmosphere to stable 0.6.1.
Added:
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java
- copied, changed from r985414, tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java
- copied, changed from r985414, tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingHandler.java
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/
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/jquery-1.4.2.js
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/resources/jquery.atmosphere.js
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/resources/org.apache.tuscany.sca.cometComponentContext.js
Removed:
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingHandler.java
Modified:
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/pom.xml
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java
Modified: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/pom.xml?rev=985445&r1=985444&r2=985445&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/pom.xml Sat Aug 14 08:34:04 2010
@@ -40,12 +40,12 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-commons</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6.1</version>
</dependency>
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.6.1</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.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/CometServiceBindingProvider.java?rev=985445&r1=985444&r2=985445&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java Sat Aug 14 08:34:04 2010
@@ -26,7 +26,6 @@ import org.apache.tuscany.sca.interfaced
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.atmosphere.cpr.AtmosphereServlet;
public class CometServiceBindingProvider implements ServiceBindingProvider {
Copied: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java (from r985414, tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.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/ServletFactory.java?p2=tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java&p1=tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java&r1=985414&r2=985445&rev=985445&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java Sat Aug 14 08:34:04 2010
@@ -11,33 +11,42 @@ import org.atmosphere.cpr.AtmosphereServ
public class ServletFactory {
private static final String PACKAGE_KEY = "com.sun.jersey.config.property.packages";
- private static final String PACKAGE_VALUE = "org.apache.tuscany.sca.binding.comet.runtime";
+ private static final String PACKAGE_VALUE = "org.apache.tuscany.sca.binding.comet.runtime.handler";
+ private static final String JS_PACKAGE_VALUE = "org.apache.tuscany.sca.binding.comet.runtime.javascript";
public static final String ENDPOINTS_KEY = "org.apache.tuscany.sca.binding.comet.endpoints";
public static final String OPERATIONS_KEY = "org.apache.tuscany.sca.binding.comet.operations";
public static final String PATH = "/tuscany-comet/*";
+ public static final String JS_PATH = "/org.apache.tuscany.sca.cometComponentContext.js/*";
- private static AtmosphereServlet servlet = null;
+ private static AtmosphereServlet cometServlet = null;
+ private static AtmosphereServlet javascriptServlet = null;
public static synchronized void registerServlet(ServletHost servletHost,
RuntimeEndpoint endpoint,
Operation operation) {
- if (servlet == null) {
- servlet = new AtmosphereServlet();
- servlet.addInitParameter(PACKAGE_KEY, PACKAGE_VALUE);
- servletHost.addServletMapping(PATH, servlet);
+ if (cometServlet == null) {
+ cometServlet = new AtmosphereServlet();
+ cometServlet.addInitParameter(PACKAGE_KEY, PACKAGE_VALUE);
+ servletHost.addServletMapping(PATH, cometServlet);
Map<String, RuntimeEndpoint> endpoints = new HashMap<String, RuntimeEndpoint>();
- servlet.getServletContext().setAttribute(ENDPOINTS_KEY, endpoints);
+ cometServlet.getServletContext().setAttribute(ENDPOINTS_KEY, endpoints);
Map<String, Operation> operations = new HashMap<String, Operation>();
- servlet.getServletContext().setAttribute(OPERATIONS_KEY, operations);
+ cometServlet.getServletContext().setAttribute(OPERATIONS_KEY, operations);
}
String url = endpoint.getBinding().getURI() + "/" + operation.getName();
System.out.println("Adding endpoint and operation for url: " + url);
Map<String, RuntimeEndpoint> endpoints =
- (Map<String, RuntimeEndpoint>)servlet.getServletContext().getAttribute(ENDPOINTS_KEY);
+ (Map<String, RuntimeEndpoint>)cometServlet.getServletContext().getAttribute(ENDPOINTS_KEY);
endpoints.put(url, endpoint);
Map<String, Operation> operations =
- (Map<String, Operation>)servlet.getServletContext().getAttribute(OPERATIONS_KEY);
+ (Map<String, Operation>)cometServlet.getServletContext().getAttribute(OPERATIONS_KEY);
operations.put(url, operation);
+
+ if (javascriptServlet == null) {
+ javascriptServlet = new AtmosphereServlet();
+ javascriptServlet.addInitParameter(PACKAGE_KEY, JS_PACKAGE_VALUE);
+ servletHost.addServletMapping(JS_PATH, javascriptServlet);
+ }
}
}
Copied: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java (from r985414, tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingHandler.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/handler/CometBindingHandler.java?p2=tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java&p1=tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingHandler.java&r1=985414&r2=985445&rev=985445&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingHandler.java (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java Sat Aug 14 08:34:04 2010
@@ -1,4 +1,4 @@
-package org.apache.tuscany.sca.binding.comet.runtime;
+package org.apache.tuscany.sca.binding.comet.runtime.handler;
import java.lang.reflect.InvocationTargetException;
import java.util.Map;
@@ -10,10 +10,10 @@ import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Request;
+import org.apache.tuscany.sca.binding.comet.runtime.EventsLogger;
+import org.apache.tuscany.sca.binding.comet.runtime.ServletFactory;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
import org.atmosphere.annotation.Broadcast;
Added: 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=985445&view=auto
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java (added)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java Sat Aug 14 08:34:04 2010
@@ -0,0 +1,31 @@
+package org.apache.tuscany.sca.binding.comet.runtime.javascript;
+
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.PathSegment;
+
+@Path("/")
+@Produces("text/javascript")
+public class JavascriptResource {
+
+ private static final String[] DEPENDENCIES = {"/jquery-1.4.2.js", "/jquery.atmosphere.js",
+ "/org.apache.tuscany.sca.cometComponentContext.js"};
+
+ @GET
+ public InputStream getJavascript(@PathParam("file") PathSegment fileName) {
+ InputStream stream = null;
+ for (String dependency : DEPENDENCIES) {
+ if (stream == null) {
+ stream = getClass().getResourceAsStream(dependency);
+ } else {
+ stream = new SequenceInputStream(stream, getClass().getResourceAsStream(dependency));
+ }
+ }
+ return stream;
+ }
+}