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 2012/05/22 17:28:04 UTC

svn commit: r1341529 - /cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java

Author: coheigea
Date: Tue May 22 15:28:04 2012
New Revision: 1341529

URL: http://svn.apache.org/viewvc?rev=1341529&view=rev
Log:
Merged revisions 1341518 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1341518 | coheigea | 2012-05-22 16:14:33 +0100 (Tue, 22 May 2012) | 10 lines

  Merged revisions 1341507 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1341507 | coheigea | 2012-05-22 15:59:25 +0100 (Tue, 22 May 2012) | 2 lines

    Also store the IssuerName in the IssuedToken policy

  ........

........

Modified:
    cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java

Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java?rev=1341529&r1=1341528&r2=1341529&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java Tue May 22 15:28:04 2012
@@ -106,6 +106,9 @@ public class IssuedTokenBuilder implemen
                     processAlternative((List)iterator.next(), issuedToken);
                     break; // since there should be only one alternative ..
                 }                
+            } else if (SPConstants.ISSUER_NAME.equals(ln)) {
+                String issuerName = child.getNodeValue();
+                issuedToken.setIssuerName(issuerName);
             }
             
             child = DOMUtils.getNextElement(child);