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/06/06 15:05:50 UTC
svn commit: r1833034 [3/6] - in /santuario/xml-security-java/trunk: ./
src/main/java/org/apache/jcp/xml/dsig/internal/dom/
src/main/java/org/apache/xml/security/
src/main/java/org/apache/xml/security/c14n/
src/main/java/org/apache/xml/security/encrypti...
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -25,6 +25,8 @@ 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;
@@ -40,7 +42,11 @@ 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();
}
@@ -131,7 +137,7 @@ public class KeyInfoReferenceResolverTes
}
private Document loadXML(String fileName) throws Exception {
- return XMLUtils.parse(new FileInputStream(getControlFilePath(fileName)), false);
+ return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
}
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -37,6 +37,7 @@ 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;
@@ -106,7 +107,8 @@ public class KeyResolverTest {
KeyResolverSpi privateKeyResolver = new PrivateKeyResolver(ks, pwd);
KeyResolverSpi secretKeyResolver = new SecretKeyResolver(ks, pwd);
- Document doc = XMLUtils.newDocument(false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.newDocument();
KeyInfo ki;
X509Data x509data;
@@ -216,7 +218,7 @@ public class KeyResolverTest {
}
// Create a sample XML document
- Document document = XMLUtils.newDocument(false);
+ Document document = XMLUtils.createDocumentBuilder(false).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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -21,6 +21,8 @@ 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;
@@ -50,7 +52,8 @@ public class RetrievalMethodResolverTest
fis = new FileInputStream(filename);
}
- Document doc = XMLUtils.parse(fis, false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(fis);
KeyInfo keyInfo = new KeyInfo(doc.getDocumentElement(), null);
@@ -69,7 +72,8 @@ public class RetrievalMethodResolverTest
fis = new FileInputStream(filename);
}
- Document doc = XMLUtils.parse(fis, false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(fis);
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -22,6 +22,8 @@ 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;
@@ -36,11 +38,15 @@ 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));
@@ -77,7 +83,7 @@ public class X509DigestResolverTest exte
}
private Document loadXML(String fileName) throws Exception {
- return XMLUtils.parse(new FileInputStream(getControlFilePath(fileName)), false);
+ return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
}
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -21,7 +21,6 @@ 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;
@@ -74,7 +73,8 @@ public class ForbiddenAlgorithmTest exte
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.parse(new FileInputStream(f), false, false);
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
+ org.w3c.dom.Document doc = db.parse(f);
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -21,7 +21,6 @@ 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;
@@ -72,7 +71,8 @@ public class ForbiddenRefCountTest exten
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.parse(new FileInputStream(f), false);
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ org.w3c.dom.Document doc = db.parse(f);
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -21,7 +21,6 @@ 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;
@@ -72,7 +71,8 @@ public class ForbiddenReferenceTest exte
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.parse(new FileInputStream(f), false);
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ org.w3c.dom.Document doc = db.parse(f);
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -22,6 +22,8 @@ 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;
@@ -50,7 +52,8 @@ public class ForbiddenRetrievalMethodTes
fis = new FileInputStream(filename);
}
- Document doc = XMLUtils.parse(fis, false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(fis);
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -21,7 +21,6 @@ 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;
@@ -77,7 +76,8 @@ public class WrappingAttackTest extends
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.parse(new FileInputStream(f), false, false);
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
+ org.w3c.dom.Document doc = db.parse(f);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
@@ -96,7 +96,8 @@ public class WrappingAttackTest extends
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.parse(new FileInputStream(f), false, false);
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false, false);
+ org.w3c.dom.Document doc = db.parse(f);
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -65,8 +65,10 @@ 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();
}
@@ -77,7 +79,7 @@ public class CreateSignatureTest {
*/
@org.junit.Test
public void testEmptyNodeSet() throws Exception {
- Document doc = XMLUtils.newDocument(false);
+ Document doc = db.newDocument();
Element envelope = doc.createElementNS("http://www.usps.gov/", "Envelope");
envelope.appendChild(doc.createTextNode("\n"));
doc.appendChild(envelope);
@@ -152,7 +154,7 @@ public class CreateSignatureTest {
@org.junit.Test
public void testXFilter2Signature() throws Exception {
- Document doc = XMLUtils.newDocument(false);
+ Document doc = db.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -195,7 +197,7 @@ public class CreateSignatureTest {
// Now Verify
try (InputStream is = new ByteArrayInputStream(signedDoc.getBytes())) {
- doc = XMLUtils.parse(is, false);
+ doc = db.parse(is);
}
XPathFactory xpf = XPathFactory.newInstance();
@@ -216,7 +218,7 @@ public class CreateSignatureTest {
Document doc = null;
try (InputStream is = new ByteArrayInputStream(signedXML.getBytes())) {
- doc = XMLUtils.parse(is, false);
+ doc = db.parse(is);
}
XPathFactory xpf = XPathFactory.newInstance();
@@ -255,7 +257,7 @@ public class CreateSignatureTest {
@org.junit.Test
public void testSHA256Digest() throws Exception {
PrivateKey privateKey = kp.getPrivate();
- Document doc = XMLUtils.newDocument(false);
+ Document doc = db.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -293,7 +295,7 @@ public class CreateSignatureTest {
private String doSign() throws Exception {
PrivateKey privateKey = kp.getPrivate();
- Document doc = XMLUtils.newDocument(false);
+ Document doc = db.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -338,7 +340,7 @@ public class CreateSignatureTest {
}
ks.load(fis, "changeit".toCharArray());
PrivateKey privateKey = (PrivateKey) ks.getKey("mullan", "changeit".toCharArray());
- Document doc = XMLUtils.newDocument(false);
+ Document doc = db.newDocument();
X509Certificate signingCert = (X509Certificate) ks.getCertificate("mullan");
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -377,7 +379,7 @@ public class CreateSignatureTest {
private void doVerify(String signedXML) throws Exception {
Document doc = null;
try (InputStream is = new ByteArrayInputStream(signedXML.getBytes())) {
- doc = XMLUtils.parse(is, false);
+ doc = db.parse(is);
}
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -57,10 +57,14 @@ 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();
}
@@ -103,7 +107,7 @@ public class ECDSASignatureTest {
private byte[] doSign() throws Exception {
PrivateKey privateKey =
(PrivateKey)keyStore.getKey("ECDSA", ECDSA_JKS_PASSWORD.toCharArray());
- org.w3c.dom.Document doc = XMLUtils.newDocument(false);
+ org.w3c.dom.Document doc = db.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -145,7 +149,7 @@ public class ECDSASignatureTest {
}
private void doVerify(InputStream is) throws Exception {
- org.w3c.dom.Document doc = XMLUtils.parse(is, false);
+ org.w3c.dom.Document doc = this.db.parse(is);
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -21,7 +21,6 @@ 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;
@@ -77,7 +76,7 @@ public class HMACOutputLengthTest {
@org.junit.Test
public void test_generate_hmac_sha1_40() throws Exception {
- Document doc = XMLUtils.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
XMLSignature sig =
new XMLSignature(
doc, null, XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
@@ -99,7 +98,7 @@ public class HMACOutputLengthTest {
new File(BASEDIR + SEP + "src/test/resources" + SEP + "javax" + SEP + "xml"
+ SEP + "crypto" + SEP + "dsig" + SEP, data);
- Document doc = XMLUtils.parse(new FileInputStream(file), false);
+ Document doc = XMLUtils.createDocumentBuilder(false).parse(file);
NodeList nl =
doc.getElementsByTagNameNS(Constants.SignatureSpecNS, "Signature");
if (nl.getLength() == 0) {
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 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.parse(is, false);
+ Document e = XMLUtils.createDocumentBuilder(false).parse(is);
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -24,6 +24,8 @@ 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;
@@ -39,10 +41,16 @@ 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;
@@ -53,7 +61,7 @@ public class KeyValueTest {
} else {
f = new File(filename);
}
- Document doc = XMLUtils.parse(new FileInputStream(f), false);
+ Document doc = db.parse(new FileInputStream(f));
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -23,6 +23,8 @@ 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;
@@ -41,6 +43,12 @@ 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;
@@ -51,7 +59,7 @@ public class NoKeyInfoTest {
} else {
f = new File(filename);
}
- Document doc = XMLUtils.parse(new FileInputStream(f), false);
+ Document doc = db.parse(new FileInputStream(f));
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -139,7 +139,8 @@ public class PreCalculatedDigestSignatur
}
private XMLSignature createXmlSignature() throws ParserConfigurationException, XMLSecurityException {
- Document signatureDocument = XMLUtils.newDocument(false);
+ DocumentBuilder documentBuilder = createDocumentBuilder();
+ Document signatureDocument = documentBuilder.newDocument();
Element root = createSignatureRoot(signatureDocument);
String baseURI = "";
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -24,6 +24,7 @@ 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;
@@ -62,8 +63,9 @@ 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 = XMLUtils.parse(new FileInputStream(f), false);
+ Document doc = db.parse(new FileInputStream(f));
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -28,6 +28,7 @@ import java.security.PublicKey;
import java.util.Enumeration;
import javax.xml.crypto.dsig.DigestMethod;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
@@ -95,7 +96,8 @@ public class SignatureReferenceTest {
// See SANTUARIO-465
@org.junit.Test
public void testNoReferenceChildren() throws ParserConfigurationException, XMLSecurityException {
- Document doc = XMLUtils.newDocument(true, false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(true);
+ Document doc = db.newDocument();
Element referenceElement = doc.createElementNS(Constants.SignatureSpecNS, "Reference");
referenceElement.setAttributeNS(null, "URI", "#_12345");
@@ -166,7 +168,8 @@ public class SignatureReferenceTest {
}
private Document getOriginalDocument() throws Throwable {
- Document doc = XMLUtils.newDocument(false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -28,6 +28,8 @@ 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;
@@ -171,7 +173,8 @@ public class SignatureTest {
}
private Document getOriginalDocument() throws Throwable {
- Document doc = XMLUtils.newDocument(false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -30,6 +30,7 @@ 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;
@@ -166,7 +167,9 @@ public class UnknownAlgoSignatureTest {
public static Document getDocument(File file)
throws ParserConfigurationException, SAXException, IOException {
- return XMLUtils.parse(new FileInputStream(file), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new FileInputStream(file));
+ return doc;
}
}
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -44,7 +44,8 @@ public class X509DataTest {
public void testAddX509SubjectName() throws Exception {
Init.init();
- Document doc = XMLUtils.newDocument(false);
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.newDocument();
XMLSignature sig = new XMLSignature(doc, "", XMLSignature.ALGO_ID_SIGNATURE_DSA);
doc.appendChild(sig.getElement());
@@ -74,9 +75,10 @@ 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 = XMLUtils.parse(is, false);
+ doc = db.parse(is);
}
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -26,6 +26,7 @@ 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;
@@ -70,7 +71,8 @@ public class XmlSecTest {
private void checkXmlSignatureSoftwareStack(boolean cert) throws Exception {
Init.init();
- Document testDocument = XMLUtils.newDocument(false);
+ DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(false);
+ Document testDocument = documentBuilder.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/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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -23,6 +23,7 @@ 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;
@@ -109,10 +110,13 @@ 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 = XMLUtils.parse(is, false, true, true);
+ doc = db.parse(is);
}
//XMLUtils.circumventBug2650(doc);
@@ -141,7 +145,8 @@ public class TransformBase64DecodeTest {
}
private static Document createDocument() throws ParserConfigurationException {
- Document doc = XMLUtils.newDocument(false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -88,7 +88,7 @@ public class TransformXSLTTest {
private static Document getDocument(File file)
throws ParserConfigurationException, SAXException, IOException {
- return XMLUtils.parse(new FileInputStream(file), false);
+ return XMLUtils.createDocumentBuilder(false).parse(new FileInputStream(file));
}
}
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -129,9 +129,10 @@ 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 = XMLUtils.parse(is, false);
+ doc = db.parse(is);
}
Element sigElement =
(Element) doc.getElementsByTagNameNS(
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -49,7 +49,7 @@ public class ResolverDirectHTTPTest exte
@Test
public void testBug40783() throws Exception {
- Document doc = XMLUtils.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).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.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).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.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).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.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).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.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).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.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 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.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).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.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -283,7 +283,7 @@ public class Canonicalizer11Test {
// dfactory.setNamespaceAware(true);
//
// DocumentBuilder db = dfactory.newDocumentBuilder();
-// Document doc = XMLUtils.newDocument(false);
+// Document doc = db.newDocument();
//
// xpath = XMLUtils.createElementInSignatureSpace(doc, Constants._TAG_XPATH);
//
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -233,7 +233,7 @@ public class Canonicalizer20010315Exclus
*/
@org.junit.Test
public void test24Aexcl() throws Exception {
- Document doc = XMLUtils.newDocument(false);
+ Document doc = XMLUtils.createDocumentBuilder(false).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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -318,7 +318,7 @@ public class Canonicalizer20010315Test {
// dfactory.setNamespaceAware(true);
//
// DocumentBuilder db = dfactory.newDocumentBuilder();
-// Document doc = XMLUtils.newDocument(false);
+// Document doc = db.newDocument();
//
// xpath = XMLUtils.createElementInSignatureSpace(doc, Constants._TAG_XPATH);
//
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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -30,6 +30,7 @@ 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;
@@ -81,7 +82,8 @@ public class ExclusiveC14NInteropTest {
// Read in plaintext document
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream("interop/c14n/Y1/exc-signature.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
Key publicKey = getPublicKey();
@@ -105,7 +107,7 @@ public class ExclusiveC14NInteropTest {
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), 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=1833034&r1=1833033&r2=1833034&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 Jun 6 15:05:49 2018
@@ -31,6 +31,7 @@ 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;
@@ -85,7 +86,8 @@ public class BaltimoreEncTest {
}
File f = new File(filename);
- Document doc = XMLUtils.parse(new java.io.FileInputStream(f), false);
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+ Document doc = db.parse(new java.io.FileInputStream(f));
cardNumber = retrieveCCNumber(doc);
@@ -112,7 +114,8 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-tripledes-cbc.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes(StandardCharsets.US_ASCII);
@@ -138,7 +141,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -149,7 +152,8 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-aes256-cbc-prop.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwxyz012345".getBytes(StandardCharsets.US_ASCII);
@@ -175,7 +179,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -186,7 +190,8 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-aes128-cbc-kw-aes192.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes(StandardCharsets.US_ASCII);
@@ -212,7 +217,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -223,7 +228,8 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-element-tripledes-cbc-kw-aes128.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnop".getBytes(StandardCharsets.US_ASCII);
@@ -249,7 +255,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -260,7 +266,8 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-element-aes128-cbc-rsa-1_5.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -282,7 +289,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
@@ -293,7 +300,8 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes128-cbc.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnop".getBytes(StandardCharsets.US_ASCII);
@@ -319,7 +327,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -328,7 +336,8 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes256-cbc-kw-tripledes.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes(StandardCharsets.US_ASCII);
@@ -354,7 +363,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -363,7 +372,8 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes192-cbc-kw-aes256.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwxyz012345".getBytes(StandardCharsets.US_ASCII);
@@ -389,7 +399,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
@Test
@@ -398,7 +408,8 @@ public class BaltimoreEncTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-tripledes-cbc-rsa-oaep-mgf1p.xml");
- Document document = XMLUtils.parse(sourceDocument, false);
+ DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
+ Document document = builder.parse(sourceDocument);
// XMLUtils.outputDOM(document, System.out);
@@ -420,7 +431,7 @@ public class BaltimoreEncTest {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
/*