Author: antelder
Date: Fri Aug 8 04:18:24 2008
New Revision: 683939
URL: http://svn.apache.org/viewvc?rev=683939&view=rev
Log:
TUSCANY-2514: make tuscany-host-{tomcat,jetty} optional for binding.ws clients
Modified:
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
Modified:
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java?rev=683939&r1=683938&r2=683939&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
(original)
+++
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
Fri Aug 8 04:18:24 2008
@@ -52,9 +52,7 @@
public Axis2BindingProviderFactory(ExtensionPointRegistry extensionPoints)
{
ServletHostExtensionPoint servletHosts =
extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
List<ServletHost> hosts = servletHosts.getServletHosts();
- if (hosts.isEmpty()) {
- throw new ServiceRuntimeException("No Servlet host is avaible for
HTTP web services");
- } else {
+ if (!hosts.isEmpty()) {
this.servletHost = hosts.get(0);
}
modelFactories =
extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
@@ -66,8 +64,7 @@
RuntimeComponentReference reference,
WebServiceBinding binding) {
return new Axis2ReferenceBindingProvider(component, reference, binding,
- servletHost, modelFactories,
- policyHandlerClassnames,
dataBindings);
+ modelFactories,
policyHandlerClassnames, dataBindings);
}
public ServiceBindingProvider
createServiceBindingProvider(RuntimeComponent component,
Modified:
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java?rev=683939&r1=683938&r2=683939&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
(original)
+++
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
Fri Aug 8 04:18:24 2008
@@ -43,7 +43,6 @@
public Axis2ReferenceBindingProvider(RuntimeComponent component,
RuntimeComponentReference reference,
WebServiceBinding wsBinding,
- ServletHost servletHost,
ModelFactoryExtensionPoint
modelFactories,
List<PolicyHandlerTuple>
policyHandlerClassnames,
DataBindingExtensionPoint
dataBindings) {
@@ -62,7 +61,7 @@
contract.getInterface().resetDataBinding(OMElement.class.getName());
}
- axisClient = new Axis2ServiceClient(component, reference, wsBinding,
servletHost, messageFactory, policyHandlerClassnames);
+ axisClient = new Axis2ServiceClient(component, reference, wsBinding,
messageFactory, policyHandlerClassnames);
}
public void start() {
Modified:
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java?rev=683939&r1=683938&r2=683939&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
(original)
+++
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
Fri Aug 8 04:18:24 2008
@@ -46,6 +46,10 @@
List<PolicyHandlerTuple>
policyHandlerClassnames,
DataBindingExtensionPoint dataBindings)
{
+ if (servletHost == null) {
+ throw new ServiceRuntimeException("No Servlet host is avaible for
HTTP web services");
+ }
+
MessageFactory messageFactory =
modelFactories.getFactory(MessageFactory.class);
this.wsBinding = wsBinding;
Modified:
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java?rev=683939&r1=683938&r2=683939&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
(original)
+++
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
Fri Aug 8 04:18:24 2008
@@ -69,7 +69,6 @@
import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
import org.apache.tuscany.sca.assembly.AbstractContract;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.MessageFactory;
@@ -96,7 +95,6 @@
public Axis2ServiceClient(RuntimeComponent component,
AbstractContract contract,
WebServiceBinding wsBinding,
- ServletHost servletHost,
MessageFactory messageFactory,
List<PolicyHandlerTuple>
policyHandlerClassnames) {
