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 402B3F1F7 for ; Fri, 22 Mar 2013 15:46:43 +0000 (UTC) Received: (qmail 576 invoked by uid 500); 22 Mar 2013 15:46:43 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 473 invoked by uid 500); 22 Mar 2013 15:46:43 -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 466 invoked by uid 99); 22 Mar 2013 15:46:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 15:46:43 +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; Fri, 22 Mar 2013 15:46:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C2C482388962; Fri, 22 Mar 2013 15:46:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1459850 - in /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security: policy/interceptors/IssuedTokenInterceptorProvider.java wss4j/CryptoCoverageChecker.java Date: Fri, 22 Mar 2013 15:46:18 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130322154618.C2C482388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Fri Mar 22 15:46:18 2013 New Revision: 1459850 URL: http://svn.apache.org/r1459850 Log: and some more fixes Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=1459850&r1=1459849&r2=1459850&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java Fri Mar 22 15:46:18 2013 @@ -55,6 +55,7 @@ import org.apache.cxf.ws.security.trust. import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor; import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JOutInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; +import org.apache.cxf.ws.security.wss4j.WSS4JUtils; import org.apache.cxf.ws.security.wss4j.policyvalidators.IssuedTokenPolicyValidator; import org.apache.ws.security.WSConstants; import org.apache.ws.security.WSSecurityEngineResult; @@ -63,7 +64,6 @@ import org.apache.ws.security.handler.WS import org.apache.ws.security.message.token.BinarySecurity; import org.apache.ws.security.saml.SAMLKeyInfo; import org.apache.ws.security.saml.ext.AssertionWrapper; -import org.apache.ws.security.util.WSSecurityUtil; /** * @@ -518,10 +518,8 @@ public class IssuedTokenInterceptorProvi Message message, AssertionInfoMap aim ) { - List signedResults = new ArrayList(); - WSSecurityUtil.fetchAllActionResults( - rResult.getResults(), WSConstants.SIGN, signedResults - ); + List signedResults = + WSS4JUtils.fetchAllActionResults(rResult.getResults(), WSConstants.SIGN); IssuedTokenPolicyValidator issuedValidator = new IssuedTokenPolicyValidator(signedResults, message); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java?rev=1459850&r1=1459849&r2=1459850&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java Fri Mar 22 15:46:18 2013 @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Vector; import javax.xml.namespace.QName; import javax.xml.soap.SOAPException; @@ -51,7 +50,6 @@ import org.apache.ws.security.WSSecurity import org.apache.ws.security.WSSecurityException; import org.apache.ws.security.handler.WSHandlerConstants; import org.apache.ws.security.handler.WSHandlerResult; -import org.apache.ws.security.util.WSSecurityUtil; /** * Utility to enable the checking of WS-Security signature/encryption @@ -127,15 +125,10 @@ public class CryptoCoverageChecker exten for (final WSHandlerResult wshr : results) { final List wsSecurityEngineSignResults = - new Vector(); - final List wsSecurityEngineEncResults = - new Vector(); - - WSSecurityUtil.fetchAllActionResults(wshr.getResults(), - WSConstants.SIGN, wsSecurityEngineSignResults); + WSS4JUtils.fetchAllActionResults(wshr.getResults(), WSConstants.SIGN); - WSSecurityUtil.fetchAllActionResults(wshr.getResults(), - WSConstants.ENCR, wsSecurityEngineEncResults); + final List wsSecurityEngineEncResults = + WSS4JUtils.fetchAllActionResults(wshr.getResults(), WSConstants.ENCR); for (WSSecurityEngineResult wser : wsSecurityEngineSignResults) {