diff options
5 files changed, 2 insertions, 30 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/pom.xml index c6b397b852..7b08351cbf 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/pom.xml @@ -85,14 +85,6 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-databinding</artifactId> <version>2.0-SNAPSHOT</version> <scope>compile</scope> diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSBindingProviderFactory.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSBindingProviderFactory.java index 45463fcd53..19dde0d830 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSBindingProviderFactory.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSBindingProviderFactory.java @@ -18,15 +18,12 @@ */ package org.apache.tuscany.sca.binding.ws.jaxws.ri; -import java.util.List; import org.apache.tuscany.sca.binding.ws.WebServiceBinding; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; import org.apache.tuscany.sca.provider.BindingProviderFactory; import org.apache.tuscany.sca.provider.ReferenceBindingProvider; import org.apache.tuscany.sca.provider.ServiceBindingProvider; @@ -43,16 +40,11 @@ import org.apache.tuscany.sca.runtime.RuntimeProperties; public class JAXWSBindingProviderFactory implements BindingProviderFactory<WebServiceBinding> { private FactoryExtensionPoint modelFactories; - private ServletHost servletHost; private DataBindingExtensionPoint dataBindings; private String defaultPort = "8085"; public JAXWSBindingProviderFactory(ExtensionPointRegistry extensionPoints) { - ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class); - List<ServletHost> hosts = servletHosts.getServletHosts(); - if (!hosts.isEmpty()) { - this.servletHost = hosts.get(0); - } + modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class); @@ -68,7 +60,7 @@ public class JAXWSBindingProviderFactory implements BindingProviderFactory<WebSe } public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) { - return new JAXWSServiceBindingProvider(endpoint, servletHost, modelFactories, dataBindings, defaultPort); + return new JAXWSServiceBindingProvider(endpoint, modelFactories, dataBindings, defaultPort); } public Class<WebServiceBinding> getModelType() { diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java index a0096f6ca2..4673cf377a 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java @@ -40,7 +40,6 @@ import org.apache.tuscany.sca.binding.ws.WebServiceBinding; import org.apache.tuscany.sca.binding.ws.jaxws.JAXWSBindingProvider; import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint; -import org.apache.tuscany.sca.host.http.ServletHost; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.provider.ServiceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeEndpoint; @@ -57,7 +56,6 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider { private Endpoint wsEndpoint; public JAXWSServiceBindingProvider(RuntimeEndpoint endpoint, - ServletHost servletHost, FactoryExtensionPoint modelFactories, DataBindingExtensionPoint dataBindings, String defaultPort) { @@ -65,7 +63,6 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider { this.wsBinding = (WebServiceBinding)endpoint.getBinding(); jaxwsBindingProvider = new JAXWSBindingProvider(endpoint, - servletHost, modelFactories, dataBindings, defaultPort); diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml index 2241d67853..f16359a1a3 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml @@ -77,13 +77,6 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-databinding</artifactId> <version>2.0-SNAPSHOT</version> <scope>compile</scope> diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java index 5cc9277201..9678cbf8c4 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java @@ -46,7 +46,6 @@ import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory; import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory; import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint; -import org.apache.tuscany.sca.host.http.ServletHost; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.util.FaultException; @@ -84,7 +83,6 @@ public class JAXWSBindingProvider implements Provider<SOAPMessage> { } public JAXWSBindingProvider(RuntimeEndpoint endpoint, - ServletHost servletHost, FactoryExtensionPoint modelFactories, DataBindingExtensionPoint dataBindings, String defaultPort) { |