cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r587570 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/ systests/src/test/java/org/apache/cxf/systest/ws/addressing/ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/fronte...
Date Tue, 23 Oct 2007 17:40:25 GMT
Author: dkulp
Date: Tue Oct 23 10:40:24 2007
New Revision: 587570

URL: http://svn.apache.org/viewvc?rev=587570&view=rev
Log:
Merged revisions 587543 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r587543 | dkulp | 2007-10-23 11:44:54 -0400 (Tue, 23 Oct 2007) | 4 lines
  
  @Ignore randomly failing MAPTest
  Fix aegis unit test I broke
  Add (String, Throwable) constructor to generated faults
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?rev=587570&r1=587569&r2=587570&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
Tue Oct 23 10:40:24 2007
@@ -137,7 +137,10 @@
             } catch (Exception e1) {
                 LogUtils.log(LOG, Level.INFO, "EXCEPTION_WHILE_CREATING_EXCEPTION", e1, e1.getMessage());
             }
+        } else if (e != null) {
+            msg.setContent(Exception.class, e);
         }
+        
     }
 
     private boolean isDOMSupported(DataBinding db) {

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java?rev=587570&r1=587569&r2=587570&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
Tue Oct 23 10:40:24 2007
@@ -271,6 +271,7 @@
     
     
     @Test
+    @Ignore("Random failure on Linux")
     public void testApplicationFault() throws Exception {
         try {
             greeter.testDocLitFault("BadRecordLitFault");

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm?rev=587570&r1=587569&r2=587570&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
Tue Oct 23 10:40:24 2007
@@ -37,16 +37,24 @@
     
     $field.Modifier $field.ClassName $paraName;
 
-    public $expClass.Name (String message) {
+    public ${expClass.Name}() {
+        super();
+    }
+    
+    public ${expClass.Name}(String message) {
         super(message);
     }
+    
+    public ${expClass.Name}(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-    public $expClass.Name (String message, $field.ClassName $paraName) {
+    public ${expClass.Name}(String message, $field.ClassName $paraName) {
         super(message);
         this.$paraName = $paraName;
     }
 
-    public $expClass.Name (String message, $field.ClassName $paraName, Throwable cause) {
+    public ${expClass.Name}(String message, $field.ClassName $paraName, Throwable cause)
{
         super(message, cause);
         this.$paraName = $paraName;
     }



Mime
View raw message