Change implementation-web to have an extension point to support

pluggable clients instead of having impl-web-client be a replacement
impl-web runtime

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

7 files changed, 64 insertions, 42 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java b/sca-java-2.x/trunk/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/JSClientExtensionPointImpl.java
index efddb002c1..bb5e68b950 100644
--- a/sca-java-2.x/trunk/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientProviderFactory.java
+++ b/sca-java-2.x/trunk/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/JSClientExtensionPointImpl.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations

  * under the License.    

  */

+

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

 

 import java.util.List;

@@ -25,25 +26,26 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.host.http.ServletHost;

 import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;

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

-import org.apache.tuscany.sca.implementation.web.runtime.WebImplementationProviderFactory;

+import org.apache.tuscany.sca.implementation.web.runtime.ClientExtensionPoint;

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

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

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

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

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

 

-public class ClientProviderFactory extends WebImplementationProviderFactory {

+public class JSClientExtensionPointImpl implements ClientExtensionPoint {

 

     private ServletHost servletHost;

 

-    public ClientProviderFactory(ExtensionPointRegistry extensionPoints) {

-        super(extensionPoints);

+    public JSClientExtensionPointImpl(ExtensionPointRegistry extensionPoints) {

         ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);

         List<ServletHost> hosts = servletHosts.getServletHosts();

         if (!hosts.isEmpty()) {

             this.servletHost = hosts.get(0);

         }

     }

-

+    

     public ImplementationProvider createImplementationProvider(RuntimeComponent component, WebImplementation implementation) {

-

         ClientServlet clientServlet = new ClientServlet();

         servletHost.addServletMapping(ClientServlet.SCRIPT_PATH, clientServlet);

         servletHost.addServletMapping(ClientServlet.SCRIPT_PATH + "/" + component.getName() + "/*", clientServlet);

@@ -54,9 +56,17 @@ public class ClientProviderFactory extends WebImplementationProviderFactory {
             }

         }

 

-        servletHost.setAttribute("org.apache.tuscany.sca.implementation.web.RuntimeComponent", component);

-

-        return new ClientImplementationProvider();

+        return new ImplementationProvider() {

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

+                return null;

+            }

+            public void start() {

+            }

+            public void stop() {

+            }

+            public boolean supportsOneWayInvocation() {

+                return false;

+            }

+        };

     }

-

 }

diff --git a/sca-java-2.x/trunk/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/trunk/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.runtime.ClientExtensionPoint
index 12122b83e9..d11c486a4b 100644
--- a/sca-java-2.x/trunk/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/trunk/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.runtime.ClientExtensionPoint
@@ -16,7 +16,7 @@
 # under the License. 

 

 # Implementation class for the implementation extension

-org.apache.tuscany.sca.implementation.web.client.ClientProviderFactory;model=org.apache.tuscany.sca.implementation.web.WebImplementation;ranking=1234

+org.apache.tuscany.sca.implementation.web.client.JSClientExtensionPointImpl

 

 

 

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() {
diff --git a/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
index 29c497485f..c7613a9045 100644
--- a/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
+++ b/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
@@ -42,4 +42,6 @@ public interface WebImplementation extends Implementation {
      */
     void setWebURI(String webappURI);
 
+    boolean getJSClient();
+    void setJSClient(boolean jsCLient);
 }
diff --git a/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
index e984577cb4..f2f9bf7396 100644
--- a/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
+++ b/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
@@ -42,6 +42,7 @@ class WebImplementationImpl extends ImplementationImpl implements WebImplementat
     private boolean unresolved;
 
     private String webURI;
+    private boolean jsClient = true;
 
     /**
      * Constructs a new Web implementation.
@@ -132,4 +133,12 @@ class WebImplementationImpl extends ImplementationImpl implements WebImplementat
         return newProperty;
     }
 
+    public boolean getJSClient() {
+        return jsClient;
+    }
+
+    public void setJSClient(boolean jsClient) {
+        this.jsClient = jsClient;
+    }
+
 }
diff --git a/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
index 3723ec57f2..afcc85b58f 100644
--- a/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
@@ -81,6 +81,11 @@ public class WebImplementationProcessor extends BaseStAXArtifactProcessor implem
             implementation.setURI(webURI);
         }
 
+        String jsClient = reader.getAttributeValue(Constants.SCA11_TUSCANY_NS, "jsClient");
+        if (jsClient != null) {
+            implementation.setJSClient(Boolean.parseBoolean(jsClient));
+        }
+
         // Skip to end element
         while (reader.hasNext()) {
             if (reader.next() == END_ELEMENT && IMPLEMENTATION_WEB.equals(reader.getName())) {