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/04 16:58:47 UTC
svn commit: r982281 -
/tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/
Author: fmoga
Date: Wed Aug 4 14:58:47 2010
New Revision: 982281
URL: http://svn.apache.org/viewvc?rev=982281&view=rev
Log:
Cleaned up comet binding.
Modified:
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java
tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServlet.java
Modified: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.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/CometBindingProviderFactory.java?rev=982281&r1=982280&r2=982281&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java Wed Aug 4 14:58:47 2010
@@ -34,7 +34,6 @@ public class CometBindingProviderFactory
private ServletHost servletHost;
public CometBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
- System.out.println("Entering CometBindingProviderFactory constructor...");
this.servletHost = ServletHostHelper.getServletHost(extensionPoints);
}
@@ -43,12 +42,10 @@ public class CometBindingProviderFactory
}
public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpoint) {
- System.out.println("Entering CometBindingProviderFactory#createReferenceBindingProvider...");
return new CometReferenceBindingProvider(endpoint);
}
public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) {
- System.out.println("Entering CometBindingProviderFactory#createServiceBindingProvider...");
return new CometServiceBindingProvider(endpoint, servletHost);
}
Modified: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.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/CometInvoker.java?rev=982281&r1=982280&r2=982281&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java Wed Aug 4 14:58:47 2010
@@ -30,13 +30,11 @@ public class CometInvoker implements Inv
protected EndpointReference endpoint;
public CometInvoker(Operation operation, EndpointReference endpoint) {
- System.out.println("Entering CometInvoker constructor...");
this.operation = operation;
this.endpoint = endpoint;
}
public Message invoke(Message msg) {
- System.out.println("Entering CometInvoker#invoke...");
return null;
}
Modified: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.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/CometReferenceBindingProvider.java?rev=982281&r1=982280&r2=982281&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java Wed Aug 4 14:58:47 2010
@@ -25,35 +25,28 @@ import org.apache.tuscany.sca.interfaced
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-// TODO
public class CometReferenceBindingProvider implements ReferenceBindingProvider {
private EndpointReference endpoint;
public CometReferenceBindingProvider(EndpointReference endpoint) {
- System.out.println("Entering CometReferenceBindingProvider constructor...");
this.endpoint = endpoint;
}
public Invoker createInvoker(Operation operation) {
- System.out.println("Entering CometReferenceBindingProvider#createInvoker...");
return new CometInvoker(operation, endpoint);
}
public void start() {
- System.out.println("Entering CometReferenceBindingProvider#start...");
}
public void stop() {
- System.out.println("Entering CometReferenceBindingProvider#stop...");
}
public InterfaceContract getBindingInterfaceContract() {
- System.out.println("Entering CometReferenceBindingProvider#getInterfaceContract...");
return null;
}
public boolean supportsOneWayInvocation() {
- System.out.println("Entering CometReferenceBindingProvider#supportsOneWayInvocation...");
return true;
}
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=982281&r1=982280&r2=982281&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 Wed Aug 4 14:58:47 2010
@@ -30,34 +30,31 @@ import org.atmosphere.cpr.MeteorServlet;
public class CometServiceBindingProvider implements ServiceBindingProvider {
+ private static final String SERVLET_KEY = "org.atmosphere.servlet";
+ private static final String SERVLET_VALUE = "org.apache.tuscany.sca.binding.comet.runtime.CometServlet";
+
private RuntimeEndpoint endpoint;
private ServletHost servletHost;
public CometServiceBindingProvider(RuntimeEndpoint endpoint, ServletHost servletHost) {
- System.out.println("Entering CometServiceBindingProvider constructor...");
this.endpoint = endpoint;
this.servletHost = servletHost;
}
public void start() {
- System.out.println("Entering CometServiceBindingProvider#start...");
ComponentService service = endpoint.getService();
Interface serviceInterface = service.getInterfaceContract().getInterface();
for (Operation op : serviceInterface.getOperations()) {
MeteorServlet servlet = new MeteorServlet();
- servlet.addInitParameter("org.atmosphere.servlet", "org.apache.tuscany.sca.binding.comet.runtime.CometServlet");
- // TODO fix TuscanyServletFilter to use Servlets 3.0
- servlet.addInitParameter("org.atmosphere.useNative", "true");
+ servlet.addInitParameter(SERVLET_KEY, SERVLET_VALUE);
String path = endpoint.getBinding().getURI() + "/" + op.getName();
servletHost.addServletMapping(path, servlet);
- System.out.println("Adding attributes to servlet context...");
- servlet.getServletContext().setAttribute("org.apache.tuscany.sca.binding.comet.endpoint", endpoint);
- servlet.getServletContext().setAttribute("org.apache.tuscany.sca.binding.comet.operation", op);
+ servlet.getServletContext().setAttribute(CometServlet.ENDPOINT_KEY, endpoint);
+ servlet.getServletContext().setAttribute(CometServlet.OPERATION_KEY, op);
}
}
public void stop() {
- System.out.println("Entering CometServiceBindingProvider#stop...");
ComponentService service = endpoint.getService();
Interface serviceInterface = service.getInterfaceContract().getInterface();
for (Operation op : serviceInterface.getOperations()) {
@@ -67,12 +64,10 @@ public class CometServiceBindingProvider
}
public InterfaceContract getBindingInterfaceContract() {
- System.out.println("Entering CometServiceBindingProvider#getBindingInterfaceContract...");
return null;
}
public boolean supportsOneWayInvocation() {
- System.out.println("Entering CometServiceBindingProvider#supportsOneWayInvocation...");
return true;
}
Modified: tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServlet.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/CometServlet.java?rev=982281&r1=982280&r2=982281&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServlet.java (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServlet.java Wed Aug 4 14:58:47 2010
@@ -40,6 +40,8 @@ import org.atmosphere.util.XSSHtmlFilter
public class CometServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
private static final String METEOR_KEY = "org.apache.tuscany.comet.meteor";
+ public static final String ENDPOINT_KEY = "org.apache.tuscany.sca.binding.comet.endpoint";
+ public static final String OPERATION_KEY = "org.apache.tuscany.sca.binding.comet.operation";
protected transient RuntimeEndpoint wire;
protected transient Operation operation;
@@ -47,7 +49,6 @@ public class CometServlet extends HttpSe
@Override
public void init(ServletConfig config) throws ServletException {
- System.out.println("Entering CometServlet#init...");
super.init(config);
filters = new LinkedList<BroadcastFilter>();
filters.add(new XSSHtmlFilter());
@@ -56,9 +57,8 @@ public class CometServlet extends HttpSe
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- System.out.println("Entering CometServlet#doGet...");
Meteor meteor = Meteor.build(req, SCOPE.REQUEST, filters, null);
- meteor.addListener(new EventsLogger());
+ // meteor.addListener(new EventsLogger());
req.getSession().setAttribute(METEOR_KEY, meteor);
resp.setContentType("text/html");
meteor.suspend(-1);
@@ -66,11 +66,8 @@ public class CometServlet extends HttpSe
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- System.out.println("Entering CometServlet#doPost...");
- System.out.println("Getting attributes from servlet context...");
- this.wire = (RuntimeEndpoint)getServletContext().getAttribute("org.apache.tuscany.sca.binding.comet.endpoint");
- this.operation = (Operation)getServletContext().getAttribute("org.apache.tuscany.sca.binding.comet.operation");
- System.out.println("Getting Meteor...");
+ this.wire = (RuntimeEndpoint)getServletContext().getAttribute(ENDPOINT_KEY);
+ this.operation = (Operation)getServletContext().getAttribute(OPERATION_KEY);
Meteor meteor = (Meteor)req.getSession().getAttribute(METEOR_KEY);
meteor.broadcast(invokeService(new Object[] {}));
}