Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E18691063B for ; Wed, 8 May 2013 15:11:22 +0000 (UTC) Received: (qmail 42608 invoked by uid 500); 8 May 2013 15:11:22 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 42566 invoked by uid 500); 8 May 2013 15:11:22 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 42559 invoked by uid 99); 8 May 2013 15:11:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 15:11:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 15:11:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 968DB23889DA; Wed, 8 May 2013 15:11:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Wed, 08 May 2013 15:11:01 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130508151101.968DB23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 =