diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca')
3 files changed, 8 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java b/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java index 70a793404f..150d6977e2 100644 --- a/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java +++ b/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java @@ -66,7 +66,7 @@ public final class ServletFactory { /** * Path where Javascript toolkit will be exposed. */ - public static final String JS_PATH = "/org.apache.tuscany.sca.cometComponentContext.js/*"; + public static final String JS_PATH = "/tuscany-comet-js/*"; /** * The servlet that is exposing the comet services. diff --git a/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java b/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java index 0d47b72f8b..3a9dcac049 100644 --- a/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java +++ b/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java @@ -22,6 +22,7 @@ package org.apache.tuscany.sca.binding.comet.runtime.handler; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -45,13 +46,11 @@ import org.apache.tuscany.sca.interfacedef.DataType; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.runtime.RuntimeEndpoint; -import org.atmosphere.cache.SessionBroadcasterCache; import org.atmosphere.cpr.Broadcaster; -import org.atmosphere.cpr.DefaultBroadcaster; -import org.atmosphere.cpr.DefaultBroadcasterFactory; +import org.atmosphere.cpr.BroadcasterLifeCyclePolicy.ATMOSPHERE_RESOURCE_POLICY; +import org.atmosphere.cpr.BroadcasterLifeCyclePolicy.Builder; import org.atmosphere.jersey.JerseyBroadcaster; import org.atmosphere.jersey.SuspendResponse; -import org.atmosphere.jersey.util.JerseyBroadcasterUtil; import com.sun.jersey.spi.container.servlet.PerSession; @@ -101,6 +100,8 @@ public class CometBindingHandler { System.out.println("-- connect -- Session Id: " + request.getSession().getId()); if (broadcaster == null) { broadcaster = new JerseyBroadcaster(); +// broadcaster.setBroadcasterLifeCyclePolicy(new Builder().policy(ATMOSPHERE_RESOURCE_POLICY.IDLE_DESTROY) +// .idleTimeInMS(5000).build()); context = (CometComponentContext) sc.getAttribute(ServletFactory.COMET_COMPONENT_CONTEXT_KEY); } CometComponentContext.broadcasters.put(request.getSession().getId(), broadcaster); @@ -127,7 +128,7 @@ public class CometBindingHandler { @POST @Path("/{service}/{method}") public void handleRequest(@PathParam("service") final String service, @PathParam("method") final String method, - @FormParam("callback") final String callbackMethod, @FormParam("params") final String jsonData) + @FormParam("callbackMethod") final String callbackMethod, @FormParam("params") final String jsonData) throws InvocationTargetException { System.out.println("-- handleRequest -- Session Id: " + request.getSession().getId()); final String url = "/" + service + "/" + method; diff --git a/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java b/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java index 9274009803..4f301a4d0b 100644 --- a/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java +++ b/sca-java-2.x/trunk/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java @@ -46,6 +46,7 @@ public class JavascriptResource { * @return InputStream containing the Javascript code. */ @GET + @Path("/org.apache.tuscany.sca.CometComponentContext.js") public InputStream getJavascript() { InputStream stream = null; // add dependencies in the specified order |