archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove dependency on host-http from the jaxws binding as it's not used by the binding. The RI version just plugs directly into JAXWS.

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1174151 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
slaws 2011-09-22 14:11:13 +00:00
parent 57ae16a7a1
commit 0fcbec68ad
5 changed files with 2 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/pom.xml
View file

@ -83,14 +83,6 @@
<scope>runtime</scope>
</dependency>
<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>

12
sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSBindingProviderFactory.java
View file

@ -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() {

3
sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
View file

@ -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);

7
sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
View file

@ -75,13 +75,6 @@
<scope>runtime</scope>
</dependency>
<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>

2
sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java
View file

@ -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) {