You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/07/15 13:29:41 UTC
svn commit: r1503184 - in /cxf/trunk:
rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/
systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/
Author: coheigea
Date: Mon Jul 15 11:29:41 2013
New Revision: 1503184
URL: http://svn.apache.org/r1503184
Log:
Fixes following WSS-446
Modified:
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java
Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java?rev=1503184&r1=1503183&r2=1503184&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java (original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java Mon Jul 15 11:29:41 2013
@@ -513,9 +513,12 @@ public class DOMToStaxRoundTripTest exte
service.getInInterceptors().add(inhandler);
WSSSecurityProperties outProperties = new WSSSecurityProperties();
- outProperties.setOutAction(new XMLSecurityConstants.Action[]{WSSConstants.SIGNATURE});
+ outProperties.setOutAction(
+ new XMLSecurityConstants.Action[] {
+ WSSConstants.SIGNATURE, WSSConstants.SIGNATURE_CONFIRMATION
+ }
+ );
outProperties.setSignatureUser("myalias");
- outProperties.setEnableSignatureConfirmation(true);
Properties outCryptoProperties =
CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader());
Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java?rev=1503184&r1=1503183&r2=1503184&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java (original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java Mon Jul 15 11:29:41 2013
@@ -992,9 +992,12 @@ public class StaxRoundTripTest extends A
service.getInInterceptors().add(inhandler);
WSSSecurityProperties outProperties = new WSSSecurityProperties();
- outProperties.setOutAction(new XMLSecurityConstants.Action[]{WSSConstants.SIGNATURE});
+ outProperties.setOutAction(
+ new XMLSecurityConstants.Action[] {
+ WSSConstants.SIGNATURE, WSSConstants.SIGNATURE_CONFIRMATION
+ }
+ );
outProperties.setSignatureUser("myalias");
- outProperties.setEnableSignatureConfirmation(true);
Properties outCryptoProperties =
CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader());
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java?rev=1503184&r1=1503183&r2=1503184&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxSamlTokenTest.java Mon Jul 15 11:29:41 2013
@@ -682,9 +682,7 @@ public class StaxSamlTokenTest extends A
bus.shutdown(true);
}
- // See WSS-446
@org.junit.Test
- @org.junit.Ignore
public void testSaml2EndorsingOverTransport() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
@@ -714,9 +712,7 @@ public class StaxSamlTokenTest extends A
bus.shutdown(true);
}
- // See WSS-446
@org.junit.Test
- @org.junit.Ignore
public void testSaml2EndorsingPKOverTransport() throws Exception {
SpringBusFactory bf = new SpringBusFactory();