tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r686707 - /tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/
Date Mon, 18 Aug 2008 09:24:19 GMT
Author: antelder
Date: Mon Aug 18 02:24:18 2008
New Revision: 686707

URL: http://svn.apache.org/viewvc?rev=686707&view=rev
Log:
merge fix from trunk to 1.3.1 for TUSCANY-2514: make tuscany-host-{tomcat,jetty} optional
for binding.ws clients

Modified:
    tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
    tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
    tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
    tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java

Modified: tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java?rev=686707&r1=686706&r2=686707&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
(original)
+++ tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
Mon Aug 18 02:24:18 2008
@@ -54,9 +54,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);
@@ -68,8 +66,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/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java?rev=686707&r1=686706&r2=686707&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
(original)
+++ tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
Mon Aug 18 02:24:18 2008
@@ -44,7 +44,6 @@
     public Axis2ReferenceBindingProvider(RuntimeComponent component,
                                          RuntimeComponentReference reference,
                                          WebServiceBinding wsBinding,
-                                         ServletHost servletHost,
                                          ModelFactoryExtensionPoint modelFactories,
                                          Map<ClassLoader, List<PolicyHandlerTuple>>
policyHandlerClassnames,
                                          DataBindingExtensionPoint dataBindings) {
@@ -63,7 +62,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/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java?rev=686707&r1=686706&r2=686707&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
(original)
+++ tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
Mon Aug 18 02:24:18 2008
@@ -49,6 +49,10 @@
                                        Map<ClassLoader, 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/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java?rev=686707&r1=686706&r2=686707&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
(original)
+++ tuscany/branches/sca-java-1.3.1/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
Mon Aug 18 02:24:18 2008
@@ -78,7 +78,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.interfacedef.wsdl.WSDLDefinition;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
@@ -107,7 +106,6 @@
     public Axis2ServiceClient(RuntimeComponent component,
                               AbstractContract contract,
                               WebServiceBinding wsBinding,
-                              ServletHost servletHost,
                               MessageFactory messageFactory,
                               Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames)
{
 



Mime
View raw message