Author: anil.saldhana(a)jboss.com Date: 2011-06-29 16:20:18 -0400 (Wed, 29 Jun 2011) New Revision: 1045 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v1/writers/SAML11AssertionWriter.java federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAML11AssertionParserTestCase.java federation/trunk/picketlink-fed-core/src/test/resources/parser/saml1/saml1-assertion-keyinfo.xml Log: PLFED-192: writing Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v1/writers/SAML11AssertionWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v1/writers/SAML11AssertionWriter.java 2011-06-29 20:15:26 UTC (rev 1044) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v1/writers/SAML11AssertionWriter.java 2011-06-29 20:20:18 UTC (rev 1045) @@ -297,6 +297,12 @@ if (subject != null) write(subject); + List<SAML11ActionType> actions = xacmlStat.getActions(); + for (SAML11ActionType action : actions) + { + write(action); + } + StaxUtil.writeEndElement(writer); StaxUtil.flush(writer); } Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAML11AssertionParserTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAML11AssertionParserTestCase.java 2011-06-29 20:15:26 UTC (rev 1044) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAML11AssertionParserTestCase.java 2011-06-29 20:20:18 UTC (rev 1045) @@ -27,11 +27,16 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; +import java.io.StringReader; import java.net.URI; import java.util.List; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Validator; + import org.junit.Test; import org.picketlink.identity.federation.core.parsers.saml.SAMLParser; +import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil; import org.picketlink.identity.federation.core.saml.v1.writers.SAML11AssertionWriter; import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil; import org.picketlink.identity.federation.core.util.StaxUtil; @@ -94,7 +99,12 @@ //Lets do the writing SAML11AssertionWriter writer = new SAML11AssertionWriter(StaxUtil.getXMLStreamWriter(baos)); writer.write(assertion); - System.out.println(new String(baos.toByteArray())); + String writtenString = new String(baos.toByteArray()); + System.out.println(writtenString); + + Validator validator = StaxParserUtil.getSchemaValidator(); + assertNotNull(validator); + validator.validate(new StreamSource(new StringReader(writtenString))); } @Test @@ -157,7 +167,12 @@ //Lets do the writing SAML11AssertionWriter writer = new SAML11AssertionWriter(StaxUtil.getXMLStreamWriter(baos)); writer.write(assertion); - System.out.println(new String(baos.toByteArray())); + String writtenString = new String(baos.toByteArray()); + System.out.println(writtenString); + + Validator validator = StaxParserUtil.getSchemaValidator(); + assertNotNull(validator); + validator.validate(new StreamSource(new StringReader(writtenString))); } @Test @@ -185,7 +200,12 @@ //Lets do the writing SAML11AssertionWriter writer = new SAML11AssertionWriter(StaxUtil.getXMLStreamWriter(baos)); writer.write(assertion); - System.out.println(new String(baos.toByteArray())); + String writtenString = new String(baos.toByteArray()); + System.out.println(writtenString); + + Validator validator = StaxParserUtil.getSchemaValidator(); + assertNotNull(validator); + validator.validate(new StreamSource(new StringReader(writtenString))); } @Test @@ -262,7 +282,12 @@ //Lets do the writing SAML11AssertionWriter writer = new SAML11AssertionWriter(StaxUtil.getXMLStreamWriter(baos)); writer.write(assertion); - System.out.println(new String(baos.toByteArray())); + String writtenString = new String(baos.toByteArray()); + System.out.println(writtenString); + + Validator validator = StaxParserUtil.getSchemaValidator(); + assertNotNull(validator); + validator.validate(new StreamSource(new StringReader(writtenString))); } @Test @@ -303,6 +328,11 @@ //Lets do the writing SAML11AssertionWriter writer = new SAML11AssertionWriter(StaxUtil.getXMLStreamWriter(baos)); writer.write(assertion); - System.out.println(new String(baos.toByteArray())); + String writtenString = new String(baos.toByteArray()); + System.out.println(writtenString); + + Validator validator = StaxParserUtil.getSchemaValidator(); + assertNotNull(validator); + validator.validate(new StreamSource(new StringReader(writtenString))); } } \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/test/resources/parser/saml1/saml1-assertion-keyinfo.xml =================================================================== --- federation/trunk/picketlink-fed-core/src/test/resources/parser/saml1/saml1-assertion-keyinfo.xml 2011-06-29 20:15:26 UTC (rev 1044) +++ federation/trunk/picketlink-fed-core/src/test/resources/parser/saml1/saml1-assertion-keyinfo.xml 2011-06-29 20:20:18 UTC (rev 1045) @@ -12,7 +12,7 @@ <KeyName>CN=anil, OU=PicketLink, O=JBoss, L=Chicago, ST=IL, C=US</KeyName> <KeyValue> <RSAKeyValue> - <Modulus>dsfdfdskjfdsf;dfjds;fdsjfdsfdsjf</Modulus> + <Modulus>YWJjZA==</Modulus> <Exponent>AQAB</Exponent> </RSAKeyValue> </KeyValue> @@ -36,7 +36,7 @@ <SignatureValue>ApcX/Ddfsfdslkfd</SignatureValue> <KeyInfo> <X509Data> - <X509Certificate>MIICmjdfdflkfdslfaf;sjdposafhpofhpowfowqpowqfow + <X509Certificate>YWJjZA== </X509Certificate> </X509Data> </KeyInfo>