[jboss-cvs] JBossAS SVN: r71699 - projects/security/security-xacml/trunk/jboss-xacml-saml/src/main/java/org/jboss/security/xacml/saml/integration/opensaml/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-04-03 12:10:13 -0400 (Thu, 03 Apr 2008)
New Revision: 71699

Modified:
   projects/security/security-xacml/trunk/jboss-xacml-saml/src/main/java/org/jboss/security/xacml/saml/integration/opensaml/impl/XACMLAuthzDecisionStatementTypeMarshaller.java
Log:
update Response context conversion into element

Modified: projects/security/security-xacml/trunk/jboss-xacml-saml/src/main/java/org/jboss/security/xacml/saml/integration/opensaml/impl/XACMLAuthzDecisionStatementTypeMarshaller.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml-saml/src/main/java/org/jboss/security/xacml/saml/integration/opensaml/impl/XACMLAuthzDecisionStatementTypeMarshaller.java	2008-04-03 16:08:55 UTC (rev 71698)
+++ projects/security/security-xacml/trunk/jboss-xacml-saml/src/main/java/org/jboss/security/xacml/saml/integration/opensaml/impl/XACMLAuthzDecisionStatementTypeMarshaller.java	2008-04-03 16:10:13 UTC (rev 71699)
@@ -24,6 +24,7 @@
 import org.jboss.security.xacml.interfaces.RequestContext;
 import org.jboss.security.xacml.interfaces.ResponseContext;
 import org.jboss.security.xacml.saml.integration.opensaml.types.XACMLAuthzDecisionStatementType;
+import org.jboss.security.xacml.util.JBossXACMLUtil;
 import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.io.MarshallingException;
@@ -49,6 +50,30 @@
       
       parentElement.appendChild(xacmlDecisionElement);
       
+      ResponseContext responseContext = xacmlType.getResponse();
+      if(responseContext != null)
+      {
+         Node responseRoot = responseContext.getDocumentElement();
+         if(responseRoot != null)
+         {
+            XMLHelper.adoptElement((Element) responseRoot, parentElement.getOwnerDocument());  
+            xacmlDecisionElement.appendChild(responseRoot);
+         }
+         else
+         {
+            try
+            {
+               Element elem = JBossXACMLUtil.getResponseContextElement(responseContext);
+               XMLHelper.adoptElement(elem, parentElement.getOwnerDocument());  
+               xacmlDecisionElement.appendChild(elem);
+            }
+            catch (Exception e)
+            {
+               throw new RuntimeException(e);
+            }
+         }
+      } 
+      
       RequestContext requestContext = xacmlType.getRequest();
       if(requestContext != null)
       {
@@ -59,16 +84,7 @@
             xacmlDecisionElement.appendChild(requestRoot);
          } 
       }
-      ResponseContext responseContext = xacmlType.getResponse();
-      if(responseContext != null)
-      {
-         Node responseRoot = responseContext.getDocumentElement();
-         if(responseRoot != null)
-         {
-            XMLHelper.adoptElement((Element) responseRoot, parentElement.getOwnerDocument());  
-            xacmlDecisionElement.appendChild(responseRoot);
-         } 
-      } 
+      
       return parentElement; 
    } 
 }