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 [2/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/algorithms/SymmetricEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java Wed Aug 29 13:48:41 2018
@@ -28,7 +28,6 @@ import java.util.List;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -87,8 +86,7 @@ public class SymmetricEncryptionAlgorith
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");
@@ -120,8 +118,7 @@ public class SymmetricEncryptionAlgorith
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");
@@ -153,8 +150,7 @@ public class SymmetricEncryptionAlgorith
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");
@@ -186,8 +182,7 @@ public class SymmetricEncryptionAlgorith
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");
@@ -219,8 +214,7 @@ public class SymmetricEncryptionAlgorith
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");
@@ -252,8 +246,7 @@ public class SymmetricEncryptionAlgorith
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");
@@ -285,8 +278,7 @@ public class SymmetricEncryptionAlgorith
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("DESede");
@@ -319,8 +311,7 @@ public class SymmetricEncryptionAlgorith
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("SEED");
@@ -354,8 +345,7 @@ public class SymmetricEncryptionAlgorith
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("Camellia");
@@ -389,8 +379,7 @@ public class SymmetricEncryptionAlgorith
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("Camellia");
@@ -424,8 +413,7 @@ public class SymmetricEncryptionAlgorith
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("Camellia");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java Wed Aug 29 13:48:41 2018
@@ -20,7 +20,6 @@ package org.apache.xml.security.test.dom
import static org.junit.Assert.*;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.xml.security.c14n.helper.AttrCompare;
@@ -218,9 +217,7 @@ public class AttrCompareTest {
private static Document createDoc(
String documentElement
) throws ParserConfigurationException {
- DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(false);
-
- Document doc = documentBuilder.newDocument();
+ Document doc = XMLUtils.newDocument();
Element root = doc.createElementNS(null, documentElement);
doc.appendChild(root);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java Wed Aug 29 13:48:41 2018
@@ -25,8 +25,6 @@ import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.Init;
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.keys.KeyInfo;
@@ -47,14 +45,12 @@ public class Bug45961Test {
MockCanonicalizationMethod.MOCK_CANONICALIZATION_METHOD;
private static final char[] PASSWORD = "changeit".toCharArray();
private static final String ALIAS = "mullan";
- private DocumentBuilder _builder;
private ObjectContainer object;
public Bug45961Test() throws Exception {
Init.init();
Canonicalizer.register(MOCK_CANONICALIZATION_METHOD,
MockCanonicalizationMethod.class.getName());
- _builder = XMLUtils.createDocumentBuilder(false);
}
@org.junit.Test
@@ -84,7 +80,7 @@ public class Bug45961Test {
X509Certificate signingCert = (X509Certificate) ks
.getCertificate(ALIAS);
- Document document = _builder.newDocument();
+ Document document = XMLUtils.newDocument();
XMLSignature signature = new XMLSignature(document, null,
XMLSignature.ALGO_ID_SIGNATURE_DSA,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java Wed Aug 29 13:48:41 2018
@@ -27,7 +27,6 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.xpath.XPath;
@@ -357,17 +356,11 @@ public class Canonicalizer11Test {
ParserConfigurationException, CanonicalizationException,
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
- DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(validating, false);
-
- // throw away all warnings and errors
- documentBuilder.setErrorHandler(new IgnoreAllErrorHandler());
-
// org.xml.sax.EntityResolver resolver = new TestVectorResolver();
// documentBuilder.setEntityResolver(resolver);
// Document doc = documentBuilder.parse(resolver.resolveEntity(null, fileIn));
- Document doc = documentBuilder.parse(fileIn);
-
+ Document doc = XMLUtils.read(fileIn, validating, false, new IgnoreAllErrorHandler());
Canonicalizer c14n = Canonicalizer.getInstance(c14nURI);
byte c14nBytes[] = null;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java Wed Aug 29 13:48:41 2018
@@ -21,13 +21,13 @@ package org.apache.xml.security.test.dom
import static org.junit.Assert.*;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.StringReader;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.xpath.XPath;
@@ -71,13 +71,6 @@ public class Canonicalizer20010315Exclus
Canonicalizer20010315ExclusiveTest.class
);
- /** Field db */
- DocumentBuilder db;
-
- public Canonicalizer20010315ExclusiveTest() throws ParserConfigurationException {
- this.db = XMLUtils.createDocumentBuilder(false);
- }
-
/**
* Method testA
*
@@ -106,7 +99,7 @@ public class Canonicalizer20010315Exclus
// File fileIn = new File("signature.xml");
assertTrue("file exists", fileIn.exists());
- Document doc = this.db.parse(fileIn);
+ Document doc = XMLUtils.read(new FileInputStream(fileIn), false);
Element signatureElement =
(Element) doc.getElementsByTagNameNS(
Constants.SignatureSpecNS, Constants._TAG_SIGNATURE).item(0);
@@ -151,8 +144,9 @@ public class Canonicalizer20010315Exclus
XMLSignatureException, XMLSecurityException {
Document doc =
- this.db.parse(
- getAbsolutePath("src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_1.xml")
+ XMLUtils.read(
+ new FileInputStream(getAbsolutePath("src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_1.xml")),
+ false
);
Node root = doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315 c = new Canonicalizer20010315WithComments();
@@ -184,9 +178,9 @@ public class Canonicalizer20010315Exclus
InvalidCanonicalizerException, TransformerException,
XMLSignatureException, XMLSecurityException {
Document doc =
- this.db.parse(getAbsolutePath(
+ XMLUtils.read(new FileInputStream(getAbsolutePath(
"src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_2.xml")
- );
+ ), false);
Node root = doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315 c = new Canonicalizer20010315WithComments();
byte[] reference = JavaUtils.getBytesFromFile(getAbsolutePath(
@@ -217,8 +211,9 @@ public class Canonicalizer20010315Exclus
InvalidCanonicalizerException, TransformerException,
XMLSignatureException, XMLSecurityException {
Document doc =
- this.db.parse(getAbsolutePath(
- "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_1.xml"));
+ XMLUtils.read(new FileInputStream(getAbsolutePath(
+ "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_1.xml")),
+ false);
Node root = doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315Excl c = new Canonicalizer20010315ExclWithComments();
byte[] reference = JavaUtils.getBytesFromFile(getAbsolutePath(
@@ -249,8 +244,9 @@ public class Canonicalizer20010315Exclus
InvalidCanonicalizerException, TransformerException,
XMLSignatureException, XMLSecurityException {
Document doc =
- this.db.parse(getAbsolutePath(
- "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_2.xml"));
+ XMLUtils.read(new FileInputStream(getAbsolutePath(
+ "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_2.xml")),
+ false);
Node root = doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315Excl c = new Canonicalizer20010315ExclWithComments();
byte[] reference = JavaUtils.getBytesFromFile(getAbsolutePath(
@@ -284,8 +280,9 @@ public class Canonicalizer20010315Exclus
InvalidCanonicalizerException, TransformerException,
XMLSignatureException, XMLSecurityException, XPathExpressionException {
Document doc =
- this.db.parse(getAbsolutePath(
- "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_3.xml"));
+ XMLUtils.read(new FileInputStream(getAbsolutePath(
+ "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_2_3.xml")),
+ false);
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
@@ -336,7 +333,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
Set<Node> nodeSet = new HashSet<>();
@@ -354,9 +351,10 @@ public class Canonicalizer20010315Exclus
@org.junit.Test
public void test24excl() throws Exception {
Document doc =
- this.db.parse(
- getAbsolutePath(
- "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_4.xml"));
+ XMLUtils.read(
+ new FileInputStream(getAbsolutePath(
+ "src/test/resources/org/apache/xml/security/c14n/inExcl/example2_4.xml")),
+ false);
Node root =
doc.getElementsByTagNameNS("http://example.net", "elem2").item(0);
Canonicalizer20010315Excl c = new Canonicalizer20010315ExclWithComments();
@@ -376,7 +374,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");
@@ -429,7 +427,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
{
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
@@ -492,7 +490,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
{
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
@@ -542,7 +540,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
{
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
@@ -592,7 +590,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
{
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
@@ -642,7 +640,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild(), "#default", true);
@@ -677,7 +675,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild(), "#default", true);
@@ -712,7 +710,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild(), "#default", true);
@@ -747,7 +745,7 @@ public class Canonicalizer20010315Exclus
+ "</ns0:Ping>"
+ "</env:Body>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild(), "#default", true);
@@ -777,7 +775,7 @@ public class Canonicalizer20010315Exclus
+ "<ns0:text xsi:type=\"xsd:string\">hello</ns0:text>"
+ "</ns0:Ping>";
- Document doc = this.db.parse(new InputSource(new StringReader(XML)));
+ Document doc = XMLUtils.read(new InputSource(new StringReader(XML)), false);
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
byte[] bytes = c14n.engineCanonicalizeSubTree(doc.getDocumentElement().getFirstChild().getFirstChild(), "#default", true);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Wed Aug 29 13:48:41 2018
@@ -30,7 +30,6 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
@@ -609,12 +608,8 @@ public class Canonicalizer20010315Test {
//String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
//boolean validating = true;
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
org.xml.sax.EntityResolver resolver = new TestVectorResolver();
-
- db.setEntityResolver(resolver);
-
- Document doc = db.parse(resolver.resolveEntity(null, fileIn));
+ Document doc = XMLUtils.read(resolver.resolveEntity(null, fileIn), false, false, resolver);
String xpath = "(//. | //@* | //namespace::*)"
+ "[ "
@@ -676,10 +671,9 @@ public class Canonicalizer20010315Test {
+ "";
//J+
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = null;
try (InputStream is = new ByteArrayInputStream(inputStr.getBytes())) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
boolean weCatchedTheRelativeNS = false;
@@ -988,13 +982,9 @@ public class Canonicalizer20010315Test {
ParserConfigurationException, CanonicalizationException,
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(true);
-
- db.setErrorHandler(new IgnoreAllErrorHandler());
-
Document doc = null;
try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, true, true, new IgnoreAllErrorHandler());
}
Canonicalizer c14nizer =
Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
@@ -1043,16 +1033,11 @@ public class Canonicalizer20010315Test {
ParserConfigurationException, CanonicalizationException,
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
- DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(validating, false);
-
- // throw away all warnings and errors
- documentBuilder.setErrorHandler(new IgnoreAllErrorHandler());
-
// org.xml.sax.EntityResolver resolver = new TestVectorResolver();
// documentBuilder.setEntityResolver(resolver);
// Document doc = documentBuilder.parse(resolver.resolveEntity(null, fileIn));
- Document doc = documentBuilder.parse(fileIn);
+ Document doc = XMLUtils.read(fileIn, validating, false, new IgnoreAllErrorHandler());
Canonicalizer c14n = Canonicalizer.getInstance(c14nURI);
@@ -1117,10 +1102,9 @@ public class Canonicalizer20010315Test {
//String ENCODING_ISO8859_1 = "ISO-8859-1";
//String ENCODING_UTF8 = java.nio.charset.StandardCharsets.UTF_8;
String ENCODING_UTF16 = "UTF-16";
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = null;
try (InputStream is = new ByteArrayInputStream(input)) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
TransformerFactory tFactory = TransformerFactory.newInstance();
Transformer transformer = tFactory.newTransformer();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java Wed Aug 29 13:48:41 2018
@@ -21,6 +21,7 @@ package org.apache.xml.security.test.dom
import static org.junit.Assert.assertTrue;
import java.io.File;
+import java.io.FileInputStream;
import org.apache.xml.security.signature.Reference;
import org.apache.xml.security.signature.XMLSignature;
@@ -118,8 +119,7 @@ public class ExclusiveC14NInteropTest ex
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
- org.w3c.dom.Document doc = db.parse(f);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java Wed Aug 29 13:48:41 2018
@@ -32,7 +32,7 @@ public class NameSpaceSymbTableTest {
static Attr node1, node2;
static {
try {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
node1 = doc.createAttributeNS("a","b");
node2 = doc.createAttributeNS("b","c");
} catch (Exception e) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java Wed Aug 29 13:48:41 2018
@@ -25,8 +25,6 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import javax.xml.parsers.DocumentBuilder;
-
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.apache.xml.security.c14n.implementations.Canonicalizer11_OmitComments;
@@ -55,8 +53,6 @@ public class Santuario191Test {
+ " <user2>Bob</user2>"
+ "</data>";
- private DocumentBuilder db;
-
static {
org.apache.xml.security.Init.init();
}
@@ -66,10 +62,9 @@ public class Santuario191Test {
//
// Parse the Data
//
- db = XMLUtils.createDocumentBuilder(false);
Document doc = null;
try (InputStream is = new ByteArrayInputStream(INPUT_DATA.getBytes(StandardCharsets.UTF_8))) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
//
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java Wed Aug 29 13:48:41 2018
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEqu
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -79,12 +78,9 @@ public class Santuario273Test {
@org.junit.Test
public void testC14n11Base() throws Exception {
- DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(true);
-
- documentBuilder.setErrorHandler(new org.apache.xml.security.utils.IgnoreAllErrorHandler());
Document doc = null;
try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
- doc = documentBuilder.parse(is);
+ doc = XMLUtils.read(is, true, false, new org.apache.xml.security.utils.IgnoreAllErrorHandler());
}
Canonicalizer c14n =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java Wed Aug 29 13:48:41 2018
@@ -33,7 +33,6 @@ import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
@@ -91,8 +90,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);
@@ -392,8 +390,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);
// Now we have the document, lets build the XMLCipher element
Element ee = null;
@@ -432,8 +429,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);
// Now we have the document, lets build the XMLCipher element
Element ee = null;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java Wed Aug 29 13:48:41 2018
@@ -30,7 +30,6 @@ import javax.crypto.NoSuchPaddingExcepti
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESedeKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.transform.TransformerFactory;
import org.apache.xml.security.algorithms.JCEMapper;
@@ -71,13 +70,11 @@ public class EncryptContentTest {
" </user>\n" +
"</users>\n";
- private DocumentBuilder db;
private SecretKey secretKey;
private boolean haveISOPadding;
public EncryptContentTest() throws Exception {
org.apache.xml.security.Init.init();
- db = XMLUtils.createDocumentBuilder(false);
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
DESedeKeySpec keySpec = new DESedeKeySpec(bits192);
@@ -118,7 +115,7 @@ public class EncryptContentTest {
Document doc = null;
try (InputStream is = new ByteArrayInputStream(DATA.getBytes(StandardCharsets.UTF_8))) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
NodeList dataToEncrypt = doc.getElementsByTagName("user");
@@ -170,7 +167,7 @@ public class EncryptContentTest {
Document doc = null;
try (InputStream is = new ByteArrayInputStream(MULTIPLE_USER_DATA.getBytes(StandardCharsets.UTF_8))) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
NodeList dataToEncrypt = doc.getElementsByTagName("user");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java Wed Aug 29 13:48:41 2018
@@ -22,8 +22,6 @@ import static org.junit.Assert.*;
import java.util.Iterator;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.encryption.Reference;
import org.apache.xml.security.encryption.ReferenceList;
import org.apache.xml.security.encryption.XMLCipher;
@@ -37,16 +35,14 @@ public class ReferenceListTest {
static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ReferenceListTest.class);
- private DocumentBuilder db;
public ReferenceListTest() throws Exception {
org.apache.xml.security.Init.init();
- db = XMLUtils.createDocumentBuilder(false);
}
@org.junit.Test
public void testReferenceList() throws Exception {
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
XMLCipher dataCipher = XMLCipher.getInstance();
dataCipher.init(XMLCipher.DECRYPT_MODE, null);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java Wed Aug 29 13:48:41 2018
@@ -34,7 +34,6 @@ import org.w3c.dom.Element;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.transform.TransformerFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -100,10 +99,9 @@ public class SignedEncryptedTest extends
}
public void secureAndVerify(TransformerFactory transformerFactory, boolean useDocumentSerializer) throws Exception {
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = null;
try (InputStream is = new ByteArrayInputStream(SAMPLE_MSG.getBytes(StandardCharsets.UTF_8))) {
- document = builder.parse(is);
+ document = XMLUtils.read(is, false);
}
// Set up the Key
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java Wed Aug 29 13:48:41 2018
@@ -23,6 +23,7 @@ import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileInputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.security.Key;
@@ -39,7 +40,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 org.apache.xml.security.algorithms.JCEMapper;
import org.apache.xml.security.c14n.Canonicalizer;
@@ -625,9 +625,7 @@ public class XMLCipherTest {
public void testSameDocumentCipherReference() throws Exception {
if (haveISOPadding) {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
-
- Document d = db.newDocument();
+ Document d = XMLUtils.newDocument();
Element docElement = d.createElement("EncryptedDoc");
d.appendChild(docElement);
@@ -698,8 +696,6 @@ public class XMLCipherTest {
public void testPhysicalRepresentation() throws Exception {
if (haveISOPadding) {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
-
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
DESedeKeySpec keySpec = new DESedeKeySpec(bits192);
SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DESede");
@@ -710,7 +706,7 @@ public class XMLCipherTest {
final String DATA1 = "<ns:root xmlns:ns=\"ns.com\"><ns:elem xmlns:ns2=\"ns2.com\">11</ns:elem></ns:root>";
Document doc = null;
try (InputStream is = new ByteArrayInputStream(DATA1.getBytes(StandardCharsets.UTF_8))) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
Element elem = (Element)doc.getDocumentElement().getFirstChild();
@@ -736,7 +732,7 @@ public class XMLCipherTest {
// Test default namespace undeclaration is preserved
final String DATA2 = "<ns:root xmlns=\"defns.com\" xmlns:ns=\"ns.com\"><elem xmlns=\"\">11</elem></ns:root>";
try (InputStream is = new ByteArrayInputStream(DATA2.getBytes(StandardCharsets.UTF_8))) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
elem = (Element)doc.getDocumentElement().getFirstChild();
@@ -763,9 +759,9 @@ public class XMLCipherTest {
// Other c14n algorithms add a newline after comments and PIs, when they are before or after the document element.
final String DATA3 = "<root><!--comment1--><?pi1 target1?><elem/><!--comment2--><?pi2 target2?></root>";
try (InputStream is = new ByteArrayInputStream(DATA3.getBytes(StandardCharsets.UTF_8))) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
- elem = (Element)doc.getDocumentElement();
+ elem = doc.getDocumentElement();
dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
dataCipher.init(XMLCipher.ENCRYPT_MODE, secretKey);
@@ -860,8 +856,7 @@ public class XMLCipherTest {
}
File f = new File(filename);
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(f);
+ Document document = XMLUtils.read(new FileInputStream(f), false);
XMLCipher keyCipher = XMLCipher.getInstance();
keyCipher.init(XMLCipher.UNWRAP_MODE, null);
@@ -984,9 +979,8 @@ public class XMLCipherTest {
private Document document() {
Document d = null;
try {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
File f = new File(documentName);
- d = db.parse(f);
+ d = XMLUtils.read(new FileInputStream(f), false);
} catch (Exception e) {
e.printStackTrace();
System.exit(-1);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java Wed Aug 29 13:48:41 2018
@@ -32,7 +32,6 @@ import java.util.Map;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.NoSuchPaddingException;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
@@ -87,8 +86,7 @@ public class XMLEncryption11Test {
}
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);
@@ -183,8 +181,7 @@ public class XMLEncryption11Test {
}
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);
Key sessionKey = getSessionKey("http://www.w3.org/2009/xmlenc11#aes128-gcm");
EncryptedKey encryptedKey =
@@ -248,8 +245,7 @@ public class XMLEncryption11Test {
}
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);
Key sessionKey = getSessionKey("http://www.w3.org/2009/xmlenc11#aes128-gcm");
EncryptedKey encryptedKey =
@@ -351,8 +347,7 @@ public class XMLEncryption11Test {
}
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);
Key sessionKey = getSessionKey("http://www.w3.org/2009/xmlenc11#aes192-gcm");
EncryptedKey encryptedKey =
@@ -453,8 +448,7 @@ public class XMLEncryption11Test {
}
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);
Key sessionKey = getSessionKey("http://www.w3.org/2009/xmlenc11#aes256-gcm");
EncryptedKey encryptedKey =
@@ -555,8 +549,7 @@ public class XMLEncryption11Test {
}
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);
Key sessionKey = getSessionKey("http://www.w3.org/2009/xmlenc11#aes256-gcm");
EncryptedKey encryptedKey =
@@ -608,8 +601,7 @@ public class XMLEncryption11Test {
}
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);
return decryptElement(doc, rsaKey, rsaCert);
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java Wed Aug 29 13:48:41 2018
@@ -19,6 +19,7 @@
package org.apache.xml.security.test.dom.interop;
import java.io.File;
+import java.io.FileInputStream;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.Iterator;
@@ -60,8 +61,7 @@ public class InteropTestBase {
String filename, ResourceResolverSpi resolver, boolean followManifests, byte[] hmacKey
) throws Exception {
File f = new File(filename);
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
- org.w3c.dom.Document doc = db.parse(new java.io.FileInputStream(f));
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
@@ -92,8 +92,7 @@ public class InteropTestBase {
boolean followManifests, boolean secureValidation)
throws Exception {
File f = new File(filename);
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
- org.w3c.dom.Document doc = db.parse(f);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java Wed Aug 29 13:48:41 2018
@@ -23,8 +23,6 @@ import java.security.KeyFactory;
import java.security.PublicKey;
import java.security.spec.X509EncodedKeySpec;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.keys.content.DEREncodedKeyValue;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.JavaUtils;
@@ -39,8 +37,6 @@ public class DEREncodedKeyValueTest exte
private static final String BASEDIR = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private DocumentBuilder documentBuilder;
-
private PublicKey rsaKeyControl;
private PublicKey dsaKeyControl;
private PublicKey ecKeyControl;
@@ -48,8 +44,6 @@ public class DEREncodedKeyValueTest exte
private final String idControl = "abc123";
public DEREncodedKeyValueTest() throws Exception {
- documentBuilder = XMLUtils.createDocumentBuilder(false);
-
rsaKeyControl = loadPublicKey("rsa.key", "RSA");
dsaKeyControl = loadPublicKey("dsa.key", "DSA");
ecKeyControl = loadPublicKey("ec.key", "EC");
@@ -57,7 +51,7 @@ public class DEREncodedKeyValueTest exte
@org.junit.Test
public void testSchema() throws Exception {
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), rsaKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(), rsaKeyControl);
Element element = derEncodedKeyValue.getElement();
assertEquals("http://www.w3.org/2009/xmldsig11#", element.getNamespaceURI());
@@ -102,28 +96,28 @@ public class DEREncodedKeyValueTest exte
@org.junit.Test
public void testRSAPublicKeyFromKey() throws Exception {
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), rsaKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(), rsaKeyControl);
assertEquals(rsaKeyControl, derEncodedKeyValue.getPublicKey());
assertArrayEquals(rsaKeyControl.getEncoded(), derEncodedKeyValue.getBytesFromTextChild());
}
@org.junit.Test
public void testDSAPublicKeyFromKey() throws Exception {
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), dsaKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(), dsaKeyControl);
assertEquals(dsaKeyControl, derEncodedKeyValue.getPublicKey());
assertArrayEquals(dsaKeyControl.getEncoded(), derEncodedKeyValue.getBytesFromTextChild());
}
@org.junit.Test
public void testECPublicKeyFromKey() throws Exception {
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), ecKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(), ecKeyControl);
assertEquals(ecKeyControl, derEncodedKeyValue.getPublicKey());
assertArrayEquals(ecKeyControl.getEncoded(), derEncodedKeyValue.getBytesFromTextChild());
}
@org.junit.Test
public void testId() throws Exception {
- DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), rsaKeyControl);
+ DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(XMLUtils.newDocument(), rsaKeyControl);
assertEquals("", derEncodedKeyValue.getId());
assertNull(derEncodedKeyValue.getElement().getAttributeNodeNS(null, Constants._ATT_ID));
@@ -146,7 +140,7 @@ public class DEREncodedKeyValueTest exte
}
private Document loadXML(String fileName) throws Exception {
- return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
+ return XMLUtils.read(new FileInputStream(getControlFilePath(fileName)), false);
}
private PublicKey loadPublicKey(String filePath, String algorithm) throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/KeyInfoReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/KeyInfoReferenceTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/KeyInfoReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/KeyInfoReferenceTest.java Wed Aug 29 13:48:41 2018
@@ -20,8 +20,6 @@ package org.apache.xml.security.test.dom
import java.io.FileInputStream;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.keys.content.KeyInfoReference;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
@@ -35,18 +33,12 @@ public class KeyInfoReferenceTest extend
private static final String BASEDIR = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private DocumentBuilder documentBuilder;
-
private final String idControl = "abc123";
private final String uriControl = "http://www.example.org/keyinfo.xml";
- public KeyInfoReferenceTest() throws Exception {
- documentBuilder = XMLUtils.createDocumentBuilder(false);
- }
-
@org.junit.Test
public void testSchema() throws Exception {
- KeyInfoReference keyInfoReference = new KeyInfoReference(documentBuilder.newDocument(), uriControl);
+ KeyInfoReference keyInfoReference = new KeyInfoReference(XMLUtils.newDocument(), uriControl);
Element element = keyInfoReference.getElement();
assertEquals("http://www.w3.org/2009/xmldsig11#", element.getNamespaceURI());
@@ -66,13 +58,13 @@ public class KeyInfoReferenceTest extend
@org.junit.Test
public void testURIOnConstruction() throws Exception {
- KeyInfoReference keyInfoReference = new KeyInfoReference(documentBuilder.newDocument(), uriControl);
+ KeyInfoReference keyInfoReference = new KeyInfoReference(XMLUtils.newDocument(), uriControl);
assertEquals(uriControl, keyInfoReference.getURI());
}
@org.junit.Test
public void testId() throws Exception {
- KeyInfoReference keyInfoReference = new KeyInfoReference(documentBuilder.newDocument(), uriControl);
+ KeyInfoReference keyInfoReference = new KeyInfoReference(XMLUtils.newDocument(), uriControl);
assertEquals("", keyInfoReference.getId());
assertNull(keyInfoReference.getElement().getAttributeNodeNS(null, Constants._ATT_ID));
@@ -95,7 +87,7 @@ public class KeyInfoReferenceTest extend
}
private Document loadXML(String fileName) throws Exception {
- return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
+ return XMLUtils.read(new FileInputStream(getControlFilePath(fileName)), false);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java Wed Aug 29 13:48:41 2018
@@ -45,7 +45,7 @@ public class XMLX509CertificateTest {
SEP + "signature-x509-crt.xml");
FileInputStream fis = new FileInputStream(f);
- Document doc = XMLUtils.createDocumentBuilder(false).parse(fis);
+ Document doc = XMLUtils.read(fis, false);
NodeList nl = doc.getElementsByTagNameNS
(Constants.SignatureSpecNS, "X509Certificate");
XMLX509Certificate xmlCert =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509DigestTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509DigestTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509DigestTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509DigestTest.java Wed Aug 29 13:48:41 2018
@@ -22,8 +22,6 @@ import java.io.FileInputStream;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.Init;
import org.apache.xml.security.keys.content.x509.XMLX509Digest;
import org.apache.xml.security.utils.Constants;
@@ -38,8 +36,6 @@ public class XMLX509DigestTest extends A
private static final String BASEDIR = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private DocumentBuilder documentBuilder;
-
private X509Certificate certControl;
private final String algorithmURIControl = "http://www.w3.org/2001/04/xmlenc#sha256";
@@ -48,8 +44,6 @@ public class XMLX509DigestTest extends A
private final byte[] digestControl;
public XMLX509DigestTest() throws Exception {
- documentBuilder = XMLUtils.createDocumentBuilder(false);
-
certControl = loadCertificate("cert-X509Digest.crt");
digestControl = XMLUtils.decode(digestBase64Control);
@@ -61,7 +55,7 @@ public class XMLX509DigestTest extends A
@org.junit.Test
public void testSchema() throws Exception {
- XMLX509Digest x509Digest = new XMLX509Digest(documentBuilder.newDocument(), digestControl, algorithmURIControl);
+ XMLX509Digest x509Digest = new XMLX509Digest(XMLUtils.newDocument(), digestControl, algorithmURIControl);
Element element = x509Digest.getElement();
assertEquals("http://www.w3.org/2009/xmldsig11#", element.getNamespaceURI());
@@ -81,14 +75,14 @@ public class XMLX509DigestTest extends A
@org.junit.Test
public void testDigestOnConstructionWithCert() throws Exception {
- XMLX509Digest x509Digest = new XMLX509Digest(documentBuilder.newDocument(), certControl, algorithmURIControl);
+ XMLX509Digest x509Digest = new XMLX509Digest(XMLUtils.newDocument(), certControl, algorithmURIControl);
assertEquals(algorithmURIControl, x509Digest.getAlgorithm());
assertArrayEquals(digestControl, x509Digest.getDigestBytes());
}
@org.junit.Test
public void testDigestOnConstructionWithBytes() throws Exception {
- XMLX509Digest x509Digest = new XMLX509Digest(documentBuilder.newDocument(), digestControl, algorithmURIControl);
+ XMLX509Digest x509Digest = new XMLX509Digest(XMLUtils.newDocument(), digestControl, algorithmURIControl);
assertEquals(algorithmURIControl, x509Digest.getAlgorithm());
assertArrayEquals(digestControl, x509Digest.getDigestBytes());
}
@@ -109,7 +103,7 @@ public class XMLX509DigestTest extends A
}
private Document loadXML(String fileName) throws Exception {
- return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
+ return XMLUtils.read(new FileInputStream(getControlFilePath(fileName)), false);
}
private X509Certificate loadCertificate(String fileName) throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java Wed Aug 29 13:48:41 2018
@@ -33,7 +33,7 @@ public class XMLX509IssuerSerialTest {
private Document doc;
public XMLX509IssuerSerialTest() throws Exception {
- doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ doc = XMLUtils.newDocument();
}
@org.junit.Test
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyInfoReferenceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyInfoReferenceResolverTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyInfoReferenceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyInfoReferenceResolverTest.java Wed Aug 29 13:48:41 2018
@@ -25,8 +25,6 @@ import java.security.cert.CertificateFac
import java.security.cert.X509Certificate;
import java.security.spec.X509EncodedKeySpec;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.Init;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.utils.Constants;
@@ -42,11 +40,7 @@ public class KeyInfoReferenceResolverTes
private static final String BASEDIR = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private DocumentBuilder documentBuilder;
-
public KeyInfoReferenceResolverTest() throws Exception {
- documentBuilder = XMLUtils.createDocumentBuilder(false);
-
if (!Init.isInitialized()) {
Init.init();
}
@@ -137,7 +131,7 @@ public class KeyInfoReferenceResolverTes
}
private Document loadXML(String fileName) throws Exception {
- return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
+ return XMLUtils.read(new FileInputStream(getControlFilePath(fileName)), false);
}
private PublicKey loadPublicKey(String filePath, String algorithm) throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java Wed Aug 29 13:48:41 2018
@@ -37,7 +37,6 @@ import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import org.apache.xml.security.algorithms.JCEMapper;
import org.apache.xml.security.encryption.EncryptedData;
@@ -107,8 +106,7 @@ public class KeyResolverTest {
KeyResolverSpi privateKeyResolver = new PrivateKeyResolver(ks, pwd);
KeyResolverSpi secretKeyResolver = new SecretKeyResolver(ks, pwd);
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
KeyInfo ki;
X509Data x509data;
@@ -218,7 +216,7 @@ public class KeyResolverTest {
}
// Create a sample XML document
- Document document = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document document = XMLUtils.newDocument();
Element rootElement = document.createElement("root");
document.appendChild(rootElement);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java Wed Aug 29 13:48:41 2018
@@ -21,8 +21,6 @@ package org.apache.xml.security.test.dom
import java.io.FileInputStream;
import java.security.Security;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.utils.XMLUtils;
@@ -52,8 +50,7 @@ public class RetrievalMethodResolverTest
fis = new FileInputStream(filename);
}
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(fis);
+ Document doc = XMLUtils.read(fis, false);
KeyInfo keyInfo = new KeyInfo(doc.getDocumentElement(), null);
@@ -72,8 +69,7 @@ public class RetrievalMethodResolverTest
fis = new FileInputStream(filename);
}
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(fis);
+ Document doc = XMLUtils.read(fis, false);
KeyInfo keyInfo = new KeyInfo(doc.getDocumentElement(), null);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/X509DigestResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/X509DigestResolverTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/X509DigestResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/X509DigestResolverTest.java Wed Aug 29 13:48:41 2018
@@ -22,8 +22,6 @@ import java.io.FileInputStream;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.Init;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.keys.storage.StorageResolver;
@@ -38,15 +36,11 @@ public class X509DigestResolverTest exte
private static final String BASEDIR = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private DocumentBuilder documentBuilder;
-
private X509Certificate certControl;
private StorageResolver storageResolver;
public X509DigestResolverTest() throws Exception {
- documentBuilder = XMLUtils.createDocumentBuilder(false);
-
certControl = loadCertificate("cert-X509Digest.crt");
storageResolver = new StorageResolver(new SingleCertificateResolver(certControl));
@@ -83,7 +77,7 @@ public class X509DigestResolverTest exte
}
private Document loadXML(String fileName) throws Exception {
- return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
+ return XMLUtils.read(new FileInputStream(getControlFilePath(fileName)), false);
}
private X509Certificate loadCertificate(String fileName) throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java Wed Aug 29 13:48:41 2018
@@ -21,6 +21,7 @@ package org.apache.xml.security.test.dom
import static org.junit.Assert.*;
import java.io.File;
+import java.io.FileInputStream;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
@@ -73,8 +74,7 @@ public class ForbiddenAlgorithmTest exte
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
- org.w3c.dom.Document doc = db.parse(f);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java Wed Aug 29 13:48:41 2018
@@ -21,6 +21,7 @@ package org.apache.xml.security.test.dom
import static org.junit.Assert.*;
import java.io.File;
+import java.io.FileInputStream;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.Manifest;
@@ -71,8 +72,7 @@ public class ForbiddenRefCountTest exten
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- org.w3c.dom.Document doc = db.parse(f);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false);
Element manifestElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java Wed Aug 29 13:48:41 2018
@@ -21,6 +21,7 @@ package org.apache.xml.security.test.dom
import static org.junit.Assert.*;
import java.io.File;
+import java.io.FileInputStream;
import org.apache.xml.security.signature.Manifest;
import org.apache.xml.security.signature.MissingResourceFailureException;
@@ -71,9 +72,7 @@ public class ForbiddenReferenceTest exte
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- org.w3c.dom.Document doc = db.parse(f);
- XMLUtils.repoolDocumentBuilder(db);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false);
Element manifestElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java Wed Aug 29 13:48:41 2018
@@ -22,8 +22,6 @@ import static org.junit.Assert.assertNul
import java.io.FileInputStream;
-import javax.xml.parsers.DocumentBuilder;
-
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
@@ -52,8 +50,7 @@ public class ForbiddenRetrievalMethodTes
fis = new FileInputStream(filename);
}
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(fis);
+ Document doc = XMLUtils.read(fis, false);
KeyInfo keyInfo = new KeyInfo(doc.getDocumentElement(), null);
keyInfo.setSecureValidation(true);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java Wed Aug 29 13:48:41 2018
@@ -21,6 +21,7 @@ package org.apache.xml.security.test.dom
import static org.junit.Assert.*;
import java.io.File;
+import java.io.FileInputStream;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
@@ -76,8 +77,7 @@ public class WrappingAttackTest extends
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
- org.w3c.dom.Document doc = db.parse(f);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
@@ -96,8 +96,7 @@ public class WrappingAttackTest extends
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
- org.w3c.dom.Document doc = db.parse(f);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java Wed Aug 29 13:48:41 2018
@@ -65,10 +65,8 @@ public class CreateSignatureTest {
private static final String SEP = System.getProperty("file.separator");
private KeyPair kp;
- private javax.xml.parsers.DocumentBuilder db;
public CreateSignatureTest() throws Exception {
- db = XMLUtils.createDocumentBuilder(false);
org.apache.xml.security.Init.init();
kp = KeyPairGenerator.getInstance("RSA").genKeyPair();
}
@@ -79,7 +77,7 @@ public class CreateSignatureTest {
*/
@org.junit.Test
public void testEmptyNodeSet() throws Exception {
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
Element envelope = doc.createElementNS("http://www.usps.gov/", "Envelope");
envelope.appendChild(doc.createTextNode("\n"));
doc.appendChild(envelope);
@@ -154,7 +152,7 @@ public class CreateSignatureTest {
@org.junit.Test
public void testXFilter2Signature() throws Exception {
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -197,7 +195,7 @@ public class CreateSignatureTest {
// Now Verify
try (InputStream is = new ByteArrayInputStream(signedDoc.getBytes())) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
XPathFactory xpf = XPathFactory.newInstance();
@@ -218,7 +216,7 @@ public class CreateSignatureTest {
Document doc = null;
try (InputStream is = new ByteArrayInputStream(signedXML.getBytes())) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
XPathFactory xpf = XPathFactory.newInstance();
@@ -257,7 +255,7 @@ public class CreateSignatureTest {
@org.junit.Test
public void testSHA256Digest() throws Exception {
PrivateKey privateKey = kp.getPrivate();
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -295,7 +293,7 @@ public class CreateSignatureTest {
private String doSign() throws Exception {
PrivateKey privateKey = kp.getPrivate();
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -340,7 +338,7 @@ public class CreateSignatureTest {
}
ks.load(fis, "changeit".toCharArray());
PrivateKey privateKey = (PrivateKey) ks.getKey("mullan", "changeit".toCharArray());
- Document doc = db.newDocument();
+ Document doc = XMLUtils.newDocument();
X509Certificate signingCert = (X509Certificate) ks.getCertificate("mullan");
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -379,7 +377,7 @@ public class CreateSignatureTest {
private void doVerify(String signedXML) throws Exception {
Document doc = null;
try (InputStream is = new ByteArrayInputStream(signedXML.getBytes())) {
- doc = db.parse(is);
+ doc = XMLUtils.read(is, false);
}
XPathFactory xpf = XPathFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java Wed Aug 29 13:48:41 2018
@@ -57,14 +57,11 @@ public class ECDSASignatureTest {
private KeyStore keyStore;
- private javax.xml.parsers.DocumentBuilder db;
-
public ECDSASignatureTest() throws Exception {
//String id = "http://apache.org/xml/properties/dom/document-class-name";
//dbf.setAttribute(id, IndexedDocument.class.getName());
- db = XMLUtils.createDocumentBuilder(false);
org.apache.xml.security.Init.init();
}
@@ -107,7 +104,7 @@ public class ECDSASignatureTest {
private byte[] doSign() throws Exception {
PrivateKey privateKey =
(PrivateKey)keyStore.getKey("ECDSA", ECDSA_JKS_PASSWORD.toCharArray());
- org.w3c.dom.Document doc = db.newDocument();
+ org.w3c.dom.Document doc = XMLUtils.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -149,7 +146,7 @@ public class ECDSASignatureTest {
}
private void doVerify(InputStream is) throws Exception {
- org.w3c.dom.Document doc = this.db.parse(is);
+ org.w3c.dom.Document doc = XMLUtils.read(is, false);
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java Wed Aug 29 13:48:41 2018
@@ -21,6 +21,7 @@ package org.apache.xml.security.test.dom
import static org.junit.Assert.fail;
import java.io.File;
+import java.io.FileInputStream;
import java.nio.charset.StandardCharsets;
import javax.crypto.SecretKey;
@@ -76,7 +77,7 @@ public class HMACOutputLengthTest {
@org.junit.Test
public void test_generate_hmac_sha1_40() throws Exception {
- Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
+ Document doc = XMLUtils.newDocument();
XMLSignature sig =
new XMLSignature(
doc, null, XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
@@ -98,7 +99,7 @@ public class HMACOutputLengthTest {
new File(BASEDIR + SEP + "src/test/resources" + SEP + "javax" + SEP + "xml"
+ SEP + "crypto" + SEP + "dsig" + SEP, data);
- Document doc = XMLUtils.createDocumentBuilder(false).parse(file);
+ Document doc = XMLUtils.read(new FileInputStream(file), false);
NodeList nl =
doc.getElementsByTagNameNS(Constants.SignatureSpecNS, "Signature");
if (nl.getLength() == 0) {