geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1150562 - in /geronimo/bundles/trunk: axis2-saaj/pom.xml axis2/pom.xml axis2/src/main/java/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java axis2/src/main/java/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Date Mon, 25 Jul 2011 07:33:43 GMT
Author: xuhaihong
Date: Mon Jul 25 07:33:42 2011
New Revision: 1150562

URL: http://svn.apache.org/viewvc?rev=1150562&view=rev
Log:
Move to use Axis2 1.6.1-SNAPSHOT, and all the patch files are now based on that code base.

Modified:
    geronimo/bundles/trunk/axis2-saaj/pom.xml
    geronimo/bundles/trunk/axis2/pom.xml
    geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
    geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java

Modified: geronimo/bundles/trunk/axis2-saaj/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2-saaj/pom.xml?rev=1150562&r1=1150561&r2=1150562&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2-saaj/pom.xml (original)
+++ geronimo/bundles/trunk/axis2-saaj/pom.xml Mon Jul 25 07:33:42 2011
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>${pkgArtifactId}</artifactId>
-    <version>1.7.0_1-SNAPSHOT</version>
+    <version>1.6.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
@@ -44,7 +44,7 @@
     <properties>
         <pkgGroupId>org.apache.axis2</pkgGroupId>
         <pkgArtifactId>axis2-saaj</pkgArtifactId>
-        <pkgVersion>1.7.0-SNAPSHOT</pkgVersion>
+        <pkgVersion>1.6.1-SNAPSHOT</pkgVersion>
     </properties>
 
     <dependencies>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>axis2</artifactId>
-            <version>1.7.0_1-SNAPSHOT</version>
+            <version>1.6.1_1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/bundles/trunk/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2/pom.xml?rev=1150562&r1=1150561&r2=1150562&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2/pom.xml (original)
+++ geronimo/bundles/trunk/axis2/pom.xml Mon Jul 25 07:33:42 2011
@@ -26,13 +26,13 @@
     </parent>
     <groupId>org.apache.geronimo.bundles</groupId>
     <artifactId>axis2</artifactId>
-    <version>1.7.0_1-SNAPSHOT</version>
+    <version>1.6.1_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Bundles: Axis2-${pkgVersion}</name>
     <description> This bundle simply wraps all required Axis2 components </description>
     <properties>
         <pkgGroupId>org.apache.axis2</pkgGroupId>
-        <pkgVersion>1.7.0-SNAPSHOT</pkgVersion>
+        <pkgVersion>1.6.1-SNAPSHOT</pkgVersion>
     </properties>
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/axis2</connection>

Modified: geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java?rev=1150562&r1=1150561&r2=1150562&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
(original)
+++ geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
Mon Jul 25 07:33:42 2011
@@ -849,11 +849,6 @@ public abstract class BaseDispatch<T> ex
                 // 4.3.2 conformance bullet 1 requires a ProtocolException here
                 ProtocolException pe =
                     MethodMarshallerUtils.createSystemException(msg.getXMLFault(), msg);
-                if (msgCtx.getLocalException() != null) {
-                    // If a local exception occured, set it as the initial cause of the 
-                    // exception that will be returned
-                    ExceptionFactory.setInitialCause(pe, msgCtx.getLocalException());
-                }
                 return pe;
             } else if (msgCtx.getLocalException() != null) {
                 // use the factory, it'll throw the right thing:

Modified: geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?rev=1150562&r1=1150561&r2=1150562&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
(original)
+++ geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Mon Jul 25 07:33:42 2011
@@ -1080,7 +1080,6 @@ public class EndpointDescriptionImpl
             // from wsgen. Set the transport for that endpoint as http by default.
             for (AxisEndpoint axisEndpoint : axisService.getEndpoints().values()) {
                 axisEndpoint.setTransportInDescription("http");
-                axisEndpoint.setEndpointURL(null);
             }
 
         } catch (AxisFault e) {



Mime
View raw message