[picketlink-commits] Picketlink SVN: r1109 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers.

[picketlink-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2011-07-22 13:17:21 -0400 (Fri, 22 Jul 2011)
New Revision: 1109

Modified:
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java
Log:
PLFED-213:  the saml writers should write prefix for Issuer

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java	2011-07-22 04:36:49 UTC (rev 1108)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java	2011-07-22 17:17:21 UTC (rev 1109)
@@ -90,7 +90,7 @@
 
       NameIDType issuer = assertion.getIssuer();
       if (issuer != null)
-         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get()));
+         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX));
 
       Element sig = assertion.getSignature();
       if (sig != null)

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java	2011-07-22 04:36:49 UTC (rev 1108)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java	2011-07-22 17:17:21 UTC (rev 1109)
@@ -138,7 +138,7 @@
       NameIDType issuer = request.getIssuer();
       if (issuer != null)
       {
-         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get()));
+         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX));
       }
 
       Element sig = request.getSignature();
@@ -186,7 +186,7 @@
          StaxUtil.writeAttribute(writer, JBossSAMLConstants.CONSENT.get(), consent);
 
       NameIDType issuer = logOutRequest.getIssuer();
-      write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get()));
+      write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX));
 
       NameIDType nameID = logOutRequest.getNameID();
       if (nameID != null)
@@ -254,7 +254,7 @@
       NameIDType issuer = request.getIssuer();
       if (issuer != null)
       {
-         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get()));
+         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX));
       }
       Element sig = request.getSignature();
       if (sig != null)
@@ -296,7 +296,7 @@
       NameIDType issuer = request.getIssuer();
       if (issuer != null)
       {
-         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get()));
+         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX));
       }
       Element sig = request.getSignature();
       if (sig != null)
@@ -355,7 +355,7 @@
       NameIDType issuer = xacmlQuery.getIssuer();
       if (issuer != null)
       {
-         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get()));
+         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX));
       }
 
       RequestType xacmlRequest = xacmlQuery.getRequest();

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java	2011-07-22 04:36:49 UTC (rev 1108)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java	2011-07-22 17:17:21 UTC (rev 1109)
@@ -74,14 +74,14 @@
 
       StaxUtil.writeNameSpace(writer, PROTOCOL_PREFIX, PROTOCOL_NSURI.get());
       StaxUtil.writeNameSpace(writer, ASSERTION_PREFIX, ASSERTION_NSURI.get());
-      StaxUtil.writeDefaultNameSpace(writer, ASSERTION_NSURI.get());
+      //StaxUtil.writeDefaultNameSpace(writer, ASSERTION_NSURI.get());
 
       writeBaseAttributes(response);
 
       NameIDType issuer = response.getIssuer();
       if (issuer != null)
       {
-         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get()));
+         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX));
       }
 
       Element sig = response.getSignature();
@@ -130,7 +130,7 @@
       NameIDType issuer = response.getIssuer();
       if (issuer != null)
       {
-         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get()));
+         write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX));
       }
 
       Element sig = response.getSignature();
@@ -186,7 +186,7 @@
       writeBaseAttributes(response);
 
       NameIDType issuer = response.getIssuer();
-      write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get()));
+      write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX));
 
       StatusType status = response.getStatus();
       write(status);