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 2013/09/13 16:59:07 UTC
svn commit: r1522958 [2/2] - in
/santuario/xml-security-java/trunk/src/test/java:
javax/xml/crypto/test/dsig/ javax/xml/crypto/test/dsig/keyinfo/
org/apache/xml/security/test/dom/
org/apache/xml/security/test/dom/algorithms/ org/apache/xml/security/tes...
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -36,7 +36,6 @@ import javax.crypto.NoSuchPaddingExcepti
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.xml.security.algorithms.JCEMapper;
import org.apache.xml.security.encryption.EncryptedData;
@@ -57,6 +56,7 @@ import org.apache.xml.security.keys.keyr
import org.apache.xml.security.keys.storage.StorageResolver;
import org.apache.xml.security.keys.storage.implementations.KeyStoreResolver;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
@@ -97,9 +97,7 @@ public class KeyResolverTest extends org
KeyResolverSpi privateKeyResolver = new PrivateKeyResolver(ks, pwd);
KeyResolverSpi secretKeyResolver = new SecretKeyResolver(ks, pwd);
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.newDocument();
KeyInfo ki;
@@ -210,9 +208,7 @@ public class KeyResolverTest extends org
}
// Create a sample XML document
- DocumentBuilderFactory fac = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = fac.newDocumentBuilder();
- Document document = builder.newDocument();
+ 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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -22,10 +22,10 @@ import java.io.FileInputStream;
import java.security.Security;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI;
import org.apache.xml.security.keys.KeyInfo;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
@@ -52,9 +52,7 @@ public class RetrievalMethodResolverTest
fis = new FileInputStream(filename);
}
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.parse(fis);
KeyInfo keyInfo = new KeyInfo(doc.getDocumentElement(), null);
@@ -74,9 +72,7 @@ public class RetrievalMethodResolverTest
fis = new FileInputStream(filename);
}
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
+ 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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -23,12 +23,12 @@ import java.security.cert.CertificateFac
import java.security.cert.X509Certificate;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.xml.security.Init;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.keys.storage.StorageResolver;
import org.apache.xml.security.keys.storage.implementations.SingleCertificateResolver;
+import org.apache.xml.security.utils.XMLUtils;
import org.junit.Assert;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -45,9 +45,7 @@ public class X509DigestResolverTest exte
private StorageResolver storageResolver;
public X509DigestResolverTest() throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- documentBuilder = dbf.newDocumentBuilder();
+ documentBuilder = XMLUtils.createDocumentBuilder(false);
certControl = loadCertificate("cert-X509Digest.crt");
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -24,6 +24,7 @@ import org.apache.xml.security.signature
import org.apache.xml.security.signature.XMLSignatureException;
import org.apache.xml.security.test.dom.interop.InteropTestBase;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
@@ -67,12 +68,8 @@ public class ForbiddenAlgorithmTest exte
}
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
-
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
org.w3c.dom.Document doc = db.parse(f);
Element sigElement =
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -24,6 +24,7 @@ import org.apache.xml.security.exception
import org.apache.xml.security.signature.Manifest;
import org.apache.xml.security.test.dom.interop.InteropTestBase;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
@@ -67,12 +68,8 @@ public class ForbiddenRefCountTest exten
}
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
-
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
org.w3c.dom.Document doc = db.parse(f);
Element manifestElement =
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -24,6 +24,7 @@ import org.apache.xml.security.signature
import org.apache.xml.security.signature.MissingResourceFailureException;
import org.apache.xml.security.test.dom.interop.InteropTestBase;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
@@ -67,12 +68,8 @@ public class ForbiddenReferenceTest exte
}
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
-
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
org.w3c.dom.Document doc = db.parse(f);
Element manifestElement =
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -21,9 +21,9 @@ package org.apache.xml.security.test.dom
import java.io.FileInputStream;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.xml.security.keys.KeyInfo;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
@@ -50,9 +50,7 @@ public class ForbiddenRetrievalMethodTes
fis = new FileInputStream(filename);
}
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
+ 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/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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -24,6 +24,7 @@ import org.apache.xml.security.signature
import org.apache.xml.security.signature.XMLSignatureException;
import org.apache.xml.security.test.dom.interop.InteropTestBase;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
@@ -72,12 +73,8 @@ public class WrappingAttackTest extends
}
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
-
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
org.w3c.dom.Document doc = db.parse(f);
Element sigElement =
@@ -96,12 +93,8 @@ public class WrappingAttackTest extends
}
File f = new File(directory + "/" + file);
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
-
- dbf.setNamespaceAware(true);
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
org.w3c.dom.Document doc = db.parse(f);
Element sigElement =
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -64,10 +64,7 @@ public class CreateSignatureTest extends
private javax.xml.parsers.DocumentBuilder db;
public CreateSignatureTest() throws Exception {
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- db = dbf.newDocumentBuilder();
+ db = XMLUtils.createDocumentBuilder(false);
org.apache.xml.security.Init.init();
kp = KeyPairGenerator.getInstance("RSA").genKeyPair();
}
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -51,9 +51,6 @@ import org.w3c.dom.Element;
*/
public class ECDSASignatureTest extends org.junit.Assert {
- private static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(ECDSASignatureTest.class);
-
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
private static final String ECDSA_JKS =
@@ -87,19 +84,10 @@ public class ECDSASignatureTest extends
}
}
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- log.info("dbf.isIgnoringComments() = " + dbf.isIgnoringComments());
- log.info(
- "dbf.isIgnoringElementContentWhitespace() = "
- + dbf.isIgnoringElementContentWhitespace()
- );
-
//String id = "http://apache.org/xml/properties/dom/document-class-name";
//dbf.setAttribute(id, IndexedDocument.class.getName());
- db = dbf.newDocumentBuilder();
+ db = XMLUtils.createDocumentBuilder(false);
org.apache.xml.security.Init.init();
}
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -19,17 +19,18 @@
package org.apache.xml.security.test.dom.signature;
import java.io.File;
+
import javax.crypto.SecretKey;
-import javax.xml.parsers.DocumentBuilderFactory;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-
import org.apache.xml.security.Init;
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
public class HMACOutputLengthTest extends org.junit.Assert {
@@ -37,17 +38,12 @@ public class HMACOutputLengthTest extend
org.slf4j.LoggerFactory.getLogger
(HMACOutputLengthTest.class);
- private static DocumentBuilderFactory dbf = null;
-
private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
public HMACOutputLengthTest() throws Exception {
Init.init();
- dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- dbf.setValidating(false);
}
@org.junit.Test
@@ -81,7 +77,7 @@ public class HMACOutputLengthTest extend
@org.junit.Test
public void test_generate_hmac_sha1_40() throws Exception {
- Document doc = dbf.newDocumentBuilder().newDocument();
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
XMLSignature sig =
new XMLSignature(
doc, null, XMLSignature.ALGO_ID_MAC_HMAC_SHA1,
@@ -105,7 +101,7 @@ public class HMACOutputLengthTest extend
new File(BASEDIR + SEP + "src/test/resources" + SEP + "javax" + SEP + "xml"
+ SEP + "crypto" + SEP + "dsig" + SEP, data);
- Document doc = dbf.newDocumentBuilder().parse(file);
+ 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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -22,10 +22,9 @@ import java.io.FileInputStream;
import java.security.KeyStore;
import java.security.PublicKey;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import org.apache.xml.security.Init;
import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -67,9 +66,7 @@ public class InvalidKeyTest extends org.
FileInputStream is = new FileInputStream(BASEDIR + SEP +
"src/test/resources/org/apache/xml/security/samples/input/test-assertion.xml");
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- Document e = dbf.newDocumentBuilder().parse(is);
+ 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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -21,8 +21,9 @@ package org.apache.xml.security.test.dom
import java.io.File;
import java.io.FileInputStream;
import java.security.PublicKey;
+
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -31,6 +32,7 @@ import org.apache.xml.security.keys.KeyI
import org.apache.xml.security.keys.content.KeyValue;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
public class KeyValueTest extends org.junit.Assert {
@@ -44,9 +46,7 @@ public class KeyValueTest extends org.ju
}
public KeyValueTest() throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- db = dbf.newDocumentBuilder();
+ db = XMLUtils.createDocumentBuilder(false);
}
@org.junit.Test
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -20,8 +20,9 @@ package org.apache.xml.security.test.dom
import java.io.File;
import java.io.FileInputStream;
+
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -29,6 +30,7 @@ import org.apache.xml.security.Init;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
public class NoKeyInfoTest extends org.junit.Assert {
@@ -42,9 +44,7 @@ public class NoKeyInfoTest extends org.j
private DocumentBuilder db;
public NoKeyInfoTest() throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- db = dbf.newDocumentBuilder();
+ db = XMLUtils.createDocumentBuilder(false);
}
@org.junit.Test
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -25,7 +25,6 @@ import java.net.URISyntaxException;
import java.security.cert.X509Certificate;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -37,6 +36,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.apache.xml.security.utils.XMLUtils;
import org.apache.xml.security.utils.resolver.ResourceResolverContext;
import org.apache.xml.security.utils.resolver.ResourceResolverException;
import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
@@ -63,10 +63,7 @@ public class ProcessingInstructionTest e
@org.junit.Test
public void testProcessingInstruction() throws Exception {
String signatureFileName = dir + "upp_sign.xml";
- DocumentBuilderFactory dbf =
- DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
File f = new File(signatureFileName);
Document doc = db.parse(new java.io.FileInputStream(f));
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -26,11 +26,9 @@ import java.security.PublicKey;
import java.util.Enumeration;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
import org.apache.xml.security.Init;
import org.apache.xml.security.signature.Reference;
import org.apache.xml.security.signature.SignedInfo;
@@ -40,6 +38,7 @@ import org.apache.xml.security.signature
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.ElementProxy;
+import org.apache.xml.security.utils.XMLUtils;
import org.apache.xml.security.utils.resolver.implementations.ResolverXPointer;
/**
@@ -127,9 +126,7 @@ public class SignatureReferenceTest exte
}
private Document getOriginalDocument() throws Throwable {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.newDocument();
Element rootElement = doc.createElementNS("http://ns.example.org/", "root");
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -26,7 +26,6 @@ import java.security.PublicKey;
import java.util.Enumeration;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.xml.security.Init;
import org.apache.xml.security.signature.XMLSignature;
@@ -34,6 +33,7 @@ import org.apache.xml.security.signature
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.ElementProxy;
+import org.apache.xml.security.utils.XMLUtils;
import org.apache.xml.security.utils.resolver.implementations.ResolverXPointer;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -170,9 +170,7 @@ public class SignatureTest extends org.j
}
private Document getOriginalDocument() throws Throwable {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.newDocument();
Element rootElement = doc.createElementNS("http://ns.example.org/", "root");
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -29,7 +29,6 @@ import java.security.cert.CertificateExc
import java.security.cert.X509Certificate;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.xpath.XPath;
@@ -43,6 +42,7 @@ import org.apache.xml.security.exception
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
import org.apache.xml.security.test.dom.DSNamespaceContext;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
@@ -165,9 +165,7 @@ public class UnknownAlgoSignatureTest ex
public static Document getDocument(File file)
throws ParserConfigurationException, SAXException, IOException {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
+ 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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -40,13 +40,8 @@ public class X509DataTest extends org.ju
@org.junit.Test
public void testAddX509SubjectName() throws Exception {
Init.init();
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
- //XML Signature needs to be namespace aware
- dbf.setNamespaceAware(true);
-
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
org.w3c.dom.Document doc = db.newDocument();
XMLSignature sig = new XMLSignature(doc, "", XMLSignature.ALGO_ID_SIGNATURE_DSA);
@@ -76,13 +71,8 @@ public class X509DataTest extends org.ju
}
private XMLSignature getSignature(byte[] s) throws Exception {
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
-
- //XML Signature needs to be namespace aware
- dbf.setNamespaceAware(true);
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.parse(new ByteArrayInputStream(s));
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -27,7 +27,6 @@ import java.security.PublicKey;
import java.security.cert.X509Certificate;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
@@ -40,6 +39,7 @@ import org.apache.xml.security.test.dom.
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.transforms.params.XPathContainer;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -70,11 +70,7 @@ public class XmlSecTest extends org.juni
private void checkXmlSignatureSoftwareStack(boolean cert) throws Exception {
Init.init();
- DocumentBuilderFactory documentBuilderFactory =
- DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware(true);
- DocumentBuilder documentBuilder =
- documentBuilderFactory.newDocumentBuilder();
+ DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(false);
Document testDocument = documentBuilder.newDocument();
Element rootElement =
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -21,7 +21,6 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayInputStream;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -31,6 +30,7 @@ import org.apache.xml.security.signature
import org.apache.xml.security.test.dom.DSNamespaceContext;
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.transforms.implementations.TransformBase64Decode;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -104,9 +104,7 @@ public class TransformBase64DecodeTest e
+ "</Object>\n"
;
//J+
- DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
- dfactory.setNamespaceAware(true);
- DocumentBuilder db = dfactory.newDocumentBuilder();
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
db.setErrorHandler(new org.apache.xml.security.utils.IgnoreAllErrorHandler());
@@ -138,10 +136,7 @@ public class TransformBase64DecodeTest e
}
private static Document createDocument() throws ParserConfigurationException {
- DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
- dfactory.setNamespaceAware(true);
-
- DocumentBuilder db = dfactory.newDocumentBuilder();
+ DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = db.newDocument();
if (doc == null) {
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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -21,8 +21,7 @@ package org.apache.xml.security.test.dom
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -31,11 +30,11 @@ import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
-
import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.test.dom.DSNamespaceContext;
import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.Transforms;
+import org.apache.xml.security.utils.XMLUtils;
public class TransformXSLTTest extends org.junit.Assert {
@@ -89,10 +88,7 @@ public class TransformXSLTTest extends o
private static Document getDocument(File file)
throws ParserConfigurationException, SAXException, IOException {
- DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
- dfactory.setNamespaceAware(true);
- DocumentBuilder db = dfactory.newDocumentBuilder();
- return db.parse(new FileInputStream(file));
+ 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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
import org.apache.xml.security.Init;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
public class Xpath2TransformationTest extends org.junit.Assert {
@@ -127,11 +128,8 @@ public class Xpath2TransformationTest ex
" </edoc:Object>";
ByteArrayInputStream is = new ByteArrayInputStream(sig.getBytes());
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
org.w3c.dom.Document 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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -18,9 +18,8 @@
*/
package org.apache.xml.security.test.dom.utils.resolver;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import org.apache.xml.security.Init;
+import org.apache.xml.security.utils.XMLUtils;
import org.apache.xml.security.utils.resolver.ResourceResolver;
import org.apache.xml.security.utils.resolver.ResourceResolverContext;
import org.apache.xml.security.utils.resolver.ResourceResolverException;
@@ -31,7 +30,6 @@ import org.junit.Ignore;
import org.junit.Test;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
public class ResolverDirectHTTPTest extends org.junit.Assert {
@@ -52,7 +50,7 @@ public class ResolverDirectHTTPTest exte
@Test
public void testBug40783() throws Exception {
Init.init();
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Attr uri = doc.createAttribute("id");
uri.setNodeValue("urn:ddd:uuu");
doc.createElement("test").setAttributeNode(uri);
@@ -67,7 +65,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testProxyAuth() throws Exception {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Attr uri = doc.createAttribute("URI");
uri.setNodeValue(url);
@@ -84,7 +82,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testProxyAuthWithWrongPassword() throws Exception {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Attr uri = doc.createAttribute("URI");
uri.setNodeValue(url);
@@ -106,7 +104,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testServerAuth() throws Exception {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Attr uri = doc.createAttribute("URI");
uri.setNodeValue(url);
@@ -121,7 +119,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testServerAuthWithWrongPassword() throws Exception {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Attr uri = doc.createAttribute("URI");
uri.setNodeValue(url);
@@ -141,7 +139,7 @@ public class ResolverDirectHTTPTest exte
@Test
@Ignore
public void testProxyAndServerAuth() throws Exception {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ 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=1522958&r1=1522957&r2=1522958&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 Fri Sep 13 14:59:05 2013
@@ -19,11 +19,11 @@
package org.apache.xml.security.test.dom.utils.resolver;
import java.io.File;
-import javax.xml.parsers.*;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
+import org.apache.xml.security.utils.XMLUtils;
import org.apache.xml.security.utils.resolver.ResourceResolver;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
/**
* Unit test for {@link org.apache.xml.security.utils.resolver.ResourceResolver}
@@ -48,8 +48,7 @@ public class ResourceResolverTest extend
String className =
"org.apache.xml.security.test.dom.utils.resolver.OfflineResolver";
ResourceResolver.registerAtStart(className);
- Document doc =
- DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Attr uriAttr = doc.createAttribute("URI");
uriAttr.setValue("http://www.apache.org");
ResourceResolver res =
@@ -73,8 +72,7 @@ public class ResourceResolverTest extend
@org.junit.Test
public void testLocalFileWithEmptyBaseURI() throws Exception {
- Document doc =
- DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ 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();