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 2019/03/25 21:19:44 UTC
[cxf] branch master updated: Skip document event for the streaming
security case + re-enable the test in systests/ws-security
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 7a4c717 Skip document event for the streaming security case + re-enable the test in systests/ws-security
7a4c717 is described below
commit 7a4c717bfb76291194a9629e6d57093ab676492e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Mar 25 18:52:55 2019 +0000
Skip document event for the streaming security case + re-enable the test in systests/ws-security
---
.../apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java | 1 +
.../cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java | 4 +++-
.../src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java | 1 -
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
index f9c8bd2..2d32ec1 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
@@ -112,6 +112,7 @@ public abstract class AbstractWSS4JStaxInterceptor implements SoapInterceptor,
ConfigurationConverter.parseCallback(properties, securityProperties);
ConfigurationConverter.parseBooleanProperties(properties, securityProperties);
ConfigurationConverter.parseNonBooleanProperties(properties, securityProperties);
+ securityProperties.setSkipDocumentEvents(true);
return securityProperties;
}
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java
index 9144df3..a455cf8 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java
@@ -80,7 +80,9 @@ public class PolicyBasedWSS4JStaxInInterceptor extends WSS4JStaxInInterceptor {
@Override
protected WSSSecurityProperties createSecurityProperties() {
- return new WSSSecurityProperties();
+ WSSSecurityProperties securityProperties = new WSSSecurityProperties();
+ securityProperties.setSkipDocumentEvents(true);
+ return securityProperties;
}
private void checkAsymmetricBinding(
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index fa01fe1..85709e8 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -592,7 +592,6 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- @org.junit.Ignore("Streaming mode not working yet")
@org.junit.Test
public void testAsymmetricIssuerSerialDispatchMessage() throws Exception {