Move comet binding implementation with async support from unreleased to sandbox.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1129619 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 0 insertions, 1020 deletions

diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e9495128c..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0

-Class-Path: 

-

diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometAsyncResponseInvoker.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometAsyncResponseInvoker.java
deleted file mode 100644
index c65fd6f252..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometAsyncResponseInvoker.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.apache.tuscany.sca.binding.comet.runtime;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.invocation.InvokerAsyncResponse;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-
-public class CometAsyncResponseInvoker implements InvokerAsyncResponse {
-
-	private RuntimeEndpoint endpoint;
-
-	public CometAsyncResponseInvoker(ExtensionPointRegistry extensionPoints, RuntimeEndpoint endpoint) {
-		this.endpoint = endpoint;
-	}
-
-	@Override
-	public void invokeAsyncResponse(Message msg) {
-		System.out.println("In invokeAsyncResponse!");
-	}
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java
deleted file mode 100644
index fc5fd9f371..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime;
-
-import org.apache.tuscany.sca.binding.comet.CometBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostHelper;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
-
-/**
- * Factory for binding providers.
- */
-public class CometBindingProviderFactory implements BindingProviderFactory<CometBinding> {
-
-    /**
-     * Underlying servlet host. Injected by constructor.
-     */
-    private final ServletHost servletHost;
-
-    /**
-     * Constructor.
-     */
-    public CometBindingProviderFactory(final ExtensionPointRegistry extensionPoints) {
-        this.servletHost = ServletHostHelper.getServletHost(extensionPoints);
-    }
-
-    @Override
-    public Class<CometBinding> getModelType() {
-        return CometBinding.class;
-    }
-
-    /**
-     * Creates a provider for a reference that has comet binding specified in
-     * the scdl.
-     */
-    @Override
-    public ReferenceBindingProvider createReferenceBindingProvider(final RuntimeEndpointReference endpoint) {
-        return new CometReferenceBindingProvider(endpoint);
-    }
-
-    /**
-     * Creates a provider for a service that has comet binding specified in the
-     * scdl.
-     */
-    @Override
-    public ServiceBindingProvider createServiceBindingProvider(final RuntimeEndpoint endpoint) {
-        return new CometServiceBindingProvider(endpoint, this.servletHost);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometComponentContext.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometComponentContext.java
deleted file mode 100644
index ce19da7e7b..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometComponentContext.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-
-public class CometComponentContext {
-
-	private Map<String, RuntimeEndpoint> endpoints;
-	private Map<String, Operation> operations;
-
-	public CometComponentContext() {
-		endpoints = new ConcurrentHashMap<String, RuntimeEndpoint>();
-		operations = new ConcurrentHashMap<String, Operation>();
-	}
-
-	public void addEndpoint(String key, RuntimeEndpoint endpoint) {
-		endpoints.put(key, endpoint);
-	}
-
-	public void addOperation(String key, Operation operation) {
-		operations.put(key, operation);
-	}
-
-	public RuntimeEndpoint getEndpoint(String key) {
-		return endpoints.get(key);
-	}
-
-	public Operation getOperation(String key) {
-		return operations.get(key);
-	}
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java
deleted file mode 100644
index 5e6375480e..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime;
-
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.binding.comet.runtime.handler.CometBindingHandler;
-import org.apache.tuscany.sca.core.invocation.impl.MessageImpl;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-public class CometInvoker implements Invoker {
-
-	protected Operation operation;
-	protected EndpointReference endpoint;
-
-	public CometInvoker(final Operation operation, final EndpointReference endpoint) {
-		this.operation = operation;
-		this.endpoint = endpoint;
-	}
-
-	@Override
-	public Message invoke(final Message msg) {
-		String operation = msg.getOperation().getName();
-		CometMessageContext context = msg.getBindingContext();
-		CometBindingHandler handler = context.getCometHandler();
-		Message message = new MessageImpl();
-		if (operation.equals("sendResponse")) {
-			String callbackMethod = context.getCallbackMethod();
-			Object[] body = msg.getBody();
-			handler.respondToClient(callbackMethod, body[0]);
-		} else if (operation.equals("isClientConnected")) {
-			message.setBody(handler.isClientConnected());
-		}
-		return message;
-	}
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometMessageContext.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometMessageContext.java
deleted file mode 100644
index 21dcc9287f..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometMessageContext.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime;
-
-import org.apache.tuscany.sca.binding.comet.runtime.handler.CometBindingHandler;
-
-public class CometMessageContext {
-
-	private CometBindingHandler cometHandler;
-
-	private String callbackMethod;
-
-	public CometMessageContext(CometBindingHandler cometHandler, String callbackMethod) {
-		this.cometHandler = cometHandler;
-		this.callbackMethod = callbackMethod;
-	}
-
-	public CometBindingHandler getCometHandler() {
-		return cometHandler;
-	}
-
-	public void setCometHandler(CometBindingHandler cometHandler) {
-		this.cometHandler = cometHandler;
-	}
-
-	public String getCallbackMethod() {
-		return callbackMethod;
-	}
-
-	public void setCallbackMethod(String callbackMethod) {
-		this.callbackMethod = callbackMethod;
-	}
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java
deleted file mode 100644
index 4002f29a0d..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime;
-
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-
-/**
- * Provider for references that have comet binding specified in the scdl. Not
- * used as comet binding references would occur in client browser's Javascript.
- */
-public class CometReferenceBindingProvider implements ReferenceBindingProvider {
-
-    /**
-     * Endpoint for which the binding provider is created.
-     */
-    private final EndpointReference endpoint;
-
-    public CometReferenceBindingProvider(final EndpointReference endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    @Override
-    public Invoker createInvoker(final Operation operation) {
-        return new CometInvoker(operation, this.endpoint);
-    }
-
-    /**
-     * No behavior.
-     */
-    @Override
-    public void start() {
-    }
-
-    /**
-     * No behavior.
-     */
-    @Override
-    public void stop() {
-    }
-
-    @Override
-    public InterfaceContract getBindingInterfaceContract() {
-        return endpoint.getReference().getInterfaceContract();
-    }
-
-    @Override
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java
deleted file mode 100644
index f98a810230..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime;
-
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.binding.comet.runtime.javascript.JavascriptGenerator;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvokerAsyncResponse;
-import org.apache.tuscany.sca.provider.EndpointAsyncProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-
-/**
- * Provider for services having comet binding specified in the scdl.
- */
-public class CometServiceBindingProvider implements ServiceBindingProvider, EndpointAsyncProvider {
-
-	/**
-	 * Service's endpoint.
-	 */
-	private final RuntimeEndpoint endpoint;
-
-	/**
-	 * The underlying servlet host.
-	 */
-	private final ServletHost servletHost;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param endpoint
-	 *            the given endpoint
-	 * @param servletHost
-	 *            the given servlet host
-	 */
-	public CometServiceBindingProvider(final RuntimeEndpoint endpoint, final ServletHost servletHost) {
-		this.endpoint = endpoint;
-		this.servletHost = servletHost;
-	}
-
-	/**
-	 * This method is used to start the provider.
-	 */
-	@Override
-	public void start() {
-		ServletFactory.registerServlet(this.servletHost);
-		final ComponentService service = this.endpoint.getService();
-		final Interface serviceInterface = service.getInterfaceContract().getInterface();
-		JavascriptGenerator.generateServiceProxy(service);
-		for (final Operation operation : serviceInterface.getOperations()) {
-			JavascriptGenerator.generateMethodProxy(service, operation);
-			ServletFactory.registerOperation(this.endpoint, operation);
-		}
-	}
-
-	/**
-	 * This method is used to stop the provider.
-	 */
-	@Override
-	public void stop() {
-		ServletFactory.unregisterServlet(this.servletHost);
-	}
-
-	@Override
-	public InterfaceContract getBindingInterfaceContract() {
-		return endpoint.getService().getInterfaceContract();
-	}
-
-	@Override
-	public boolean supportsOneWayInvocation() {
-		return true;
-	}
-
-	@Override
-	public void configure() {
-	}
-
-	@Override
-	public boolean supportsNativeAsync() {
-		return true;
-	}
-
-	@Override
-	public InvokerAsyncResponse createAsyncResponseInvoker() {
-		return new CometAsyncResponseInvoker(null, endpoint);
-	}
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java
deleted file mode 100644
index ed40ccd4f9..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime;
-
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.atmosphere.cpr.AtmosphereServlet;
-
-/**
- * This class is used to create two servlets: one exposing all the comet
- * services, the other one exposing the javascript toolkit. Exposing all comet
- * services through a single servlet is needed as the browsers are undergone by
- * the two http connection limit so all comet services should send their
- * responses via the same http connection to the same client. Dispatching to the
- * corresponding endpoint and operation is done internally using Jersey RESTful
- * Web Services integration with the AtmosphereServlet. The Javascript toolkit
- * servlet is unique as it is not tied to any of the services - it offers a
- * global API.
- */
-public final class ServletFactory {
-
-	/**
-	 * Init-param key for the AtmosphereServlet defining where to look for
-	 * Jersey classes.
-	 */
-	private static final String PACKAGE_KEY = "com.sun.jersey.config.property.packages";
-
-	/**
-	 * Package of the class handling dispatching to endpoints.
-	 */
-	private static final String PACKAGE_VALUE = "org.apache.tuscany.sca.binding.comet.runtime.handler";
-
-	/**
-	 * Package of the class handling Javascript toolkit retrieval.
-	 */
-	private static final String JS_PACKAGE_VALUE = "org.apache.tuscany.sca.binding.comet.runtime.javascript";
-
-	/**
-	 * Key in the ServletContext where the comet component context is stored.
-	 */
-	public static final String COMET_COMPONENT_CONTEXT_KEY = "org.apache.tuscany.sca.binding.comet.operations";
-
-	/**
-	 * Path where services will be exposed.
-	 */
-	public static final String PATH = "/tuscany-comet/*";
-
-	/**
-	 * Path where Javascript toolkit will be exposed.
-	 */
-	public static final String JS_PATH = "/org.apache.tuscany.sca.cometComponentContext.js/*";
-
-	/**
-	 * The servlet that is exposing the comet services.
-	 */
-	private static AtmosphereServlet cometServlet = null;
-
-	/**
-	 * The servlet that is exposing the Javascript toolkit.
-	 */
-	private static AtmosphereServlet javascriptServlet = null;
-
-	/**
-	 * Private constructor for the singleton class.
-	 */
-	private ServletFactory() {
-	}
-
-	/**
-	 * Method called by CometServiceBindingProvider for each endpoint in order
-	 * to create the two singleton servlets.
-	 * 
-	 * @param servletHost
-	 *            the underlying servlet host
-	 */
-	public static synchronized void registerServlet(
-			final ServletHost servletHost) {
-		registerCometServlet(servletHost);
-		registerJavascriptServlet(servletHost);
-	}
-
-	private static void registerCometServlet(ServletHost servletHost) {
-		if (ServletFactory.cometServlet == null) {
-			ServletFactory.cometServlet = new AtmosphereServlet();
-			ServletFactory.cometServlet.addInitParameter(
-					ServletFactory.PACKAGE_KEY, ServletFactory.PACKAGE_VALUE);
-			servletHost.addServletMapping(ServletFactory.PATH,
-					ServletFactory.cometServlet);
-			final CometComponentContext context = new CometComponentContext();
-			ServletFactory.cometServlet.getServletContext().setAttribute(
-					ServletFactory.COMET_COMPONENT_CONTEXT_KEY, context);
-		}
-	}
-
-	private static void registerJavascriptServlet(ServletHost servletHost) {
-		if (ServletFactory.javascriptServlet == null) {
-			ServletFactory.javascriptServlet = new AtmosphereServlet();
-			ServletFactory.javascriptServlet
-					.addInitParameter(ServletFactory.PACKAGE_KEY,
-							ServletFactory.JS_PACKAGE_VALUE);
-			servletHost.addServletMapping(ServletFactory.JS_PATH,
-					ServletFactory.javascriptServlet);
-		}
-	}
-
-	/**
-	 * Method called by CometServiceBindingProvider for each endpoint operation
-	 * in order to store all the operations the servlet will serve.
-	 * 
-	 * @param endpoint
-	 *            the endpoint
-	 * @param operation
-	 *            the operation
-	 */
-	public static void registerOperation(final RuntimeEndpoint endpoint,
-			final Operation operation) {
-		final String url = "/" + endpoint.getService().getName() + "/"
-				+ operation.getName();
-		CometComponentContext context = (CometComponentContext) cometServlet
-				.getServletContext().getAttribute(COMET_COMPONENT_CONTEXT_KEY);
-		context.addEndpoint(url, endpoint);
-		context.addOperation(url, operation);
-	}
-
-	/**
-	 * Method called by CometServiceBindingProvider for each endpoint operation
-	 * in order to remove the two servlets.
-	 * 
-	 * @param servletHost
-	 *            the underlying servlet host
-	 */
-	public static void unregisterServlet(final ServletHost servletHost) {
-		synchronized (servletHost) {
-			servletHost.removeServletMapping(ServletFactory.PATH);
-			servletHost.removeServletMapping(ServletFactory.JS_PATH);
-		}
-	}
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/callback/CometCallback.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/callback/CometCallback.java
deleted file mode 100644
index fb9facfd35..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/callback/CometCallback.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime.callback;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CometCallback {
-
-	void sendResponse(Object response);
-
-	boolean isClientConnected();
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java
deleted file mode 100644
index dfd4091488..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime.handler;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.binding.comet.runtime.CometComponentContext;
-import org.apache.tuscany.sca.binding.comet.runtime.CometMessageContext;
-import org.apache.tuscany.sca.binding.comet.runtime.ServletFactory;
-import org.apache.tuscany.sca.core.assembly.impl.RuntimeEndpointImpl;
-import org.apache.tuscany.sca.core.assembly.impl.RuntimeEndpointReferenceImpl;
-import org.apache.tuscany.sca.core.invocation.impl.MessageImpl;
-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.annotation.Broadcast;
-import org.atmosphere.cpr.Broadcaster;
-import org.atmosphere.cpr.DefaultBroadcaster;
-import org.atmosphere.jersey.SuspendResponse;
-
-import com.google.gson.Gson;
-import com.sun.jersey.spi.container.servlet.PerSession;
-
-/**
- * Class serving calls coming for comet services and operations.
- */
-@Path("/")
-@Produces("text/html;charset=ISO-8859-1")
-@PerSession
-public class CometBindingHandler {
-
-	/**
-	 * The object used to suspend the response and send async responses back to
-	 * client.
-	 */
-	private Broadcaster broadcaster;
-
-	/**
-	 * JSON converter.
-	 */
-	private Gson gson = new Gson();
-
-	/**
-	 * The underlying servlet context.
-	 */
-	@Context
-	private ServletContext sc;
-
-	@Context
-	private HttpServletRequest request;
-
-	private CometComponentContext context;
-
-	/**
-	 * Method called at comet connect time. This suspends the response and keeps
-	 * the connection opened.
-	 * 
-	 * @return the suspended response
-	 */
-	@GET
-	public SuspendResponse<String> connect() {
-		System.out.println("-- connect -- Session Id: " + request.getSession().getId());
-		if (broadcaster == null) {
-			broadcaster = new DefaultBroadcaster();
-			context = (CometComponentContext) sc.getAttribute(ServletFactory.COMET_COMPONENT_CONTEXT_KEY);
-		}
-		return new SuspendResponse.SuspendResponseBuilder<String>().broadcaster(this.broadcaster).outputComments(true)
-				.build();
-	}
-
-	/**
-	 * Method called on service calls.
-	 * 
-	 * @param service
-	 *            service called
-	 * @param method
-	 *            operation called
-	 * @param callbackMethod
-	 *            the callback method from Javascript
-	 * @param jsonData
-	 *            arguments for the method sent as JSON array
-	 * @return object used by the Broadcaster to send response through the
-	 *         persisted connection
-	 * @throws InvocationTargetException
-	 *             if problems occur at service invocation
-	 */
-	@POST
-	@Path("/{service}/{method}")
-	@Broadcast
-	public void handleRequest(@PathParam("service") final String service, @PathParam("method") final String method,
-			@FormParam("callback") final String callbackMethod, @FormParam("params") final String jsonData)
-			throws InvocationTargetException {
-		System.out.println("-- handleRequest -- Session Id: " + request.getSession().getId());
-		final String url = "/" + service + "/" + method;
-		final RuntimeEndpoint wire = context.getEndpoint(url);
-		final Operation operation = context.getOperation(url);
-
-		final Object[] args = decodeJsonDataForOperation(jsonData, operation);
-		// Message msg = createMessageWithMockedCometReference(args,
-		// callbackMethod);
-		Message msg = new MessageImpl();
-		msg.setBody(args);
-		msg.setOperation(operation);
-		wire.invokeAsync(msg);
-	}
-
-	/**
-	 * Convert request parameters from JSON to operation parameter types.
-	 * 
-	 * @param jsonData
-	 * @param operation
-	 * @return
-	 */
-	private Object[] decodeJsonDataForOperation(String jsonData, Operation operation) {
-		Object[] args = new Object[operation.getInputType().getLogical().size()];
-		final String[] json = this.parseArray(jsonData);
-		int index = 0;
-		// convert each argument to the corresponding class
-		for (final DataType<?> dataType : operation.getInputType().getLogical()) {
-			args[index] = this.gson.fromJson(json[index], dataType.getPhysical());
-			index++;
-		}
-		return args;
-	}
-
-	/**
-	 * Creates the message to be sent with a mocked EndpointReference in the
-	 * 'from' field as the request comes from a browser (there is no actual
-	 * comet reference running in a controlled environment).
-	 * 
-	 * @param args
-	 * @param callbackMethod
-	 * @return
-	 */
-	private Message createMessageWithMockedCometReference(Object[] args, String callbackMethod) {
-		Message msg = new MessageImpl();
-		msg.setBody(args);
-		CometMessageContext messageContext = new CometMessageContext(this, callbackMethod);
-		msg.setBindingContext(messageContext);
-		EndpointReference re = new RuntimeEndpointReferenceImpl();
-		re.setCallbackEndpoint(new RuntimeEndpointImpl());
-		msg.setFrom(re);
-		return msg;
-	}
-
-	/**
-	 * Parse the JSON array containing the arguments for the method call in
-	 * order to avoid converting JSON to Object[]. Converting each object
-	 * separately to it's corresponding type avoids type mismatch problems at
-	 * service invocation.
-	 * 
-	 * @param jsonArray
-	 *            the JSON array
-	 * @return an array of JSON formatted objects
-	 */
-	private String[] parseArray(final String jsonArray) {
-		final List<String> objects = new ArrayList<String>();
-		int bracketNum = 0;
-		int parNum = 0;
-		int startPos = 1;
-		for (int i = 0; i < jsonArray.length(); i++) {
-			switch (jsonArray.charAt(i)) {
-			case '{':
-				bracketNum++;
-				break;
-			case '}':
-				bracketNum--;
-				break;
-			case '[':
-				parNum++;
-				break;
-			case ']':
-				parNum--;
-				break;
-			case ',':
-				if ((bracketNum == 0) && (parNum == 1)) {
-					objects.add(jsonArray.substring(startPos, i));
-					startPos = i + 1;
-				}
-			}
-		}
-		// add last object
-		objects.add(jsonArray.substring(startPos, jsonArray.length() - 1));
-		return objects.toArray(new String[] {});
-	}
-
-	public void respondToClient(String callbackMethod, Object response) {
-		broadcaster.broadcast(callbackMethod + "($.secureEvalJSON('" + this.gson.toJson(response) + "'))");
-	}
-
-	public boolean isClientConnected() {
-		return !broadcaster.getAtmosphereResources().isEmpty();
-	}
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java
deleted file mode 100644
index b1205596ea..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime.javascript;
-
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * This class generates proxies for the comet services.
- */
-public class JavascriptGenerator {
-
-    /**
-     * Namespace for the Tuscany Comet Javascript toolkit.
-     */
-    public static final String JS_NAMESPACE = "SCA";
-
-    /**
-     * Name for the SCA component context.
-     */
-    private static final String COMPONENT_CONTEXT = "this.CometComponentContext";
-
-    /**
-     * Name for the object performing comet specific tasks.
-     */
-    private static final String TUSCANY_COMET = "SCA.TuscanyComet";
-
-    /**
-     * Generated Javascript.
-     */
-    private static StringBuffer javascript = new StringBuffer();
-
-    /**
-     * Default constructor for utility class.
-     */
-    private JavascriptGenerator() {
-    }
-
-    /**
-     * Getter for the generated Javascript.
-     * 
-     * @return the generated Javascript
-     */
-    public static StringBuffer getJavascript() {
-        return JavascriptGenerator.javascript;
-    }
-
-    /**
-     * Generates the proxy for a service.
-     * 
-     * @param service the service for which generation is performed
-     */
-    public static void generateServiceProxy(final ComponentService service) {
-        JavascriptGenerator.javascript.append(JavascriptGenerator.COMPONENT_CONTEXT + "."
-            + service.getName()
-            + " = new Object();\n");
-    }
-
-    /**
-     * Generates the method inside the service proxy for the specified
-     * operation.
-     * 
-     * @param service the service containing the operation
-     * @param operation the operation
-     */
-    public static void generateMethodProxy(final ComponentService service, final Operation operation) {
-        JavascriptGenerator.javascript.append(JavascriptGenerator.COMPONENT_CONTEXT + "."
-            + service.getName()
-            + "."
-            + operation.getName()
-            + " = function(");
-        for (int i = 0; i < operation.getInputType().getLogical().size(); i++) {
-            JavascriptGenerator.javascript.append("p" + i + ", ");
-        }
-        JavascriptGenerator.javascript.append("callbackMethod) {\n");
-        // send method argumets as JSON array
-        JavascriptGenerator.javascript.append("  var params = [];\n");
-        for (int i = 0; i < operation.getInputType().getLogical().size(); i++) {
-            JavascriptGenerator.javascript.append("  params.push(p" + i + ");\n");
-        }
-        JavascriptGenerator.javascript.append("  " + JavascriptGenerator.TUSCANY_COMET
-            + ".callAsync('"
-            + service.getName()
-            + "/"
-            + operation.getName()
-            + "', $.toJSON(params), callbackMethod);\n");
-        JavascriptGenerator.javascript.append("}\n");
-    }
-
-}
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java b/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
deleted file mode 100644
index 9274009803..0000000000
--- a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.comet.runtime.javascript;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.SequenceInputStream;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-/**
- * Class serving the calls performed to retrieve the Javascript toolkit.
- */
-@Path("/")
-@Produces("text/javascript")
-public class JavascriptResource {
-
-    /**
-     * Dependencies for the Tuscany Comet Javascript API.
-     */
-    private static final String[] DEPENDENCIES = {"/jquery.atmosphere.js", "/jquery.json-2.2.min.js",
-                                                  "/cometComponentContext.js"};
-
-    /**
-     * Method called when the Javascript toolkit is requested.
-     * 
-     * @return InputStream containing the Javascript code.
-     */
-    @GET
-    public InputStream getJavascript() {
-        InputStream stream = null;
-        // add dependencies in the specified order
-        for (final String dependency : JavascriptResource.DEPENDENCIES) {
-            if (stream == null) {
-                stream = this.getClass().getResourceAsStream(dependency);
-            } else {
-                stream = new SequenceInputStream(stream, this.getClass().getResourceAsStream(dependency));
-            }
-        }
-        // add generated proxies
-        final String generatedJs = JavascriptGenerator.getJavascript().toString() + "\n}";
-        return new SequenceInputStream(stream, new ByteArrayInputStream(generatedJs.getBytes()));
-    }
-}