From commits-return-30560-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Mon Jan 20 15:06:52 2014 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 7C2B110138 for ; Mon, 20 Jan 2014 15:06:52 +0000 (UTC) Received: (qmail 76371 invoked by uid 500); 20 Jan 2014 15:06:50 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 76257 invoked by uid 500); 20 Jan 2014 15:06:50 -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 76250 invoked by uid 99); 20 Jan 2014 15:06:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jan 2014 15:06:50 +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; Mon, 20 Jan 2014 15:06:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D866B2388900; Mon, 20 Jan 2014 15:06:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1559726 - /cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Date: Mon, 20 Jan 2014 15:06:26 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140120150626.D866B2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Mon Jan 20 15:06:26 2014 New Revision: 1559726 URL: http://svn.apache.org/r1559726 Log: Merged revisions 1559722 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1559722 | coheigea | 2014-01-20 15:01:58 +0000 (Mon, 20 Jan 2014) | 2 lines [CXF-5503] - Adding support for IssuedTokens with SAML SenderVouches ........ Modified: cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Modified: cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1559726&r1=1559725&r2=1559726&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original) +++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Mon Jan 20 15:06:26 2014 @@ -647,8 +647,9 @@ public abstract class AbstractBindingBui if (tempTok instanceof WSSecSignature) { WSSecSignature tempSig = (WSSecSignature) tempTok; SecurityTokenReference secRef = tempSig.getSecurityTokenReference(); - // TODO Add support for SAML2 here - if ((WSConstants.WSS_SAML_KI_VALUE_TYPE).equals(secRef.getKeyIdentifierValueType())) { + + if (WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(secRef.getKeyIdentifierValueType()) + || WSConstants.WSS_SAML2_KI_VALUE_TYPE.equals(secRef.getKeyIdentifierValueType())) { Element secRefElement = cloneElement(secRef.getElement()); addSupportingElement(secRefElement);