svn commit: r1051209 - /webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/token/SecurityTokenReference.java

[coheigea]

Author: coheigea
Date: Mon Dec 20 17:04:55 2010
New Revision: 1051209

URL: http://svn.apache.org/viewvc?rev=1051209&view=rev
Log:
[WSS-260] - WSS4J now calls back to a CallbackHandler to get SAML Assertions 
that are not in the message.

Modified:
    
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/token/SecurityTokenReference.java

Modified: 
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/token/SecurityTokenReference.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/token/SecurityTokenReference.java?rev=1051209&r1=1051208&r2=1051209&view=diff
==============================================================================
--- 
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/token/SecurityTokenReference.java
 (original)
+++ 
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/message/token/SecurityTokenReference.java
 Mon Dec 20 17:04:55 2010
@@ -251,7 +251,8 @@ public class SecurityTokenReference {
         // 
         // Try to find a custom token
         //
-        if (tokElement == null && WSConstants.WSC_SCT.equals(type) && cb != 
null) {
+        if (tokElement == null && cb != null && 
(WSConstants.WSC_SCT.equals(type) ||
+            WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(type) || 
assertionStr.equals(type))) {
             //try to find a custom token
             WSPasswordCallback pwcb = 
                 new WSPasswordCallback(id, WSPasswordCallback.CUSTOM_TOKEN);