svn commit: r1125375 - in /webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder: SAML1ComponentBuilder.java SAML2ComponentBuilder.java

[coheigea]

Author: coheigea
Date: Fri May 20 13:27:54 2011
New Revision: 1125375

URL: http://svn.apache.org/viewvc?rev=1125375&view=rev
Log:
[WSS-286] - Evidence element not present in SAML AuthzDecisionStatement
 - Fixed.

Modified:
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java?rev=1125375&r1=1125374&r2=1125375&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
 Fri May 20 13:27:54 2011
@@ -46,6 +46,7 @@ import org.opensaml.saml1.core.Authoriza
 import org.opensaml.saml1.core.Conditions;
 import org.opensaml.saml1.core.ConfirmationMethod;
 import org.opensaml.saml1.core.DecisionTypeEnumeration;
+import org.opensaml.saml1.core.Evidence;
 import org.opensaml.saml1.core.NameIdentifier;
 import org.opensaml.saml1.core.Subject;
 import org.opensaml.saml1.core.SubjectConfirmation;
@@ -438,6 +439,11 @@ public class SAML1ComponentBuilder {
                     Action actionElement = createSamlv1Action(actionBean);
                     authDecision.getActions().add(actionElement);
                 }
+                
+                if (decisionStatementBean.getEvidence() instanceof Evidence) { 
                                   
+                    
authDecision.setEvidence((Evidence)decisionStatementBean.getEvidence());
+                }
+                
                 authDecisionStatements.add(authDecision);
             }
         }

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java?rev=1125375&r1=1125374&r2=1125375&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java
 Fri May 20 13:27:54 2011
@@ -48,6 +48,7 @@ import org.opensaml.saml2.core.AuthnStat
 import org.opensaml.saml2.core.AuthzDecisionStatement;
 import org.opensaml.saml2.core.Conditions;
 import org.opensaml.saml2.core.DecisionTypeEnumeration;
+import org.opensaml.saml2.core.Evidence;
 import org.opensaml.saml2.core.Issuer;
 import org.opensaml.saml2.core.KeyInfoConfirmationDataType;
 import org.opensaml.saml2.core.NameID;
@@ -541,6 +542,11 @@ public class SAML2ComponentBuilder {
                     Action actionElement = createSamlAction(actionBean);
                     authDecision.getActions().add(actionElement);
                 }
+
+                if (decisionStatementBean.getEvidence() instanceof Evidence) { 
                                   
+                    
authDecision.setEvidence((Evidence)decisionStatementBean.getEvidence());
+                }
+                
                 authDecisionStatements.add(authDecision);
             }
         }