cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r948160 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/ systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/ systests/ws-sp...
Date Tue, 25 May 2010 18:33:31 GMT
Author: dkulp
Date: Tue May 25 18:33:30 2010
New Revision: 948160

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

........
  r947878 | dkulp | 2010-05-24 20:42:56 -0400 (Mon, 24 May 2010) | 2 lines
  
  WS-Addressing spec, section 4.4.4 dictates how the fault action should
  be generated.   We were not doing it correctly
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
    cxf/branches/2.2.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
    cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
    cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
    cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java

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

Modified: cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=948160&r1=948159&r2=948160&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Tue May 25 18:33:30 2010
@@ -564,12 +564,15 @@ public class MAPAggregator extends Abstr
                             return faultAction;
                         }
                     }
-                    return addPath(addPath(getActionBaseUri(operation), "Fault"), 
-                                   faultInfo.getName().getLocalPart());
+                    return addPath(addPath(addPath(getActionBaseUri(operation),
+                                                   operation.getName().getLocalPart()),
+                                           "Fault"), 
+                                   faultInfo.getFaultName().getLocalPart());
                 }
             }
         }
-        return addPath(addPath(getActionBaseUri(operation), "Fault"), faultName);
+        return addPath(addPath(addPath(getActionBaseUri(operation),
+                                       operation.getName().getLocalPart()), "Fault"), faultName);
     }
 
     private String getFaultNameFromMessage(final Message message) {

Modified: cxf/branches/2.2.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java?rev=948160&r1=948159&r2=948160&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
Tue May 25 18:33:30 2010
@@ -585,7 +585,7 @@ public class MAPAggregatorTest extends A
                 if (fault) {
                     message.setContent(Exception.class, new SoapFault("blah",
                             (Throwable) new Exception(), Fault.FAULT_CODE_SERVER));
-                    expectedAction = "http://foo/bar/SEI/Fault/Exception";
+                    expectedAction = "http://foo/bar/SEI/op/Fault/Exception";
                 } else {
                     expectedAction = "http://foo/bar/SEI/opResponse";
                 }

Modified: cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java?rev=948160&r1=948159&r2=948160&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
Tue May 25 18:33:30 2010
@@ -123,7 +123,7 @@ public class WSAFromWSDLTest extends Abs
         }
 
         String expectedOut = BASE_URI + "addNumbersRequest";
-        String expectedIn = BASE_URI + "Fault/addNumbersFault";
+        String expectedIn = BASE_URI + "addNumbers/Fault/addNumbersFault";
 
         assertTrue(output.toString().indexOf(expectedOut) != -1);
         assertTrue(input.toString().indexOf(expectedIn) != -1);

Modified: cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java?rev=948160&r1=948159&r2=948160&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
Tue May 25 18:33:30 2010
@@ -62,7 +62,7 @@ public class RMPolicyTest extends Abstra
     private static final String PINGME_RESPONSE_ACTION
         = "http://cxf.apache.org/greeter_control/Greeter/pingMeResponse";
     private static final String GREETER_FAULT_ACTION 
-        = "http://cxf.apache.org/greeter_control/Greeter/Fault/faultDetail";
+        = "http://cxf.apache.org/greeter_control/Greeter/pingMe/Fault/faultDetail";
 
     public static class Server extends AbstractBusTestServerBase {
     

Modified: cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java?rev=948160&r1=948159&r2=948160&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
Tue May 25 18:33:30 2010
@@ -65,7 +65,7 @@ public class RMPolicyWsdlTest extends Ab
     private static final String PINGME_RESPONSE_ACTION 
         = "http://cxf.apache.org/greeter_control/Greeter/pingMeResponse";
     private static final String GREETER_FAULT_ACTION
-        = "http://cxf.apache.org/greeter_control/Greeter/Fault/faultDetail";
+        = "http://cxf.apache.org/greeter_control/Greeter/pingMe/Fault/faultDetail";
 
 
     public static class Server extends AbstractBusTestServerBase {



Mime
View raw message