Author: anil.saldhana(a)jboss.com Date: 2009-06-10 13:17:42 -0400 (Wed, 10 Jun 2009) New Revision: 602 Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAMLUtil.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/DocumentUtil.java Log: JBID-128: DocumentBuilderFactory setXIncludeAware Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java 2009-06-10 09:08:26 UTC (rev 601) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java 2009-06-10 17:17:42 UTC (rev 602) @@ -24,8 +24,6 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.jboss.identity.federation.api.wstrust.SecurityToken; @@ -33,6 +31,7 @@ import org.jboss.identity.federation.api.wstrust.StandardSecurityToken; import org.jboss.identity.federation.api.wstrust.WSTrustException; import org.jboss.identity.federation.api.wstrust.WSTrustRequestContext; +import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -79,10 +78,8 @@ // we will use DOM to create the token. try - { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder docBuilder = factory.newDocumentBuilder(); - Document doc = docBuilder.newDocument(); + { + Document doc = DocumentUtil.createDocument(); Element root = doc.createElementNS("http://www.tokens.org", "token:SpecialToken"); root.appendChild(doc.createTextNode("Principal:" + caller)); Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAMLUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAMLUtil.java 2009-06-10 09:08:26 UTC (rev 601) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/plugins/saml/SAMLUtil.java 2009-06-10 17:17:42 UTC (rev 602) @@ -25,10 +25,10 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.dom.DOMResult; import org.jboss.identity.federation.api.wstrust.WSTrustConstants; +import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil; import org.jboss.identity.federation.core.util.JAXBUtil; import org.jboss.identity.federation.saml.v2.assertion.AssertionType; import org.jboss.identity.federation.saml.v2.assertion.ObjectFactory; @@ -63,8 +63,7 @@ */ public static Document toDocument(AssertionType assertion) throws Exception { - Document document = null; - document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); + Document document = DocumentUtil.createDocument(); DOMResult result = new DOMResult(document); Marshaller marshaller = JAXBUtil.getMarshaller("org.jboss.identity.federation.saml.v2.assertion"); marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new DefaultPrefixMapper()); Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/DocumentUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/DocumentUtil.java 2009-06-10 09:08:26 UTC (rev 601) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/DocumentUtil.java 2009-06-10 17:17:42 UTC (rev 602) @@ -118,7 +118,7 @@ public static Document getDocument(Reader reader) throws ParserConfigurationException, SAXException, IOException { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilderFactory factory = getDocumentBuilderFactory(); DocumentBuilder builder = factory.newDocumentBuilder(); return builder.parse(new InputSource(reader)); } @@ -310,6 +310,7 @@ { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); + factory.setXIncludeAware(true); return factory; } } \ No newline at end of file