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

3 files changed, 21 insertions, 54 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-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java
deleted file mode 100644
index f688e103cd..0000000000
--- a/sca-java-2.x/trunk/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientImplementationProvider.java
+++ /dev/null
@@ -1,43 +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.implementation.web.client;

-

-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.RuntimeComponentService;

-

-public class ClientImplementationProvider implements 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/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