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 2011/03/25 10:50:14 UTC
svn commit: r1085302 - in
/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal:
./ dom/
Author: coheigea
Date: Fri Mar 25 09:50:13 2011
New Revision: 1085302
URL: http://svn.apache.org/viewvc?rev=1085302&view=rev
Log:
[SANTUARIO-260] - Converting some JUL logging calls to Commons Logging.
Modified:
santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/DigesterOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheTransform.java
santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/DigesterOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/DigesterOutputStream.java?rev=1085302&r1=1085301&r2=1085302&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/DigesterOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/DigesterOutputStream.java Fri Mar 25 09:50:13 2011
@@ -26,8 +26,6 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.security.MessageDigest;
-import java.util.logging.Logger;
-import java.util.logging.Level;
import org.apache.xml.security.utils.UnsyncByteArrayOutputStream;
@@ -44,7 +42,8 @@ public class DigesterOutputStream extend
private final boolean buffer;
private UnsyncByteArrayOutputStream bos;
private final MessageDigest md;
- private static Logger log = Logger.getLogger("org.jcp.xml.dsig.internal");
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(DigesterOutputStream.class);
/**
* Creates a DigesterOutputStream.
@@ -81,13 +80,13 @@ public class DigesterOutputStream extend
if (buffer) {
bos.write(input, offset, len);
}
- if (log.isLoggable(Level.FINER)) {
- log.log(Level.FINER, "Pre-digested input:");
- StringBuffer sb = new StringBuffer(len);
+ if (log.isDebugEnabled()) {
+ log.debug("Pre-digested input:");
+ StringBuilder sb = new StringBuilder(len);
for (int i = offset; i < (offset + len); i++) {
sb.append((char)input[i]);
}
- log.log(Level.FINER, sb.toString());
+ log.debug(sb.toString());
}
md.update(input, offset, len);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java?rev=1085302&r1=1085301&r2=1085302&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Fri Mar 25 09:50:13 2011
@@ -28,8 +28,6 @@ import java.io.OutputStream;
import java.security.spec.AlgorithmParameterSpec;
import java.security.InvalidAlgorithmParameterException;
import java.util.Set;
-import java.util.logging.Logger;
-import java.util.logging.Level;
import javax.xml.crypto.*;
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.TransformException;
@@ -50,8 +48,8 @@ public abstract class ApacheCanonicalize
org.apache.xml.security.Init.init();
}
- private static Logger log =
- Logger.getLogger("org.jcp.xml.dsig.internal.dom");
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(ApacheCanonicalizer.class);
protected Canonicalizer apacheCanonicalizer;
private Transform apacheTransform;
protected String inclusiveNamespaces;
@@ -100,9 +98,8 @@ public abstract class ApacheCanonicalize
if (apacheCanonicalizer == null) {
try {
apacheCanonicalizer = Canonicalizer.getInstance(getAlgorithm());
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Created canonicalizer for algorithm: "
- + getAlgorithm());
+ if (log.isDebugEnabled()) {
+ log.debug("Created canonicalizer for algorithm: " + getAlgorithm());
}
} catch (InvalidCanonicalizerException ice) {
throw new TransformException
@@ -154,9 +151,8 @@ public abstract class ApacheCanonicalize
NodeSetData nsd = (NodeSetData)data;
// convert Iterator to Set
nodeSet = Utils.toNodeSet(nsd.iterator());
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Canonicalizing " + nodeSet.size() +
- " nodes");
+ if (log.isDebugEnabled()) {
+ log.debug("Canonicalizing " + nodeSet.size() + " nodes");
}
} else {
return new OctetStreamData(new ByteArrayInputStream(
@@ -196,9 +192,8 @@ public abstract class ApacheCanonicalize
apacheTransform = Transform.getInstance
(ownerDoc, getAlgorithm(), transformElem.getChildNodes());
apacheTransform.setElement(transformElem, xc.getBaseURI());
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Created transform for algorithm: " +
- getAlgorithm());
+ if (log.isDebugEnabled()) {
+ log.debug("Created transform for algorithm: " + getAlgorithm());
}
} catch (Exception ex) {
throw new TransformException
@@ -208,13 +203,13 @@ public abstract class ApacheCanonicalize
XMLSignatureInput in;
if (data instanceof ApacheData) {
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "ApacheData = true");
+ if (log.isDebugEnabled()) {
+ log.debug("ApacheData = true");
}
in = ((ApacheData)data).getXMLSignatureInput();
} else if (data instanceof NodeSetData) {
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "isNodeSet() = true");
+ if (log.isDebugEnabled()) {
+ log.debug("isNodeSet() = true");
}
if (data instanceof DOMSubTreeData) {
DOMSubTreeData subTree = (DOMSubTreeData)data;
@@ -226,8 +221,8 @@ public abstract class ApacheCanonicalize
in = new XMLSignatureInput(nodeSet);
}
} else {
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "isNodeSet() = false");
+ if (log.isDebugEnabled()) {
+ log.debug("isNodeSet() = false");
}
try {
in = new XMLSignatureInput
Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheTransform.java?rev=1085302&r1=1085301&r2=1085302&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/ApacheTransform.java Fri Mar 25 09:50:13 2011
@@ -26,8 +26,6 @@ import java.io.OutputStream;
import java.security.InvalidAlgorithmParameterException;
import java.security.spec.AlgorithmParameterSpec;
import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -53,8 +51,8 @@ public abstract class ApacheTransform ex
org.apache.xml.security.Init.init();
}
- private static Logger log =
- Logger.getLogger("org.jcp.xml.dsig.internal.dom");
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(ApacheTransform.class);
private Transform apacheTransform;
protected Document ownerDoc;
protected Element transformElem;
@@ -121,8 +119,8 @@ public abstract class ApacheTransform ex
apacheTransform = Transform.getInstance
(ownerDoc, getAlgorithm(), transformElem.getChildNodes());
apacheTransform.setElement(transformElem, xc.getBaseURI());
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Created transform for algorithm: " +
+ if (log.isDebugEnabled()) {
+ log.debug("Created transform for algorithm: " +
getAlgorithm());
}
} catch (Exception ex) {
@@ -133,17 +131,17 @@ public abstract class ApacheTransform ex
XMLSignatureInput in;
if (data instanceof ApacheData) {
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "ApacheData = true");
+ if (log.isDebugEnabled()) {
+ log.debug("ApacheData = true");
}
in = ((ApacheData)data).getXMLSignatureInput();
} else if (data instanceof NodeSetData) {
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "isNodeSet() = true");
+ if (log.isDebugEnabled()) {
+ log.debug("isNodeSet() = true");
}
if (data instanceof DOMSubTreeData) {
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "DOMSubTreeData = true");
+ if (log.isDebugEnabled()) {
+ log.debug("DOMSubTreeData = true");
}
DOMSubTreeData subTree = (DOMSubTreeData)data;
in = new XMLSignatureInput(subTree.getRoot());
@@ -154,8 +152,8 @@ public abstract class ApacheTransform ex
in = new XMLSignatureInput(nodeSet);
}
} else {
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "isNodeSet() = false");
+ if (log.isDebugEnabled()) {
+ log.debug("isNodeSet() = false");
}
try {
in = new XMLSignatureInput
Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java?rev=1085302&r1=1085301&r2=1085302&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java Fri Mar 25 09:50:13 2011
@@ -34,8 +34,6 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.crypto.Mac;
import javax.crypto.SecretKey;
import org.w3c.dom.Document;
@@ -50,8 +48,8 @@ import org.jcp.xml.dsig.internal.MacOutp
*/
public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod {
- private static Logger log =
- Logger.getLogger("org.jcp.xml.dsig.internal.dom");
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(DOMHMACSignatureMethod.class);
// see RFC 4051 for these algorithm definitions
final static String HMAC_SHA256 =
@@ -106,10 +104,8 @@ public abstract class DOMHMACSignatureMe
}
outputLength = ((HMACParameterSpec)params).getOutputLength();
outputLengthSet = true;
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE,
- "Setting outputLength from HMACParameterSpec to: " +
- outputLength);
+ if (log.isDebugEnabled()) {
+ log.debug("Setting outputLength from HMACParameterSpec to: " + outputLength);
}
}
}
@@ -124,8 +120,8 @@ public abstract class DOMHMACSignatureMe
outputLength = new Integer
(paramsElem.getFirstChild().getNodeValue()).intValue();
outputLengthSet = true;
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "unmarshalled outputLength: " + outputLength);
+ if (log.isDebugEnabled()) {
+ log.debug("unmarshalled outputLength: " + outputLength);
}
return new HMACParameterSpec(outputLength);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMReference.java?rev=1085302&r1=1085301&r2=1085302&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMReference.java Fri Mar 25 09:50:13 2011
@@ -39,8 +39,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.security.*;
import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -76,8 +74,8 @@ public final class DOMReference extends
}
});
- private static Logger log =
- Logger.getLogger("org.jcp.xml.dsig.internal.dom");
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(DOMReference.class);
private final DigestMethod digestMethod;
private final String id;
@@ -261,8 +259,8 @@ public final class DOMReference extends
public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Marshalling Reference");
+ if (log.isDebugEnabled()) {
+ log.debug("Marshalling Reference");
}
Document ownerDoc = DOMUtils.getOwnerDocument(parent);
@@ -291,8 +289,8 @@ public final class DOMReference extends
((DOMDigestMethod)digestMethod).marshal(refElem, dsPrefix, context);
// create and append DigestValue element
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Adding digestValueElem");
+ if (log.isDebugEnabled()) {
+ log.debug("Adding digestValueElem");
}
Element digestValueElem = DOMUtils.createElement(ownerDoc,
"DigestValue",
@@ -321,8 +319,8 @@ public final class DOMReference extends
// insert digestValue into DigestValue element
String encodedDV = Base64.encode(digestValue);
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Reference object uri = " + uri);
+ if (log.isDebugEnabled()) {
+ log.debug("Reference object uri = " + uri);
}
Element digestElem = DOMUtils.getLastChildElement(refElem);
if (digestElem == null) {
@@ -333,8 +331,8 @@ public final class DOMReference extends
(refElem.getOwnerDocument().createTextNode(encodedDV));
digested = true;
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Reference digesting completed");
+ if (log.isDebugEnabled()) {
+ log.debug("Reference digesting completed");
}
}
@@ -350,11 +348,9 @@ public final class DOMReference extends
Data data = dereference(validateContext);
calcDigestValue = transform(data, validateContext);
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Expected digest: " +
- Base64.encode(digestValue));
- log.log(Level.FINE, "Actual digest: " +
- Base64.encode(calcDigestValue));
+ if (log.isDebugEnabled()) {
+ log.debug("Expected digest: " + Base64.encode(digestValue));
+ log.debug("Actual digest: " + Base64.encode(calcDigestValue));
}
validationStatus = Arrays.equals(digestValue, calcDigestValue);
@@ -382,11 +378,9 @@ public final class DOMReference extends
}
try {
data = deref.dereference(this, context);
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "URIDereferencer class name: " +
- deref.getClass().getName());
- log.log(Level.FINE, "Data class name: " +
- data.getClass().getName());
+ if (log.isDebugEnabled()) {
+ log.debug("URIDereferencer class name: " + deref.getClass().getName());
+ log.debug("Data class name: " + data.getClass().getName());
}
} catch (URIReferenceException ure) {
throw new XMLSignatureException(ure);
@@ -557,8 +551,7 @@ public final class DOMReference extends
};
} catch (Exception e) {
// log a warning
- log.log(Level.WARNING,
- "cannot cache dereferenced data: " + e);
+ log.warn("cannot cache dereferenced data: " + e);
return null;
}
} else if (xsi.isElement()) {
@@ -571,8 +564,7 @@ public final class DOMReference extends
xsi.getMIMEType());
} catch (IOException ioe) {
// log a warning
- log.log(Level.WARNING,
- "cannot cache dereferenced data: " + ioe);
+ log.warn("cannot cache dereferenced data: " + ioe);
return null;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java?rev=1085302&r1=1085301&r2=1085302&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java Fri Mar 25 09:50:13 2011
@@ -29,8 +29,6 @@ import javax.xml.crypto.dsig.spec.Signat
import java.io.IOException;
import java.security.*;
import java.security.spec.AlgorithmParameterSpec;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.w3c.dom.Element;
import org.apache.xml.security.algorithms.implementations.SignatureECDSA;
@@ -43,8 +41,8 @@ import org.jcp.xml.dsig.internal.SignerO
*/
public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
- private static Logger log =
- Logger.getLogger("org.jcp.xml.dsig.internal.dom");
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(DOMSignatureMethod.class);
// see RFC 4051 for these algorithm definitions
final static String RSA_SHA256 =
@@ -164,9 +162,9 @@ public abstract class DOMSignatureMethod
}
}
signature.initVerify((PublicKey)key);
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Signature provider:"+ signature.getProvider());
- log.log(Level.FINE, "verifying with key: " + key);
+ if (log.isDebugEnabled()) {
+ log.debug("Signature provider:" + signature.getProvider());
+ log.debug("verifying with key: " + key);
}
((DOMSignedInfo)si).canonicalize(context,
new SignerOutputStream(signature));
@@ -207,9 +205,9 @@ public abstract class DOMSignatureMethod
}
}
signature.initSign((PrivateKey)key);
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Signature provider:" +signature.getProvider());
- log.log(Level.FINE, "Signing with key: " + key);
+ if (log.isDebugEnabled()) {
+ log.debug("Signature provider:" + signature.getProvider());
+ log.debug("Signing with key: " + key);
}
((DOMSignedInfo)si).canonicalize(context,
Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java?rev=1085302&r1=1085301&r2=1085302&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Fri Mar 25 09:50:13 2011
@@ -33,8 +33,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.security.Provider;
import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -49,7 +47,8 @@ import org.apache.xml.security.utils.Uns
*/
public final class DOMSignedInfo extends DOMStructure implements SignedInfo {
- private static Logger log = Logger.getLogger("org.jcp.xml.dsig.internal.dom");
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(DOMSignedInfo.class);
private List<Reference> references;
private CanonicalizationMethod canonicalizationMethod;
private SignatureMethod signatureMethod;
@@ -197,15 +196,14 @@ public final class DOMSignedInfo extends
byte[] signedInfoBytes = bos.toByteArray();
// this whole block should only be done if logging is enabled
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Canonicalized SignedInfo:");
- StringBuffer sb = new StringBuffer(signedInfoBytes.length);
+ if (log.isDebugEnabled()) {
+ log.debug("Canonicalized SignedInfo:");
+ StringBuilder sb = new StringBuilder(signedInfoBytes.length);
for (int i = 0; i < signedInfoBytes.length; i++) {
sb.append((char)signedInfoBytes[i]);
}
- log.log(Level.FINE, sb.toString());
- log.log(Level.FINE, "Data to be signed/verified:" +
- Base64.encode(signedInfoBytes));
+ log.debug(sb.toString());
+ log.debug("Data to be signed/verified:" + Base64.encode(signedInfoBytes));
}
this.canonData = new ByteArrayInputStream(signedInfoBytes);
Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1085302&r1=1085301&r2=1085302&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Fri Mar 25 09:50:13 2011
@@ -43,8 +43,6 @@ import java.util.Collections;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -61,8 +59,8 @@ import org.apache.xml.security.utils.Bas
public final class DOMXMLSignature extends DOMStructure
implements XMLSignature {
- private static Logger log =
- Logger.getLogger("org.jcp.xml.dsig.internal.dom");
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(DOMXMLSignature.class);
private String id;
private SignatureValue sv;
private KeyInfo ki;
@@ -262,15 +260,14 @@ public final class DOMXMLSignature exten
for (int i = 0, size = refs.size(); validateRefs && i < size; i++) {
Reference ref = refs.get(i);
boolean refValid = ref.validate(vc);
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Reference[" + ref.getURI() +
- "] is valid: " + refValid);
+ if (log.isDebugEnabled()) {
+ log.debug("Reference[" + ref.getURI() + "] is valid: " + refValid);
}
validateRefs &= refValid;
}
if (!validateRefs) {
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Couldn't validate the References");
+ if (log.isDebugEnabled()) {
+ log.debug("Couldn't validate the References");
}
validationStatus = false;
validated = true;
@@ -290,8 +287,8 @@ public final class DOMXMLSignature exten
for (int j = 0; validateMans && j < csize; j++) {
XMLStructure xs = content.get(j);
if (xs instanceof Manifest) {
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "validating manifest");
+ if (log.isDebugEnabled()) {
+ log.debug("validating manifest");
}
Manifest man = (Manifest)xs;
@SuppressWarnings("unchecked")
@@ -300,10 +297,10 @@ public final class DOMXMLSignature exten
for (int k = 0; validateMans && k < rsize; k++) {
Reference ref = manRefs.get(k);
boolean refValid = ref.validate(vc);
- if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Manifest ref[" +
- ref.getURI() + "] is valid: " +
- refValid);
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "Manifest ref[" + ref.getURI() + "] is valid: " + refValid
+ );
}
validateMans &= refValid;
}