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/05/08 17:11:01 UTC
svn commit: r1480315 - in
/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j:
WSS4JStaxInInterceptor.java WSS4JStaxOutInterceptor.java
Author: coheigea
Date: Wed May 8 15:11:01 2013
New Revision: 1480315
URL: http://svn.apache.org/r1480315
Log:
Fix after latest WSS4J revision
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java?rev=1480315&r1=1480314&r2=1480315&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java (original)
+++ cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java Wed May 8 15:11:01 2013
@@ -44,6 +44,7 @@ import org.apache.wss4j.common.Configura
import org.apache.wss4j.common.cache.ReplayCache;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.ext.WSSecurityException;
+import org.apache.wss4j.stax.ConfigurationConverter;
import org.apache.wss4j.stax.WSSec;
import org.apache.wss4j.stax.ext.InboundWSSec;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
@@ -116,7 +117,9 @@ public class WSS4JStaxInInterceptor exte
if (getSecurityProperties() != null) {
inboundWSSec = WSSec.getInboundWSSec(getSecurityProperties());
} else {
- inboundWSSec = WSSec.getInboundWSSec(getProperties());
+ WSSSecurityProperties convertedProperties =
+ ConfigurationConverter.convert(getProperties());
+ inboundWSSec = WSSec.getInboundWSSec(convertedProperties);
}
SecurityEventListener securityEventListener =
Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java?rev=1480315&r1=1480314&r2=1480315&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java (original)
+++ cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java Wed May 8 15:11:01 2013
@@ -39,6 +39,7 @@ import org.apache.cxf.phase.Phase;
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.ext.WSSecurityException;
+import org.apache.wss4j.stax.ConfigurationConverter;
import org.apache.wss4j.stax.WSSec;
import org.apache.wss4j.stax.ext.OutboundWSSec;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
@@ -128,7 +129,9 @@ public class WSS4JStaxOutInterceptor ext
if (getSecurityProperties() != null) {
outboundWSSec = WSSec.getOutboundWSSec(getSecurityProperties());
} else {
- outboundWSSec = WSSec.getOutboundWSSec(getProperties());
+ WSSSecurityProperties convertedProperties =
+ ConfigurationConverter.convert(getProperties());
+ outboundWSSec = WSSec.getOutboundWSSec(convertedProperties);
}
newXMLStreamWriter =