Author: anil.saldhana(a)jboss.com Date: 2008-12-15 21:36:57 -0500 (Mon, 15 Dec 2008) New Revision: 167 Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SAML2AuthnResponseUnitTestCase.java Log: remove sys out Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2008-12-16 02:26:05 UTC (rev 166) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2008-12-16 02:36:57 UTC (rev 167) @@ -21,6 +21,7 @@ */ package org.jboss.identity.federation.bindings.tomcat.idp; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.StringWriter; @@ -149,8 +150,13 @@ if(authnRequestType == null) throw new IllegalStateException("AuthnRequest is null"); - JBossSAMLAuthnRequestFactory.marshall(authnRequestType, System.out); - + if(log.isTraceEnabled()) + { + StringWriter sw = new StringWriter(); + JBossSAMLAuthnRequestFactory.marshall(authnRequestType, sw); + log.trace("IDPRedirectValve::AuthnRequest="+sw.toString()); + } + //Create a response type String id = "ID_" + JBossSAMLBaseFactory.createUUID(); @@ -178,7 +184,12 @@ log.debug("ResponseType = "); //Lets see how the response looks like - JBossSAMLAuthnResponseFactory.marshall(responseType, System.out); + if(log.isTraceEnabled()) + { + StringWriter sw = new StringWriter(); + JBossSAMLAuthnResponseFactory.marshall(responseType, sw); + log.trace("IDPRedirectValve::Response="+sw.toString()); + } return responseType; } Modified: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java =================================================================== --- identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java 2008-12-16 02:26:05 UTC (rev 166) +++ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java 2008-12-16 02:36:57 UTC (rev 167) @@ -52,8 +52,6 @@ String base64Request = Base64.encodeBytes(deflatedMsg, Base64.DONT_BREAK_LINES); - System.out.println("Request="+base64Request); - //Decode byte[] decodedMessage = Base64.decode(base64Request); InputStream is = DeflateUtil.decode(decodedMessage); Modified: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java =================================================================== --- identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java 2008-12-16 02:26:05 UTC (rev 166) +++ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java 2008-12-16 02:36:57 UTC (rev 167) @@ -21,6 +21,7 @@ */ package org.jboss.test.identity.federation.api.saml.v2; +import java.io.ByteArrayOutputStream; import java.util.List; import javax.xml.bind.JAXBElement; @@ -87,8 +88,9 @@ assertEquals( "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" ,requestedAuthnContext.getAuthnContextClassRef().get(0)); - //Let us marshall it back to System out - JBossSAMLAuthnRequestFactory.marshall(authnRequestType, System.out); + //Let us marshall it back to an output stream + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + JBossSAMLAuthnRequestFactory.marshall(authnRequestType, baos); } /** @@ -106,9 +108,9 @@ SignatureType signatureType = authnRequestType.getSignature(); assertNotNull("Signature is not null", signatureType); - //Let us marshall it back to System out - System.out.println(" "); - JBossSAMLAuthnRequestFactory.marshall(authnRequestType, System.out); + //Let us marshall it back to an output stream + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + JBossSAMLAuthnRequestFactory.marshall(authnRequestType, baos); } /** @@ -119,6 +121,8 @@ { AuthnRequestType authnRequest = JBossSAMLAuthnRequestFactory.createAuthnRequestType( "ID_" + JBossSAMLBaseFactory.createUUID(), "http://sp", "http://idp", "http://sp"); - JBossSAMLAuthnRequestFactory.marshall(authnRequest, System.out); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + JBossSAMLAuthnRequestFactory.marshall(authnRequest, baos); } } \ No newline at end of file Modified: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SAML2AuthnResponseUnitTestCase.java =================================================================== --- identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SAML2AuthnResponseUnitTestCase.java 2008-12-16 02:26:05 UTC (rev 166) +++ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SAML2AuthnResponseUnitTestCase.java 2008-12-16 02:36:57 UTC (rev 167) @@ -21,6 +21,8 @@ */ package org.jboss.test.identity.federation.api.saml.v2; +import java.io.ByteArrayOutputStream; + import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLAuthnResponseFactory; import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLBaseFactory; import org.jboss.identity.federation.saml.v2.jboss.IDPInfoHolder; @@ -52,6 +54,7 @@ new SPInfoHolder(), idp, issuerHolder); assertNotNull(rt); - JBossSAMLAuthnResponseFactory.marshall(rt, System.out); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + JBossSAMLAuthnResponseFactory.marshall(rt, baos); } } \ No newline at end of file