2 files changed, 27 insertions, 31 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java b/sca-java-2.x/trunk/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ClientExtensionPoint.java
index f688e103cd..ed66c6efed 100644
--- a/sca-java-2.x/trunk/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java
+++ b/sca-java-2.x/trunk/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ClientExtensionPoint.java
@@ -17,27 +17,14 @@
  * under the License.    

  */

 

-package org.apache.tuscany.sca.implementation.web.client;

+package org.apache.tuscany.sca.implementation.web.runtime;

 

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Invoker;

+import org.apache.tuscany.sca.implementation.web.WebImplementation;

 import org.apache.tuscany.sca.provider.ImplementationProvider;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

+import org.apache.tuscany.sca.runtime.RuntimeComponent;

 

-public class ClientImplementationProvider implements ImplementationProvider {

+public interface ClientExtensionPoint {

 

-    public Invoker createInvoker(RuntimeComponentService arg0, Operation arg1) {

-        return null;

-    }

-

-    public void start() {

-    }

-

-    public void stop() {

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

+    public ImplementationProvider createImplementationProvider(RuntimeComponent component, WebImplementation implementation);

 

 }

diff --git a/sca-java-2.x/trunk/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java b/sca-java-2.x/trunk/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
index ef1e6cd1b9..3dcdd66d77 100644
--- a/sca-java-2.x/trunk/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
+++ b/sca-java-2.x/trunk/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
@@ -34,6 +34,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 public class WebImplementationProviderFactory implements ImplementationProviderFactory<WebImplementation> {
 
     private ServletHost servletHost;
+    private ClientExtensionPoint jsClient;
 
     public WebImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
         ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
@@ -41,25 +42,33 @@ public class WebImplementationProviderFactory implements ImplementationProviderF
         if (!hosts.isEmpty()) {
             this.servletHost = hosts.get(0);
         }
+        
+        jsClient = extensionPoints.getExtensionPoint(ClientExtensionPoint.class);
     }
 
     public ImplementationProvider createImplementationProvider(RuntimeComponent component, WebImplementation implementation) {
         servletHost.setAttribute("org.apache.tuscany.sca.implementation.web.RuntimeComponent", component);
         servletHost.setAttribute("org.oasisopen.sca.ComponentContext", new ComponentContextProxy(component));
 
-        return new ImplementationProvider() {
-            
-            public Invoker createInvoker(RuntimeComponentService arg0, Operation arg1) {
-                throw new UnsupportedOperationException("Components using implementation.web have no services");
-            }
-            public void start() {
-            }
-            public void stop() {
-            }
-            public boolean supportsOneWayInvocation() {
-                return false;
-            }
-        };
+        ImplementationProvider impl;
+        if (jsClient != null && implementation.getJSClient()) {
+            impl = jsClient.createImplementationProvider(component, implementation);
+        } else {
+            impl = new ImplementationProvider() {
+                
+                public Invoker createInvoker(RuntimeComponentService arg0, Operation arg1) {
+                    throw new UnsupportedOperationException("Components using implementation.web have no services");
+                }
+                public void start() {
+                }
+                public void stop() {
+                }
+                public boolean supportsOneWayInvocation() {
+                    return false;
+                }
+            };
+        }
+        return impl;
     }
     
     public Class<WebImplementation> getModelType() {