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/05 11:54:02 UTC
svn commit: r1832932 [6/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/stax/signature/SignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java Tue Jun 5 11:54:00 2018
@@ -102,7 +102,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
//first child element must be the dsig:Signature @see SANTUARIO-324:
@@ -160,7 +160,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Check Signature bytes
@@ -261,7 +261,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
//first child element must be the dsig:Signature @see SANTUARIO-324:
@@ -325,7 +325,7 @@ public class SignatureCreationTest exten
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
//first child element must be the dsig:Signature @see SANTUARIO-324:
@@ -415,7 +415,7 @@ public class SignatureCreationTest exten
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
//find first child element:
@@ -505,7 +505,7 @@ public class SignatureCreationTest exten
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -554,7 +554,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -610,7 +610,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -674,7 +674,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -722,7 +722,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -782,7 +782,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -843,7 +843,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -890,7 +890,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -938,7 +938,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getLocalPart());
@@ -1006,7 +1006,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getLocalPart());
@@ -1073,7 +1073,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -1121,7 +1121,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces.getNamespaceURI(), XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces.getLocalPart());
@@ -1172,7 +1172,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -1227,7 +1227,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -1273,7 +1273,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -1319,7 +1319,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -1369,7 +1369,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -1417,7 +1417,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -1465,7 +1465,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -1513,7 +1513,7 @@ public class SignatureCreationTest exten
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
@@ -1564,7 +1564,7 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
assertEquals(1, nodeList.getLength());
@@ -1619,7 +1619,7 @@ public class SignatureCreationTest exten
//System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java Tue Jun 5 11:54:00 2018
@@ -126,7 +126,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -181,7 +181,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -236,7 +236,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -291,7 +291,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -346,7 +346,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -403,7 +403,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -460,7 +460,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -517,7 +517,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -574,7 +574,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -631,7 +631,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
@@ -688,7 +688,7 @@ public class SignatureDigestCreationTest
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java Tue Jun 5 11:54:00 2018
@@ -27,7 +27,6 @@ import java.security.cert.X509Certificat
import java.util.ArrayList;
import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -71,8 +70,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -114,7 +112,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -123,8 +121,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -166,7 +163,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -175,8 +172,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -218,7 +214,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -227,8 +223,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -270,7 +265,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -279,8 +274,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -322,7 +316,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -333,8 +327,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -376,7 +369,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -387,8 +380,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -430,7 +422,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -441,8 +433,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -484,7 +475,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -495,8 +486,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -538,7 +528,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -549,8 +539,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -592,7 +581,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -603,8 +592,7 @@ public class SignatureDigestVerification
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -646,7 +634,7 @@ public class SignatureDigestVerification
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java Tue Jun 5 11:54:00 2018
@@ -101,7 +101,7 @@ public class SignatureEncryptionTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Decrypt using DOM API
@@ -170,7 +170,7 @@ public class SignatureEncryptionTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Decrypt using DOM API
@@ -247,7 +247,7 @@ public class SignatureEncryptionTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Decrypt using DOM API
@@ -324,7 +324,7 @@ public class SignatureEncryptionTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Decrypt using DOM API
@@ -401,7 +401,7 @@ public class SignatureEncryptionTest ext
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -503,7 +503,7 @@ public class SignatureEncryptionTest ext
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, testSecurityEventListener);
- Document document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ Document document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// javax.xml.transform.Transformer transformer = TransformerFactory.newInstance().newTransformer();
// transformer.transform(new DOMSource(document), new StreamResult(System.out));
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java Tue Jun 5 11:54:00 2018
@@ -117,7 +117,7 @@ public class SignatureHMACCreationTest e
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -162,7 +162,7 @@ public class SignatureHMACCreationTest e
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -207,7 +207,7 @@ public class SignatureHMACCreationTest e
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -252,7 +252,7 @@ public class SignatureHMACCreationTest e
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -297,7 +297,7 @@ public class SignatureHMACCreationTest e
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
@@ -344,7 +344,7 @@ public class SignatureHMACCreationTest e
// System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.parse(is, false);
}
// Verify using DOM
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java Tue Jun 5 11:54:00 2018
@@ -30,7 +30,6 @@ import java.util.List;
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;
@@ -99,8 +98,7 @@ public class SignatureHMACVerificationTe
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.parse(sourceDocument, false);
// Set the key up
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -136,7 +134,7 @@ public class SignatureHMACVerificationTe
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -145,8 +143,7 @@ public class SignatureHMACVerificationTe
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.parse(sourceDocument, false);
// Set the key up
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -182,7 +179,7 @@ public class SignatureHMACVerificationTe
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -191,8 +188,7 @@ public class SignatureHMACVerificationTe
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.parse(sourceDocument, false);
// Set the key up
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -228,7 +224,7 @@ public class SignatureHMACVerificationTe
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -237,8 +233,7 @@ public class SignatureHMACVerificationTe
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.parse(sourceDocument, false);
// Set the key up
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -274,7 +269,7 @@ public class SignatureHMACVerificationTe
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -283,8 +278,7 @@ public class SignatureHMACVerificationTe
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.parse(sourceDocument, false);
// Set the key up
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -320,7 +314,7 @@ public class SignatureHMACVerificationTe
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -331,8 +325,7 @@ public class SignatureHMACVerificationTe
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.parse(sourceDocument, false);
// Set the key up
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -368,7 +361,7 @@ public class SignatureHMACVerificationTe
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java Tue Jun 5 11:54:00 2018
@@ -31,7 +31,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
@@ -65,8 +64,7 @@ public class SignatureVerificationRefere
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -122,7 +120,7 @@ public class SignatureVerificationRefere
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -134,8 +132,7 @@ public class SignatureVerificationRefere
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -192,7 +189,7 @@ public class SignatureVerificationRefere
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -216,8 +213,7 @@ public class SignatureVerificationRefere
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -270,7 +266,7 @@ public class SignatureVerificationRefere
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -283,8 +279,7 @@ public class SignatureVerificationRefere
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -348,7 +343,7 @@ public class SignatureVerificationRefere
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -357,8 +352,7 @@ public class SignatureVerificationRefere
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -422,7 +416,7 @@ public class SignatureVerificationRefere
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -431,8 +425,7 @@ public class SignatureVerificationRefere
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -488,6 +481,6 @@ public class SignatureVerificationRefere
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java Tue Jun 5 11:54:00 2018
@@ -33,7 +33,6 @@ import java.util.Map;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -91,8 +90,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -132,7 +130,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener);
@@ -170,8 +168,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -212,7 +209,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener);
@@ -256,8 +253,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -307,7 +303,7 @@ public class SignatureVerificationTest e
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} catch (XMLStreamException ex) {
Assert.assertEquals("Multiple signatures are not supported.", ex.getCause().getMessage());
}
@@ -319,8 +315,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -373,7 +368,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@@ -383,8 +378,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -422,7 +416,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener,
@@ -463,8 +457,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -504,7 +497,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a bad key");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -530,8 +523,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -572,7 +564,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener,
@@ -613,8 +605,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -655,7 +646,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener,
@@ -696,8 +687,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -738,7 +728,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener,
@@ -779,8 +769,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -821,7 +810,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener,
@@ -862,8 +851,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -909,7 +897,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener);
@@ -947,8 +935,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -992,7 +979,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener);
@@ -1038,8 +1025,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("JCEKS");
@@ -1083,7 +1069,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener);
@@ -1121,8 +1107,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1163,7 +1148,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSecurityEvents(securityEventListener);
@@ -1201,8 +1186,7 @@ public class SignatureVerificationTest e
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext-base64.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1243,7 +1227,7 @@ public class SignatureVerificationTest e
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
SignedElementSecurityEvent signedElementSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.SignedElement);
X509TokenSecurityEvent x509TokenSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.X509Token);
@@ -1275,8 +1259,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1319,7 +1302,7 @@ public class SignatureVerificationTest e
int oldval = 0;
try {
oldval = TestUtils.changeValueOfMaximumAllowedReferencesPerManifest(2);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Exception expected");
} catch (XMLStreamException e) {
assertTrue(e.getCause() instanceof XMLSecurityException);
@@ -1337,8 +1320,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1379,7 +1361,7 @@ public class SignatureVerificationTest e
int oldval = 0;
try {
oldval = TestUtils.changeValueOfMaximumAllowedTransformsPerReference(0);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Exception expected");
} catch (XMLStreamException e) {
assertTrue(e.getCause() instanceof XMLSecurityException);
@@ -1397,8 +1379,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1437,7 +1418,7 @@ public class SignatureVerificationTest e
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Exception expected");
} catch (XMLStreamException e) {
assertTrue(e.getCause() instanceof XMLSecurityException);
@@ -1460,8 +1441,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1501,7 +1481,7 @@ public class SignatureVerificationTest e
try {
TestUtils.switchAllowMD5Algorithm(true);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowMD5Algorithm(false);
}
@@ -1520,8 +1500,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1562,7 +1541,7 @@ public class SignatureVerificationTest e
int oldval = 0;
try {
oldval = TestUtils.changeValueOfMaximumAllowedXMLStructureDepth(5);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Exception expected");
} catch (XMLStreamException e) {
assertTrue(e.getCause() instanceof XMLSecurityException);
@@ -1591,8 +1570,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1633,7 +1611,7 @@ public class SignatureVerificationTest e
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -1642,8 +1620,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1687,7 +1664,7 @@ public class SignatureVerificationTest e
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a modified document");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getMessage().contains("Invalid digest of reference"));
@@ -1700,8 +1677,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1752,7 +1728,7 @@ public class SignatureVerificationTest e
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a modified document");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getMessage().contains("Invalid digest of reference"));
@@ -1765,8 +1741,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1823,7 +1798,7 @@ public class SignatureVerificationTest e
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a modified document");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getMessage().contains("Invalid digest of reference"));
@@ -1836,8 +1811,7 @@ public class SignatureVerificationTest e
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.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -1901,7 +1875,7 @@ public class SignatureVerificationTest e
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a modified document");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getMessage().contains("Invalid digest of reference"));
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java Tue Jun 5 11:54:00 2018
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -74,8 +73,7 @@ public class UnknownAlgoSignatureTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/temp/signature/signature-good.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -100,7 +98,7 @@ public class UnknownAlgoSignatureTest ex
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// XMLUtils.outputDOM(document, System.out);
}
@@ -111,8 +109,7 @@ public class UnknownAlgoSignatureTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/temp/signature/signature-bad-c14n-algo.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -141,7 +138,7 @@ public class UnknownAlgoSignatureTest ex
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a bad c14n algorithm");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -157,8 +154,7 @@ public class UnknownAlgoSignatureTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/temp/signature/signature-bad-sig-algo.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -187,7 +183,7 @@ public class UnknownAlgoSignatureTest ex
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a bad signature algorithm");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -204,8 +200,7 @@ public class UnknownAlgoSignatureTest ex
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/temp/signature/signature-bad-transform-algo.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyStore keyStore = KeyStore.getInstance("jks");
@@ -234,7 +229,7 @@ public class UnknownAlgoSignatureTest ex
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a bad transform algorithm");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/KeyLoader.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/KeyLoader.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/KeyLoader.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/KeyLoader.java Tue Jun 5 11:54:00 2018
@@ -18,8 +18,6 @@
*/
package org.apache.xml.security.test.stax.utils;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
import java.io.FileInputStream;
import java.security.KeyFactory;
import java.security.PublicKey;
@@ -34,16 +32,6 @@ public class KeyLoader {
private static final String BASEDIR = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
- private static DocumentBuilder documentBuilder;
-
- static {
- try {
- documentBuilder = XMLUtils.createDocumentBuilder(false);
- } catch (ParserConfigurationException e) {
- throw new RuntimeException(e);
- }
- }
-
private static String getControlFilePath(String fileName) {
return BASEDIR + SEP + "src" + SEP + "test" + SEP + "resources" +
SEP + "org" + SEP + "apache" + SEP + "xml" + SEP + "security" +
@@ -60,7 +48,7 @@ public class KeyLoader {
}
public static Document loadXML(String fileName) throws Exception {
- return documentBuilder.parse(new FileInputStream(getControlFilePath(fileName)));
+ return XMLUtils.parse(new FileInputStream(getControlFilePath(fileName)), false);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java?rev=1832932&r1=1832931&r2=1832932&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java Tue Jun 5 11:54:00 2018
@@ -20,7 +20,6 @@ package org.apache.xml.security.test.sta
import org.w3c.dom.*;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.Location;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -31,11 +30,10 @@ import javax.xml.stream.XMLStreamReader;
public class StAX2DOM {
static final String XML_NS = "http://www.w3.org/2000/xmlns/";
- public static Document readDoc(DocumentBuilder documentBuilder, XMLStreamReader xmlStreamReader) throws XMLStreamException {
+ public static Document readDoc(Document document, XMLStreamReader xmlStreamReader) throws XMLStreamException {
//skip possible text at the beginning of a document and go directly to the root tag
while (xmlStreamReader.hasNext() && xmlStreamReader.next() != XMLStreamConstants.START_ELEMENT) { //NOPMD
}
- Document document = documentBuilder.newDocument();
StAX2DOM.readDocElements(document, document, xmlStreamReader, false, false);
xmlStreamReader.close();
return document;