You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2018/08/29 13:48:42 UTC
svn commit: r1839577 [3/6] - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/utils/
test/java/javax/xml/crypto/test/dsig/
test/java/javax/xml/crypto/test/dsig/keyinfo/
test/java/org/apache/xml/security/test/dom/ test/java/o...
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java Wed Aug 29 13:48:41 2018
@@ -65,7 +65,7 @@ public class InvalidKeyTest {
FileInputStream is = new FileInputStream(BASEDIR + SEP +
"src/test/resources/org/apache/xml/security/samples/input/test-assertion.xml");
- Document e = XMLUtils.createDocumentBuilder(false).parse(is);
+ Document e = XMLUtils.read(is, false);
Node assertion = e.getFirstChild();
while (!(assertion instanceof Element)) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java Wed Aug 29 13:48:41 2018
@@ -24,8 +24,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.security.PublicKey;
-import javax.xml.parsers.DocumentBuilder;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -41,16 +39,10 @@ public class KeyValueTest {
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private DocumentBuilder db;
-
static {
Init.init();
}
- public KeyValueTest() throws Exception {
- db = XMLUtils.createDocumentBuilder(false);
- }
-
@org.junit.Test
public void testDSAPublicKey() throws Exception {
File f = null;
@@ -61,7 +53,7 @@ public class KeyValueTest {
} else {
f = new File(filename);
}
- Document doc = db.parse(new FileInputStream(f));
+ Document doc = XMLUtils.read(new FileInputStream(f), false);
NodeList nl = doc.getElementsByTagNameNS(Constants.SignatureSpecNS, "Signature");
XMLSignature sig = new XMLSignature
((Element) nl.item(0), f.toURI().toURL().toString());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java Wed Aug 29 13:48:41 2018
@@ -23,8 +23,6 @@ import static org.junit.Assert.assertNul
import java.io.File;
import java.io.FileInputStream;
-import javax.xml.parsers.DocumentBuilder;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -43,12 +41,6 @@ public class NoKeyInfoTest {
Init.init();
}
- private DocumentBuilder db;
-
- public NoKeyInfoTest() throws Exception {
- db = XMLUtils.createDocumentBuilder(false);
- }
-
@org.junit.Test
public void testNullKeyInfo() throws Exception {
File f = null;
@@ -59,7 +51,7 @@ public class NoKeyInfoTest {
} else {
f = new File(filename);
}
- Document doc = db.parse(new FileInputStream(f));
+ Document doc = XMLUtils.read(new FileInputStream(f), false);
NodeList nl = doc.getElementsByTagNameNS(Constants.SignatureSpecNS, "Signature");
XMLSignature sig = new XMLSignature
((Element) nl.item(0), f.toURI().toURL().toString());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java Wed Aug 29 13:48:41 2018
@@ -39,8 +39,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.FileInputStream;
@@ -122,8 +120,7 @@ public class PreCalculatedDigestSignatur
}
private XMLSignature openSignature(String signatureFile) throws ParserConfigurationException, SAXException, IOException, XMLSecurityException {
- DocumentBuilder builder = createDocumentBuilder();
- Document document = builder.parse(new File(signatureFile));
+ Document document = XMLUtils.read(new FileInputStream(new File(signatureFile)), false);
Element root = document.getDocumentElement();
Element signatureDocument = (Element) root.getFirstChild();
String baseURI = "";
@@ -139,8 +136,7 @@ public class PreCalculatedDigestSignatur
}
private XMLSignature createXmlSignature() throws ParserConfigurationException, XMLSecurityException {
- DocumentBuilder documentBuilder = createDocumentBuilder();
- Document signatureDocument = documentBuilder.newDocument();
+ Document signatureDocument = XMLUtils.newDocument();
Element root = createSignatureRoot(signatureDocument);
String baseURI = "";
@@ -152,12 +148,6 @@ public class PreCalculatedDigestSignatur
return signature;
}
- private DocumentBuilder createDocumentBuilder() throws ParserConfigurationException {
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware(true);
- return documentBuilderFactory.newDocumentBuilder();
- }
-
private Transforms createTransformsForSignature(Document signatureDocument) throws TransformationException {
Transforms transforms = new Transforms(signatureDocument);
transforms.addTransform(Transforms.TRANSFORM_ENVELOPED_SIGNATURE);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java Wed Aug 29 13:48:41 2018
@@ -24,7 +24,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.security.cert.X509Certificate;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -63,9 +62,8 @@ public class ProcessingInstructionTest {
@org.junit.Test
public void testProcessingInstruction() throws Exception {
String signatureFileName = dir + "upp_sign.xml";
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
File f = new File(signatureFileName);
- Document doc = db.parse(new FileInputStream(f));
+ Document doc = XMLUtils.read(new FileInputStream(f), false);
Node obj =
doc.getElementsByTagNameNS("http://uri.etsi.org/01903/v1.3.2#", "QualifyingProperties").item(0);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java Wed Aug 29 13:48:41 2018
@@ -29,7 +29,6 @@ import java.util.Enumeration;
import java.util.List;
import javax.xml.crypto.dsig.DigestMethod;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -107,8 +106,7 @@ public class SignatureReferenceTest {
// See SANTUARIO-465
@org.junit.Test
public void testNoReferenceChildren() throws ParserConfigurationException, XMLSecurityException {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(true);
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
Element referenceElement = doc.createElementNS(Constants.SignatureSpecNS, "Reference");
referenceElement.setAttributeNS(null, "URI", "#_12345");
@@ -138,8 +136,6 @@ public class SignatureReferenceTest {
referenceElement.appendChild(digestValue);
new WrappedReference(referenceElement, "_54321", null);
-
- XMLUtils.repoolDocumentBuilder(db);
}
@org.junit.Test
@@ -152,8 +148,7 @@ public class SignatureReferenceTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/coreFeatures/signatures/manifestSignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false, false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false, false);
String expression = "//dsig:Signature[1]";
Element sigElement =
@@ -188,8 +183,6 @@ public class SignatureReferenceTest {
assertEquals(1, verifiedReferences.get(0).getManifestReferences().size());
assertEquals("../samples/sampleXMLData.xml", verifiedReferences.get(0).getManifestReferences().get(0).getUri());
assertFalse(verifiedReferences.get(0).getManifestReferences().get(0).isValid());
-
- XMLUtils.repoolDocumentBuilder(builder);
}
/**
@@ -231,8 +224,7 @@ public class SignatureReferenceTest {
}
private Document getOriginalDocument() throws Throwable {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
Element rootElement = doc.createElementNS("http://ns.example.org/", "root");
rootElement.appendChild(doc.createTextNode("Hello World!"));
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureTest.java Wed Aug 29 13:48:41 2018
@@ -28,8 +28,6 @@ import java.security.PrivateKey;
import java.security.PublicKey;
import java.util.Enumeration;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.Init;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
@@ -173,8 +171,7 @@ public class SignatureTest {
}
private Document getOriginalDocument() throws Throwable {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
Element rootElement = doc.createElementNS("http://ns.example.org/", "root");
rootElement.appendChild(doc.createTextNode("Hello World!"));
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java Wed Aug 29 13:48:41 2018
@@ -30,7 +30,6 @@ import java.security.PublicKey;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.xpath.XPath;
@@ -167,9 +166,7 @@ public class UnknownAlgoSignatureTest {
public static Document getDocument(File file)
throws ParserConfigurationException, SAXException, IOException {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(new FileInputStream(file));
- return doc;
+ return XMLUtils.read(new FileInputStream(file), false);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java Wed Aug 29 13:48:41 2018
@@ -44,8 +44,7 @@ public class X509DataTest {
public void testAddX509SubjectName() throws Exception {
Init.init();
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
XMLSignature sig = new XMLSignature(doc, "", XMLSignature.ALGO_ID_SIGNATURE_DSA);
doc.appendChild(sig.getElement());
@@ -75,10 +74,9 @@ public class X509DataTest {
private XMLSignature getSignature(byte[] s) throws Exception {
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = null;
try (InputStream is = new ByteArrayInputStream(s)) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
Element el = (Element)doc.getFirstChild();
return new XMLSignature(el, "");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java Wed Aug 29 13:48:41 2018
@@ -26,7 +26,6 @@ import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -71,8 +70,7 @@ public class XmlSecTest {
private void checkXmlSignatureSoftwareStack(boolean cert) throws Exception {
Init.init();
- DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(false);
- Document testDocument = documentBuilder.newDocument();
+ Document testDocument = XMLUtils.newDocument();
Element rootElement =
testDocument.createElementNS("urn:namespace", "tns:document");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java Wed Aug 29 13:48:41 2018
@@ -22,11 +22,10 @@ import org.apache.xml.security.c14n.impl
import org.apache.xml.security.c14n.implementations.Canonicalizer20010315ExclOmitComments;
import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_Excl;
import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_ExclOmitCommentsTransformer;
+import org.apache.xml.security.utils.XMLUtils;
import org.junit.Assert;
import org.w3c.dom.Document;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -96,13 +95,9 @@ public class EmptyNamespaceTest {
Canonicalizer20010315Excl transformer = new Canonicalizer20010315ExclOmitComments();
- final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware(true);
- documentBuilderFactory.setValidating(false);
- final DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
Document document = null;
try (InputStream is = new ByteArrayInputStream(message.getBytes(java.nio.charset.StandardCharsets.UTF_8))) {
- document = documentBuilder.parse(is);
+ document = XMLUtils.read(is, false);
}
String inclusiveNamespaces = "SOAP-ENV ec ec1 ns0 ns1 ns11 ns2 ns4 ns9";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java Wed Aug 29 13:48:41 2018
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertTru
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -110,13 +109,10 @@ public class TransformBase64DecodeTest {
+ "</Object>\n"
;
//J+
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
-
- db.setErrorHandler(new org.apache.xml.security.utils.IgnoreAllErrorHandler());
Document doc = null;
try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false, false, new org.apache.xml.security.utils.IgnoreAllErrorHandler());
}
//XMLUtils.circumventBug2650(doc);
@@ -145,8 +141,7 @@ public class TransformBase64DecodeTest {
}
private static Document createDocument() throws ParserConfigurationException {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
if (doc == null) {
throw new RuntimeException("Could not create a Document");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java Wed Aug 29 13:48:41 2018
@@ -88,7 +88,7 @@ public class TransformXSLTTest {
private static Document getDocument(File file)
throws ParserConfigurationException, SAXException, IOException {
- return XMLUtils.createDocumentBuilder(false).parse(new FileInputStream(file));
+ return XMLUtils.read(new FileInputStream(file), false);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java Wed Aug 29 13:48:41 2018
@@ -129,10 +129,9 @@ public class Xpath2TransformationTest {
" </edoc:ObjectContent>\n" +
" </edoc:Object>";
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
org.w3c.dom.Document doc = null;
try (ByteArrayInputStream is = new ByteArrayInputStream(sig.getBytes())) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
Element sigElement =
(Element) doc.getElementsByTagNameNS(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/XMLUtilsPerformanceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/XMLUtilsPerformanceTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/XMLUtilsPerformanceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/XMLUtilsPerformanceTest.java Wed Aug 29 13:48:41 2018
@@ -20,8 +20,6 @@ package org.apache.xml.security.test.dom
import java.io.StringReader;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.utils.XMLUtils;
import org.junit.Test;
import org.xml.sax.InputSource;
@@ -38,9 +36,7 @@ public class XMLUtilsPerformanceTest ext
@Test
public void testCreateDocumentBuilder() throws Exception {
InputSource inputSource = new InputSource(new StringReader("<xml>123</xml>"));
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- db.parse(inputSource);
- XMLUtils.repoolDocumentBuilder(db);
+ XMLUtils.read(inputSource, false);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java Wed Aug 29 13:48:41 2018
@@ -49,7 +49,7 @@ public class ResolverDirectHTTPTest exte
@Test
public void testBug40783() throws Exception {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
Attr uri = doc.createAttribute("id");
uri.setNodeValue("urn:ddd:uuu");
doc.createElement("test").setAttributeNode(uri);
@@ -64,7 +64,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testProxyAuth() throws Exception {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
Attr uri = doc.createAttribute("URI");
uri.setNodeValue(url);
@@ -81,7 +81,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testProxyAuthWithWrongPassword() throws Exception {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
Attr uri = doc.createAttribute("URI");
uri.setNodeValue(url);
@@ -103,7 +103,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testServerAuth() throws Exception {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
Attr uri = doc.createAttribute("URI");
uri.setNodeValue(url);
@@ -118,7 +118,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testServerAuthWithWrongPassword() throws Exception {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
Attr uri = doc.createAttribute("URI");
uri.setNodeValue(url);
@@ -138,7 +138,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testProxyAndServerAuth() throws Exception {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
Attr uri = doc.createAttribute("URI");
uri.setNodeValue(url);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java Wed Aug 29 13:48:41 2018
@@ -49,7 +49,7 @@ public class ResourceResolverTest {
String className =
"org.apache.xml.security.test.dom.utils.resolver.OfflineResolver";
ResourceResolver.registerAtStart(className);
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
Attr uriAttr = doc.createAttribute("URI");
uriAttr.setValue("http://www.apache.org");
ResourceResolver res =
@@ -73,7 +73,7 @@ public class ResourceResolverTest {
@org.junit.Test
public void testLocalFileWithEmptyBaseURI() throws Exception {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
Attr uriAttr = doc.createAttribute("URI");
String basedir = System.getProperty("basedir");
String file = new File(basedir, "pom.xml").toURI().toString();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java Wed Aug 29 13:48:41 2018
@@ -595,7 +595,7 @@ public class Canonicalizer11Test {
// db.setErrorHandler(new org.apache.xml.security.utils
// .IgnoreAllErrorHandler());
//
-// Document doc = db.parse(new ByteArrayInputStream(input.getBytes()));
+// Document doc = XMLUtils.read(new ByteArrayInputStream(input.getBytes()));
// Canonicalizer c14nizer =
// Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
// CachedXPathAPI xpathAPI = new CachedXPathAPI();
@@ -682,7 +682,7 @@ public class Canonicalizer11Test {
// String ENCODING_UTF16 = "UTF-16";
// DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
// DocumentBuilder db = dbf.newDocumentBuilder();
-// Document doc = db.parse(new ByteArrayInputStream(input));
+// Document doc = XMLUtils.read(new ByteArrayInputStream(input));
// TransformerFactory tFactory = TransformerFactory.newInstance();
// Transformer transformer = tFactory.newTransformer();
//
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java Wed Aug 29 13:48:41 2018
@@ -233,7 +233,7 @@ public class Canonicalizer20010315Exclus
*/
@org.junit.Test
public void test24Aexcl() throws Exception {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
Element local = doc.createElementNS("foo:bar", "dsig:local");
Element test = doc.createElementNS("http://example.net", "etsi:test");
Element elem2 = doc.createElementNS("http://example.net", "etsi:elem2");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java Wed Aug 29 13:48:41 2018
@@ -672,7 +672,7 @@ public class Canonicalizer20010315Test {
// db.setErrorHandler(new org.apache.xml.security.utils
// .IgnoreAllErrorHandler());
//
-// Document doc = db.parse(new ByteArrayInputStream(input.getBytes()));
+// Document doc = XMLUtils.read(new ByteArrayInputStream(input.getBytes()));
// Canonicalizer c14nizer =
// Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
// CachedXPathAPI xpathAPI = new CachedXPathAPI();
@@ -764,7 +764,7 @@ public class Canonicalizer20010315Test {
// String ENCODING_UTF16 = "UTF-16";
// DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
// DocumentBuilder db = dbf.newDocumentBuilder();
-// Document doc = db.parse(new ByteArrayInputStream(input));
+// Document doc = XMLUtils.read(new ByteArrayInputStream(input));
// TransformerFactory tFactory = TransformerFactory.newInstance();
// Transformer transformer = tFactory.newTransformer();
//
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java Wed Aug 29 13:48:41 2018
@@ -30,7 +30,6 @@ import java.security.spec.DSAPublicKeySp
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -82,8 +81,7 @@ public class ExclusiveC14NInteropTest {
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream("interop/c14n/Y1/exc-signature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey();
@@ -107,7 +105,7 @@ public class ExclusiveC14NInteropTest {
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
}
private static PublicKey getPublicKey()
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java Wed Aug 29 13:48:41 2018
@@ -31,7 +31,6 @@ import java.util.Map;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -86,8 +85,7 @@ public class BaltimoreEncTest {
}
File f = new File(filename);
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(new java.io.FileInputStream(f));
+ Document doc = XMLUtils.read(new java.io.FileInputStream(f), false);
cardNumber = retrieveCCNumber(doc);
@@ -114,8 +112,7 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-tripledes-cbc.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes(StandardCharsets.US_ASCII);
@@ -141,7 +138,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -152,8 +149,7 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-aes256-cbc-prop.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwxyz012345".getBytes(StandardCharsets.US_ASCII);
@@ -179,7 +175,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -190,8 +186,7 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-aes128-cbc-kw-aes192.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes(StandardCharsets.US_ASCII);
@@ -217,7 +212,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -228,8 +223,7 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-element-tripledes-cbc-kw-aes128.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnop".getBytes(StandardCharsets.US_ASCII);
@@ -255,7 +249,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -266,8 +260,7 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-element-aes128-cbc-rsa-1_5.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -289,7 +282,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -300,8 +293,7 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes128-cbc.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnop".getBytes(StandardCharsets.US_ASCII);
@@ -327,7 +319,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
}
@Test
@@ -336,8 +328,7 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes256-cbc-kw-tripledes.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes(StandardCharsets.US_ASCII);
@@ -363,7 +354,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
}
@Test
@@ -372,8 +363,7 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes192-cbc-kw-aes256.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwxyz012345".getBytes(StandardCharsets.US_ASCII);
@@ -399,7 +389,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
}
@Test
@@ -408,8 +398,7 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-tripledes-cbc-rsa-oaep-mgf1p.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -431,7 +420,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
}
/*
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java Wed Aug 29 13:48:41 2018
@@ -37,7 +37,6 @@ import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESedeKeySpec;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -99,8 +98,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
SecretKey secretKey = generateSecretKey();
@@ -134,7 +132,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -155,8 +153,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
SecretKey secretKey = generateSecretKey();
@@ -193,7 +190,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -213,8 +210,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -253,7 +249,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -273,8 +269,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
SecretKey secretKey = generateSecretKey();
@@ -312,7 +307,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -340,8 +335,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
@@ -384,7 +378,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -410,8 +404,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyPairGenerator rsaKeygen = KeyPairGenerator.getInstance("RSA");
@@ -456,7 +449,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -478,8 +471,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyPairGenerator rsaKeygen = KeyPairGenerator.getInstance("RSA");
@@ -524,7 +516,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -550,8 +542,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
@@ -596,7 +587,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -618,8 +609,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] passPhrase = "24 Bytes per DESede key!".getBytes();
@@ -659,7 +649,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -679,8 +669,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] bits128 = {
@@ -722,7 +711,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -742,8 +731,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] bits192 = {
@@ -787,7 +775,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -807,8 +795,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] bits256 = {
@@ -854,7 +841,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -876,8 +863,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
byte[] passPhrase = "24 Bytes per DESede key!".getBytes();
@@ -917,7 +903,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -934,10 +920,9 @@ public class DecryptionTest extends Asse
public void testPhysicalRepresentation() throws Exception {
final String DATA1 =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><ns:root xmlns:ns=\"ns.com\"><ns:elem xmlns:ns2=\"ns2.com\">11</ns:elem></ns:root>";
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document document = null;
try (InputStream is = new ByteArrayInputStream(DATA1.getBytes(StandardCharsets.UTF_8))) {
- document = db.parse(is);
+ document = XMLUtils.read(is, false);
}
// Set up the Key
@@ -977,7 +962,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the element decrypted ok
nodeList = document.getElementsByTagNameNS("ns.com", "elem");
@@ -1002,10 +987,9 @@ public class DecryptionTest extends Asse
public void testPhysicalRepresentation2() throws Exception {
final String DATA1 =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><ns:root xmlns=\"defns.com\" xmlns:ns=\"ns.com\"><elem xmlns=\"\">11</elem></ns:root>";
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document document = null;
try (InputStream is = new ByteArrayInputStream(DATA1.getBytes(StandardCharsets.UTF_8))) {
- document = db.parse(is);
+ document = XMLUtils.read(is, false);
}
// Set up the Key
@@ -1045,7 +1029,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the element decrypted ok
nodeList = document.getElementsByTagNameNS("", "elem");
@@ -1272,8 +1256,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
for (int i = 0; i < 7; i++) {
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1310,7 +1293,7 @@ public class DecryptionTest extends Asse
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
fail("Exception expected");
} catch (XMLStreamException e) {
assertTrue(e.getCause() instanceof XMLSecurityException);
@@ -1325,8 +1308,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyPairGenerator rsaKeygen = KeyPairGenerator.getInstance("RSA");
@@ -1392,7 +1374,7 @@ public class DecryptionTest extends Asse
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
} catch (XMLStreamException e) {
Assert.assertFalse(e.getMessage().contains("Unwrapping failed"));
}
@@ -1404,8 +1386,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1453,7 +1434,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1466,8 +1447,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1525,7 +1505,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1538,8 +1518,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1597,7 +1576,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1610,8 +1589,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1669,7 +1647,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1690,8 +1668,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1749,7 +1726,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1762,8 +1739,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -1812,7 +1788,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1825,8 +1801,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
SecretKey secretKey = generateSecretKey();
@@ -1864,7 +1839,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// XMLUtils.outputDOM(document, System.out);
@@ -1887,8 +1862,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
SecretKey secretKey = generateSecretKey();
@@ -1926,7 +1900,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -1946,8 +1920,7 @@ public class DecryptionTest extends Asse
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.read(sourceDocument, false);
// Set up the Key
SecretKey secretKey = generateSecretKey();
@@ -1985,7 +1958,7 @@ public class DecryptionTest extends Asse
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "PurchaseOrder");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java Wed Aug 29 13:48:41 2018
@@ -111,7 +111,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -170,7 +170,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
// Check the CreditCard encrypted ok
@@ -261,7 +261,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -320,7 +320,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -381,7 +381,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -439,7 +439,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -508,7 +508,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -577,7 +577,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -647,7 +647,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -719,7 +719,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
// Check the CreditCard encrypted ok
@@ -782,7 +782,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -853,7 +853,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -932,7 +932,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -1003,7 +1003,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -1074,7 +1074,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -1139,7 +1139,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -1200,7 +1200,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -1263,7 +1263,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -1328,7 +1328,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -1394,7 +1394,7 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ XMLUtils.read(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1456,7 +1456,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -1519,7 +1519,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("ns.com", "elem");
@@ -1582,7 +1582,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("", "elem");
@@ -1642,7 +1642,7 @@ public class EncryptionCreationTest exte
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");