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/04/12 16:35:13 UTC
svn commit: r1091431 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/
main/java/org/apache/xml/security/algorithms/
main/java/org/apache/xml/security/algorithms/implementations/
main/java/org/apache/xml/security/c14n/impl...
Author: coheigea
Date: Tue Apr 12 14:35:12 2011
New Revision: 1091431
URL: http://svn.apache.org/viewvc?rev=1091431&view=rev
Log:
[SANTUARIO-260] - More logging cleanup.
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IdResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Driver.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java Tue Apr 12 14:35:12 2011
@@ -50,7 +50,7 @@ public class Init {
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Init.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(Init.class);
/** Field _initialized */
private static boolean alreadyInitialized = false;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java Tue Apr 12 14:35:12 2011
@@ -31,7 +31,7 @@ public class JCEMapper {
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(JCEMapper.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(JCEMapper.class);
private static Map<String, String> uriToJCEName;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java Tue Apr 12 14:35:12 2011
@@ -40,7 +40,7 @@ public class SignatureAlgorithm extends
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignatureAlgorithm.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(SignatureAlgorithm.class);
/** All available algorithm classes are registered here */
private static Map<String, Class<?>> algorithmHash = new HashMap<String, Class<?>>(10);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java Tue Apr 12 14:35:12 2011
@@ -40,7 +40,7 @@ public abstract class IntegrityHmac exte
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(IntegrityHmacSHA1.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(IntegrityHmac.class);
/** Field macAlgorithm */
private Mac macAlgorithm = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java Tue Apr 12 14:35:12 2011
@@ -36,7 +36,7 @@ public abstract class SignatureBaseRSA e
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignatureBaseRSA.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(SignatureBaseRSA.class);
/** @inheritDoc */
public abstract String engineGetURI();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java Tue Apr 12 14:35:12 2011
@@ -37,7 +37,7 @@ public class SignatureDSA extends Signat
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignatureDSA.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(SignatureDSA.class);
/** Field URI */
public static final String URI = Constants.SignatureSpecNS + "dsa-sha1";
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java Tue Apr 12 14:35:12 2011
@@ -43,7 +43,7 @@ public abstract class SignatureECDSA ext
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignatureECDSA.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(SignatureECDSA.class);
/** @inheritDoc */
public abstract String engineGetURI();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java Tue Apr 12 14:35:12 2011
@@ -55,8 +55,8 @@ public abstract class Canonicalizer11 ex
static final String XMLNS_URI = Constants.NamespaceSpecNS;
static final String XML_LANG_URI = Constants.XML_LANG_SPACE_SpecNS;
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Canonicalizer11.class.getName());
+ protected static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(Canonicalizer11.class);
static class XmlAttrStack {
static class XmlsStackElement {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java Tue Apr 12 14:35:12 2011
@@ -80,7 +80,7 @@ import org.xml.sax.SAXException;
public class XMLCipher {
private static org.apache.commons.logging.Log logger =
- org.apache.commons.logging.LogFactory.getLog(XMLCipher.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(XMLCipher.class);
/** Triple DES EDE (192 bit key) in CBC mode */
public static final String TRIPLEDES =
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java Tue Apr 12 14:35:12 2011
@@ -45,7 +45,7 @@ import org.apache.xml.security.utils.Bas
public class XMLCipherInput {
private static org.apache.commons.logging.Log logger =
- org.apache.commons.logging.LogFactory.getLog(XMLCipher.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(XMLCipherInput.class);
/** The data we are working with */
private CipherData cipherData;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java Tue Apr 12 14:35:12 2011
@@ -88,7 +88,7 @@ public class KeyInfo extends SignatureEl
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(KeyInfo.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(KeyInfo.class);
// We need at least one StorageResolver otherwise
// the KeyResolvers would not be called.
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java Tue Apr 12 14:35:12 2011
@@ -36,7 +36,7 @@ public class X509Data extends SignatureE
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509Data.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(X509Data.class);
/**
* Constructor X509Data
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java Tue Apr 12 14:35:12 2011
@@ -31,7 +31,7 @@ public class XMLX509IssuerSerial extends
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLX509IssuerSerial.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(XMLX509IssuerSerial.class);
/**
* Constructor XMLX509IssuerSerial
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java Tue Apr 12 14:35:12 2011
@@ -36,7 +36,7 @@ public class XMLX509SKI extends Signatur
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLX509SKI.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(XMLX509SKI.class);
/**
* <CODE>SubjectKeyIdentifier (id-ce-subjectKeyIdentifier) (2.5.29.14)</CODE>:
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java Tue Apr 12 14:35:12 2011
@@ -36,7 +36,7 @@ public class KeyResolver {
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(KeyResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(KeyResolver.class);
/** Field resolverVector */
private static List<KeyResolver> resolverVector = new ArrayList<KeyResolver>();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java Tue Apr 12 14:35:12 2011
@@ -47,7 +47,7 @@ public class EncryptedKeyResolver extend
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(RSAKeyValueResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(RSAKeyValueResolver.class);
private Key kek;
private String algorithm;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java Tue Apr 12 14:35:12 2011
@@ -32,7 +32,7 @@ public class RSAKeyValueResolver extends
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(RSAKeyValueResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(RSAKeyValueResolver.class);
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Tue Apr 12 14:35:12 2011
@@ -66,7 +66,7 @@ public class RetrievalMethodResolver ext
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(RetrievalMethodResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(RetrievalMethodResolver.class);
/**
* Method engineResolvePublicKey
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java Tue Apr 12 14:35:12 2011
@@ -38,7 +38,7 @@ public class X509CertificateResolver ext
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509CertificateResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(X509CertificateResolver.class);
/**
* Method engineResolvePublicKey
@@ -98,8 +98,9 @@ public class X509CertificateResolver ext
}
return null;
} catch (XMLSecurityException ex) {
- log.debug("XMLSecurityException", ex);
-
+ if (log.isDebugEnabled()) {
+ log.debug("XMLSecurityException", ex);
+ }
throw new KeyResolverException("generic.EmptyMessage", ex);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java Tue Apr 12 14:35:12 2011
@@ -35,7 +35,7 @@ public class X509IssuerSerialResolver ex
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509IssuerSerialResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(X509IssuerSerialResolver.class);
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java Tue Apr 12 14:35:12 2011
@@ -35,7 +35,7 @@ public class X509SKIResolver extends Key
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509SKIResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(X509SKIResolver.class);
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java Tue Apr 12 14:35:12 2011
@@ -35,7 +35,7 @@ public class X509SubjectNameResolver ext
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509SubjectNameResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(X509SubjectNameResolver.class);
/**
@@ -80,8 +80,10 @@ public class X509SubjectNameResolver ext
XMLX509SubjectName x509childObject[] = null;
if (!XMLUtils.elementIsInSignatureSpace(element,
- Constants._TAG_X509DATA) ) {
- log.debug("I can't");
+ Constants._TAG_X509DATA) ) {
+ if (log.isDebugEnabled()) {
+ log.debug("I can't");
+ }
return null;
}
x509childNodes =
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java Tue Apr 12 14:35:12 2011
@@ -34,7 +34,7 @@ public class StorageResolver {
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(StorageResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(StorageResolver.class);
/** Field storageResolvers */
List<StorageResolverSpi> storageResolvers = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Tue Apr 12 14:35:12 2011
@@ -43,7 +43,7 @@ public class CertsInFilesystemDirectoryR
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(
- CertsInFilesystemDirectoryResolver.class.getName()
+ CertsInFilesystemDirectoryResolver.class
);
/** Field merlinsCertificatesDir */
@@ -115,20 +115,29 @@ public class CertsInFilesystemDirectoryR
dn = cert.getSubjectDN().getName();
added = true;
} catch (FileNotFoundException ex) {
- log.debug("Could not add certificate from file " + filename, ex);
+ if (log.isDebugEnabled()) {
+ log.debug("Could not add certificate from file " + filename, ex);
+ }
} catch (IOException ex) {
- log.debug("Could not add certificate from file " + filename, ex);
+ if (log.isDebugEnabled()) {
+ log.debug("Could not add certificate from file " + filename, ex);
+ }
} catch (CertificateNotYetValidException ex) {
- log.debug("Could not add certificate from file " + filename, ex);
+ if (log.isDebugEnabled()) {
+ log.debug("Could not add certificate from file " + filename, ex);
+ }
} catch (CertificateExpiredException ex) {
- log.debug("Could not add certificate from file " + filename, ex);
+ if (log.isDebugEnabled()) {
+ log.debug("Could not add certificate from file " + filename, ex);
+ }
} catch (CertificateException ex) {
- log.debug("Could not add certificate from file " + filename, ex);
+ if (log.isDebugEnabled()) {
+ log.debug("Could not add certificate from file " + filename, ex);
+ }
}
- if (added) {
- if (log.isDebugEnabled())
- log.debug("Added certificate: " + dn);
+ if (added && log.isDebugEnabled()) {
+ log.debug("Added certificate: " + dn);
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java Tue Apr 12 14:35:12 2011
@@ -50,8 +50,8 @@ import org.xml.sax.SAXException;
public class Manifest extends SignatureElementProxy {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Manifest.class.getName());
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(Manifest.class);
/** Field references */
private List<Reference> references;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java Tue Apr 12 14:35:12 2011
@@ -119,7 +119,7 @@ public class Reference extends Signature
/** {@link org.apache.commons.logging} logging facility */
private static final org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Reference.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(Reference.class);
private Manifest manifest = null;
private XMLSignatureInput transformsOutput;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java Tue Apr 12 14:35:12 2011
@@ -142,7 +142,7 @@ public final class XMLSignature extends
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLSignature.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(XMLSignature.class);
/** ds:Signature.ds:SignedInfo element */
private SignedInfo signedInfo = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java Tue Apr 12 14:35:12 2011
@@ -50,7 +50,7 @@ import org.xml.sax.SAXException;
*/
public class XMLSignatureInput implements Cloneable {
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLSignatureInput.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(XMLSignatureInput.class);
/*
* The XMLSignature Input can be either:
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java Tue Apr 12 14:35:12 2011
@@ -54,7 +54,7 @@ public final class Transform extends Sig
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Transform.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(Transform.class);
/** All available Transform classes are registered here */
private static Map<String, TransformSpi> transformSpiHash =
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java Tue Apr 12 14:35:12 2011
@@ -105,7 +105,7 @@ public class Transforms extends Signatur
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Transforms.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(Transforms.class);
private Element[] transforms;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java Tue Apr 12 14:35:12 2011
@@ -57,8 +57,8 @@ public class TransformXSLT extends Trans
static final String defaultXSLTSpecNSprefix = "xslt";
static final String XSLTSTYLESHEET = "stylesheet";
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(TransformXSLT.class.getName());
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(TransformXSLT.class);
/**
* Method engineGetURI
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java Tue Apr 12 14:35:12 2011
@@ -42,8 +42,8 @@ import java.lang.reflect.Modifier;
*/
public class CachedXPathFuncHereAPI {
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(CachedXPathFuncHereAPI.class.getName());
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(CachedXPathFuncHereAPI.class);
/**
* XPathContext, and thus DTMManager and DTMs, persists through multiple
* calls to this object.
@@ -320,7 +320,9 @@ public class CachedXPathFuncHereAPI {
private static void fixupFunctionTable() {
boolean installed = false;
- log.info("Registering Here function");
+ if (log.isDebugEnabled()) {
+ log.debug("Registering Here function");
+ }
/**
* Try to register our here() implementation as internal function.
*/
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java Tue Apr 12 14:35:12 2011
@@ -26,8 +26,8 @@ import org.apache.xml.security.algorithm
*/
public class DigesterOutputStream extends ByteArrayOutputStream {
final MessageDigestAlgorithm mda;
- final static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DigesterOutputStream.class.getName());
+ private final static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(DigesterOutputStream.class);
/**
* @param mda
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java Tue Apr 12 14:35:12 2011
@@ -38,8 +38,8 @@ import org.w3c.dom.Text;
public abstract class ElementProxy {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ElementProxy.class.getName());
+ protected static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(ElementProxy.class);
/** Field constructionElement */
protected Element constructionElement = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IdResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IdResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IdResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IdResolver.java Tue Apr 12 14:35:12 2011
@@ -47,7 +47,7 @@ public class IdResolver {
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(IdResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(IdResolver.class);
private static Map<Document, Map<String, WeakReference<Element>>> docMap =
new WeakHashMap<Document, Map<String, WeakReference<Element>>>();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java Tue Apr 12 14:35:12 2011
@@ -29,8 +29,8 @@ import org.xml.sax.SAXParseException;
public class IgnoreAllErrorHandler implements ErrorHandler {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(IgnoreAllErrorHandler.class.getName());
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(IgnoreAllErrorHandler.class);
/** Field throwExceptions */
static final boolean warnOnExceptions =
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java Tue Apr 12 14:35:12 2011
@@ -31,7 +31,7 @@ public class JavaUtils {
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(JavaUtils.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(JavaUtils.class);
private JavaUtils() {
// we don't allow instantiation
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java Tue Apr 12 14:35:12 2011
@@ -27,7 +27,7 @@ import org.apache.xml.security.signature
*/
public class SignerOutputStream extends ByteArrayOutputStream {
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignerOutputStream.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(SignerOutputStream.class);
final SignatureAlgorithm sa;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java Tue Apr 12 14:35:12 2011
@@ -33,7 +33,7 @@ public class ResourceResolver {
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResourceResolver.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(ResourceResolver.class);
/** these are the system-wide resolvers */
private static List<ResourceResolver> resolverVector = new ArrayList<ResourceResolver>(10);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java Tue Apr 12 14:35:12 2011
@@ -31,7 +31,7 @@ public abstract class ResourceResolverSp
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResourceResolverSpi.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(ResourceResolverSpi.class);
/** Field properties */
protected java.util.Map<String, String> properties = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java Tue Apr 12 14:35:12 2011
@@ -57,7 +57,7 @@ public class ResolverDirectHTTP extends
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResolverDirectHTTP.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(ResolverDirectHTTP.class);
/** Field properties[] */
private static final String properties[] = {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java Tue Apr 12 14:35:12 2011
@@ -36,7 +36,7 @@ public class ResolverFragment extends Re
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResolverFragment.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(ResolverFragment.class);
@Override
public boolean engineIsThreadSafe() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java Tue Apr 12 14:35:12 2011
@@ -34,7 +34,7 @@ public class ResolverLocalFilesystem ext
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResolverLocalFilesystem.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(ResolverLocalFilesystem.class);
private static int FILE_URI_LENGTH = "file:/".length();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java Tue Apr 12 14:35:12 2011
@@ -43,7 +43,7 @@ public class ResolverXPointer extends Re
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResolverXPointer.class.getName());
+ org.apache.commons.logging.LogFactory.getLog(ResolverXPointer.class);
private static final String XP = "#xpointer(id(";
private static final int XP_LENGTH = XP.length();
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java Tue Apr 12 14:35:12 2011
@@ -33,9 +33,12 @@ import org.jcp.xml.dsig.internal.dom.XML
* loading issues with more than one classloader (see 6380953).
*/
public class ClassLoaderTest extends org.junit.Assert {
+
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(ClassLoaderTest.class);
@org.junit.Test
- public void test_multiple_loaders() throws Exception {
+ public void testMultipleLoaders() throws Exception {
String baseDir = System.getProperty("basedir");
String fs = System.getProperty("file.separator");
@@ -61,7 +64,7 @@ public class ClassLoaderTest extends org
@org.junit.Test
@SuppressWarnings("unchecked")
- public void test_provider_multiple_loaders() throws Exception {
+ public void testProviderMultipleLoaders() throws Exception {
String baseDir = System.getProperty("basedir");
String fs = System.getProperty("file.separator");
File file0 = new File(baseDir + fs + "build" + fs + "classes" + fs);
@@ -100,12 +103,13 @@ public class ClassLoaderTest extends org
}
long end = System.currentTimeMillis();
long elapsed = end-start;
- System.out.println("Elapsed:"+elapsed);
- // System.out.println("dsig succeeded");
+ if (log.isDebugEnabled()) {
+ log.debug("Elapsed: " + elapsed);
+ }
}
@org.junit.Test
- public void test_provider_multiple_loaders_two() throws Exception {
+ public void testProviderMultipleLoadersTwo() throws Exception {
String baseDir = System.getProperty("basedir");
String fs = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Driver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Driver.java?rev=1091431&r1=1091430&r2=1091431&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Driver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Driver.java Tue Apr 12 14:35:12 2011
@@ -24,6 +24,9 @@ import javax.xml.crypto.dsig.spec.C14NMe
* Used by ClassLoaderTest
*/
public class Driver {
+
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(Driver.class);
public void dsig() throws Exception {
@@ -36,7 +39,9 @@ public class Driver {
}
long end = System.currentTimeMillis();
long elapsed = end - start;
- System.out.println("Elapsed: " + elapsed);
- System.out.println("dsig succeeded");
+ if (log.isDebugEnabled()) {
+ log.debug("Elapsed: " + elapsed);
+ log.debug("dsig succeeded");
+ }
}
}