cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1560443 - in /cxf/branches/2.7.x-fixes: rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
Date Wed, 22 Jan 2014 18:05:10 GMT
Author: coheigea
Date: Wed Jan 22 18:05:10 2014
New Revision: 1560443

URL: http://svn.apache.org/r1560443
Log:
Merged revisions 1560442 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1560442 | coheigea | 2014-01-22 18:01:39 +0000 (Wed, 22 Jan 2014) | 2 lines

  Refining a recent merge for security errors

........

Modified:
    cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java

Modified: cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java?rev=1560443&r1=1560442&r2=1560443&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
Wed Jan 22 18:05:10 2014
@@ -184,6 +184,9 @@ public final class WSS4JUtils {
             errorMessage = SECURITY_TOKEN_UNAVAILABLE_ERR;
         } else if (WSConstants.MESSAGE_EXPIRED.equals(faultCode)) {
             errorMessage = MESSAGE_EXPIRED_ERR;
+        } else {
+            // Default
+            errorMessage = INVALID_SECURITY_ERR;
         }
         return errorMessage;
         

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java?rev=1560443&r1=1560442&r2=1560443&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
Wed Jan 22 18:05:10 2014
@@ -418,8 +418,12 @@ public class BindingPropertiesTest exten
             port.doubleIt(25);
             fail("Failure expected on not enabling SignatureConfirmation");
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
+<<<<<<< HEAD
             String error = "Check Signature confirmation";
             assertTrue(ex.getMessage().contains(error));
+=======
+            // expected
+>>>>>>> 2234c4b... Refining a recent merge for security errors
         }
         
         ((java.io.Closeable)port).close();



Mime
View raw message