cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
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 GMT
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);



Mime
View raw message