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/03/22 12:25:04 UTC
svn commit: r1459726 [1/2] - in /santuario/xml-security-java/trunk: ./
samples/org/apache/xml/security/samples/encryption/
samples/org/apache/xml/security/samples/iaik/
samples/org/apache/xml/security/samples/signature/
samples/org/apache/xml/security/...
Author: coheigea
Date: Fri Mar 22 11:25:01 2013
New Revision: 1459726
URL: http://svn.apache.org/r1459726
Log:
[SANTUARIO-354] - Switch to use SLF4J for logging
Modified:
santuario/xml-security-java/trunk/pom.xml
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
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/XMLX509Certificate.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/DEREncodedKeyValueResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.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/KeyInfoReferenceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.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/SecretKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.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/X509DigestResolver.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/stax/config/XIncludeHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/LogInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.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/ClassLoaderUtils.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/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/XMLUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.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
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Fri Mar 22 11:25:01 2013
@@ -189,7 +189,7 @@
!org.apache.xml.security.*,
!javax.xml.crypto.*,
!org.apache.jcp.xml.dsig.internal.*,
- org.apache.commons.logging;resolution:=optional;version="[1.1,2)",
+ org.slf4j.*;version="[1.7,2)",
org.apache.xml.dtm*;resolution:=optional;version="[2.7,3)",
org.apache.xml.utils*;resolution:=optional;version="[2.7,3)",
org.apache.xpath*;resolution:=optional;version="[2.7,3)",
@@ -392,7 +392,7 @@
<properties>
<xml.apis.version>1.4.01</xml.apis.version>
- <commons.logging.version>1.1.1</commons.logging.version>
+ <slf4j.version>1.7.2</slf4j.version>
<xalan.version>2.7.1</xalan.version>
<xerces.version>2.9.1</xerces.version>
<junit.version>4.8.2</junit.version>
@@ -406,9 +406,9 @@
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -424,15 +424,15 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java Fri Mar 22 11:25:01 2013
@@ -48,8 +48,8 @@ import javax.xml.transform.OutputKeys;
public class Decrypter {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(
Decrypter.class.getName());
static {
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java Fri Mar 22 11:25:01 2013
@@ -49,8 +49,8 @@ import javax.xml.transform.OutputKeys;
public class Encrypter {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(
Encrypter.class.getName());
static {
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java Fri Mar 22 11:25:01 2013
@@ -43,8 +43,8 @@ import org.w3c.dom.Element;
public class IAIKInterOp {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(IAIKInterOp.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(IAIKInterOp.class.getName());
/** Field schemaValidate */
static final boolean schemaValidate = false;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java Fri Mar 22 11:25:01 2013
@@ -43,8 +43,8 @@ import org.w3c.dom.Element;
public class CreateCollectableSignature {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(CreateCollectableSignature.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateCollectableSignature.class.getName());
/** Field passphrase */
public static final String passphrase =
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java Fri Mar 22 11:25:01 2013
@@ -38,8 +38,8 @@ import org.w3c.dom.Element;
public class CreateEnvelopingSignature {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(CreateSignature.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateSignature.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java Fri Mar 22 11:25:01 2013
@@ -56,8 +56,8 @@ import org.w3c.dom.Node;
public class CreateMerlinsExampleSixteen {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(CreateMerlinsExampleSixteen.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateMerlinsExampleSixteen.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java Fri Mar 22 11:25:01 2013
@@ -56,8 +56,8 @@ import org.w3c.dom.Node;
public class CreateMerlinsExampleTwentyThree {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(CreateMerlinsExampleTwentyThree.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateMerlinsExampleTwentyThree.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java Fri Mar 22 11:25:01 2013
@@ -39,8 +39,8 @@ import org.w3c.dom.Element;
public class CreateSignature {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(CreateSignature.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateSignature.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java Fri Mar 22 11:25:01 2013
@@ -42,8 +42,8 @@ import org.w3c.dom.Element;
public class HereSigner {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(HereSigner.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(HereSigner.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java Fri Mar 22 11:25:01 2013
@@ -32,8 +32,8 @@ import org.w3c.dom.Attr;
public class NullURIReferenceResolver extends ResourceResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(NullURIReferenceResolver.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(NullURIReferenceResolver.class.getName());
/** Field _data[] */
byte _data[] = null;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java Fri Mar 22 11:25:01 2013
@@ -41,8 +41,8 @@ import org.w3c.dom.NodeList;
public class VerifyCollectableSignature {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(VerifyCollectableSignature.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(VerifyCollectableSignature.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java Fri Mar 22 11:25:01 2013
@@ -42,8 +42,8 @@ import org.w3c.dom.Element;
public class VerifyMerlinsExamplesFifteen {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(VerifyMerlinsExamplesFifteen.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(VerifyMerlinsExamplesFifteen.class.getName());
/** Field schemaValidate */
static final boolean schemaValidate = false;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java Fri Mar 22 11:25:01 2013
@@ -44,8 +44,8 @@ import org.w3c.dom.Element;
public class VerifyMerlinsExamplesSixteen {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(VerifyMerlinsExamplesSixteen.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(VerifyMerlinsExamplesSixteen.class.getName());
/** Field schemaValidate */
static final boolean schemaValidate = false;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java Fri Mar 22 11:25:01 2013
@@ -44,8 +44,8 @@ import org.w3c.dom.Element;
public class VerifyMerlinsExamplesTwentyThree {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(VerifyMerlinsExamplesTwentyThree.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(VerifyMerlinsExamplesTwentyThree.class.getName());
/** Field schemaValidate */
static final boolean schemaValidate = false;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java Fri Mar 22 11:25:01 2013
@@ -30,8 +30,8 @@ import org.apache.xml.security.transform
public class SampleTransformNone extends TransformSpi {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SampleTransformNone.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SampleTransformNone.class.getName());
/** Field implementedTransformURI */
public static final String implementedTransformURI =
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java Fri Mar 22 11:25:01 2013
@@ -40,8 +40,8 @@ import org.w3c.dom.Attr;
public class OfflineResolver extends ResourceResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(OfflineResolver.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(OfflineResolver.class.getName());
/** Field _uriMap */
static Map<String, String> _uriMap = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java Fri Mar 22 11:25:01 2013
@@ -42,8 +42,8 @@ import org.apache.xml.security.utils.Uns
* @author Sean Mullan
*/
public class DigesterOutputStream extends OutputStream {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DigesterOutputStream.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(DigesterOutputStream.class);
private final boolean buffer;
private UnsyncByteArrayOutputStream bos;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Fri Mar 22 11:25:01 2013
@@ -50,8 +50,8 @@ public abstract class ApacheCanonicalize
org.apache.xml.security.Init.init();
}
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ApacheCanonicalizer.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ApacheCanonicalizer.class);
protected Canonicalizer apacheCanonicalizer;
private Transform apacheTransform;
protected String inclusiveNamespaces;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java Fri Mar 22 11:25:01 2013
@@ -54,8 +54,8 @@ public abstract class ApacheTransform ex
org.apache.xml.security.Init.init();
}
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ApacheTransform.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ApacheTransform.class);
private Transform apacheTransform;
protected Document ownerDoc;
protected Element transformElem;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java Fri Mar 22 11:25:01 2013
@@ -49,8 +49,8 @@ import org.apache.jcp.xml.dsig.internal.
*/
public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DOMHMACSignatureMethod.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(DOMHMACSignatureMethod.class);
// see RFC 4051 for these algorithm definitions
static final String HMAC_SHA256 =
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java Fri Mar 22 11:25:01 2013
@@ -81,8 +81,8 @@ public final class DOMReference extends
}
});
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DOMReference.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(DOMReference.class);
private final DigestMethod digestMethod;
private final String id;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java Fri Mar 22 11:25:01 2013
@@ -43,8 +43,8 @@ import org.apache.jcp.xml.dsig.internal.
*/
public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DOMSignatureMethod.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(DOMSignatureMethod.class);
private SignatureMethodParameterSpec params;
private Signature signature;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Fri Mar 22 11:25:01 2013
@@ -53,8 +53,8 @@ public final class DOMSignedInfo extends
*/
public static final int MAXIMUM_REFERENCE_COUNT = 30;
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DOMSignedInfo.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(DOMSignedInfo.class);
/** Signature - NOT Recommended RSAwithMD5 */
private static final String ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5 =
@@ -218,7 +218,7 @@ public final class DOMSignedInfo extends
os.close();
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
// Impossible
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Fri Mar 22 11:25:01 2013
@@ -60,8 +60,8 @@ import org.apache.xml.security.utils.Bas
public final class DOMXMLSignature extends DOMStructure
implements XMLSignature {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DOMXMLSignature.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(DOMXMLSignature.class);
private String id;
private SignatureValue sv;
private KeyInfo ki;
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -55,8 +55,8 @@ public class Init {
public static final String CONF_NS = "http://www.xmlsecurity.org/NS/#configuration";
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Init.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Init.class);
/** Field alreadyInitialized */
private static boolean alreadyInitialized = false;
@@ -149,7 +149,7 @@ public class Init {
//
KeyResolver.registerDefaultResolvers();
} catch (Exception ex) {
- log.error(ex);
+ log.error(ex.getMessage(), ex);
ex.printStackTrace();
}
}
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -32,8 +32,8 @@ import org.w3c.dom.Element;
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);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(JCEMapper.class);
private static Map<String, Algorithm> algorithmsMap =
new ConcurrentHashMap<String, Algorithm>();
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -47,8 +47,8 @@ import org.w3c.dom.Element;
public class SignatureAlgorithm extends Algorithm {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignatureAlgorithm.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SignatureAlgorithm.class);
/** All available algorithm classes are registered here */
private static Map<String, Class<? extends SignatureAlgorithmSpi>> algorithmHash =
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -41,8 +41,8 @@ import org.w3c.dom.Text;
public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(IntegrityHmac.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -37,8 +37,8 @@ import org.apache.xml.security.signature
public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignatureBaseRSA.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -38,8 +38,8 @@ import org.apache.xml.security.utils.Con
public class SignatureDSA extends SignatureAlgorithmSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignatureDSA.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -44,8 +44,8 @@ import org.apache.xml.security.utils.Bas
public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignatureECDSA.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -56,8 +56,8 @@ public abstract class Canonicalizer11 ex
private static final String XMLNS_URI = Constants.NamespaceSpecNS;
private static final String XML_LANG_URI = Constants.XML_LANG_SPACE_SpecNS;
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Canonicalizer11.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Canonicalizer11.class);
private final SortedSet<Attr> result = new TreeSet<Attr>(COMPARE);
private boolean firstCall = true;
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -80,8 +80,8 @@ import org.w3c.dom.NodeList;
*/
public class XMLCipher {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLCipher.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XMLCipher.class);
/** Triple DES EDE (192 bit key) in CBC mode */
public static final String TRIPLEDES =
@@ -1425,7 +1425,7 @@ public class XMLCipher {
}
catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
}
}
@@ -1690,7 +1690,7 @@ public class XMLCipher {
key = ki.getSecretKey();
} catch (KeyResolverException kre) {
if (log.isDebugEnabled()) {
- log.debug(kre);
+ log.debug(kre.getMessage(), kre);
}
}
}
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -45,8 +45,8 @@ import org.apache.xml.security.utils.Bas
*/
public class XMLCipherInput {
- private static org.apache.commons.logging.Log logger =
- org.apache.commons.logging.LogFactory.getLog(XMLCipherInput.class);
+ private static org.slf4j.Logger logger =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -91,8 +91,8 @@ import org.w3c.dom.NodeList;
public class KeyInfo extends SignatureElementProxy {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(KeyInfo.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -38,8 +38,8 @@ import org.w3c.dom.Node;
public class X509Data extends SignatureElementProxy implements KeyInfoContent {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509Data.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(X509Data.class);
/**
* Constructor X509Data
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java Fri Mar 22 11:25:01 2013
@@ -151,7 +151,7 @@ public class XMLX509Certificate extends
}
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
}
return result;
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -31,8 +31,8 @@ import org.w3c.dom.Element;
public class XMLX509IssuerSerial extends SignatureElementProxy implements XMLX509DataContent {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLX509IssuerSerial.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -37,8 +37,8 @@ import org.w3c.dom.Element;
public class XMLX509SKI extends SignatureElementProxy implements XMLX509DataContent {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLX509SKI.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XMLX509SKI.class);
/**
* <CODE>SubjectKeyIdentifier (id-ce-subjectKeyIdentifier) (2.5.29.14)</CODE>:
@@ -165,7 +165,7 @@ public class XMLX509SKI extends Signatur
}
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
}
return result;
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -48,8 +48,8 @@ import org.w3c.dom.Node;
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);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(KeyResolver.class);
/** Field resolverVector */
private static List<KeyResolver> resolverVector = new CopyOnWriteArrayList<KeyResolver>();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java Fri Mar 22 11:25:01 2013
@@ -24,8 +24,8 @@ import org.w3c.dom.Element;
public class DEREncodedKeyValueResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DEREncodedKeyValueResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(DEREncodedKeyValueResolver.class);
/** {@inheritDoc}. */
public boolean engineCanResolve(Element element, String baseURI, StorageResolver storage) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java Fri Mar 22 11:25:01 2013
@@ -32,8 +32,8 @@ import org.w3c.dom.Element;
public class DSAKeyValueResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DSAKeyValueResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(DSAKeyValueResolver.class);
/**
@@ -73,7 +73,7 @@ public class DSAKeyValueResolver extends
return pk;
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
//do nothing
}
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -50,8 +50,8 @@ import org.w3c.dom.Element;
public class EncryptedKeyResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(RSAKeyValueResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(RSAKeyValueResolver.class);
private Key kek;
private String algorithm;
@@ -136,7 +136,7 @@ public class EncryptedKeyResolver extend
key = (SecretKey) cipher.decryptKey(ek, algorithm);
} catch (XMLEncryptionException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java Fri Mar 22 11:25:01 2013
@@ -38,8 +38,8 @@ import org.xml.sax.SAXException;
public class KeyInfoReferenceResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(KeyInfoReferenceResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(KeyInfoReferenceResolver.class);
/** {@inheritDoc}. */
public boolean engineCanResolve(Element element, String baseURI, StorageResolver storage) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java Fri Mar 22 11:25:01 2013
@@ -31,8 +31,8 @@ import org.w3c.dom.Element;
*/
public class PrivateKeyResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(PrivateKeyResolver.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(PrivateKeyResolver.class.getName());
private KeyStore keyStore;
private char[] password;
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -33,8 +33,8 @@ import org.w3c.dom.Element;
public class RSAKeyValueResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(RSAKeyValueResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -68,8 +68,8 @@ import org.xml.sax.SAXException;
public class RetrievalMethodResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(RetrievalMethodResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(RetrievalMethodResolver.class);
/**
* Method engineResolvePublicKey
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java Fri Mar 22 11:25:01 2013
@@ -20,8 +20,8 @@ import org.w3c.dom.Element;
public class SecretKeyResolver extends KeyResolverSpi
{
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SecretKeyResolver.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SecretKeyResolver.class.getName());
private KeyStore keyStore;
private char[] password;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java Fri Mar 22 11:25:01 2013
@@ -17,8 +17,8 @@ import org.w3c.dom.Element;
public class SingleKeyResolver extends KeyResolverSpi
{
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SingleKeyResolver.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SingleKeyResolver.class.getName());
private String keyName;
private PublicKey publicKey;
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -39,8 +39,8 @@ import org.w3c.dom.Element;
public class X509CertificateResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509CertificateResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(X509CertificateResolver.class);
/**
* Method engineResolvePublicKey
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java Fri Mar 22 11:25:01 2013
@@ -27,8 +27,8 @@ import org.w3c.dom.Element;
public class X509DigestResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509DigestResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(X509DigestResolver.class);
/** {@inheritDoc}. */
public boolean engineCanResolve(Element element, String baseURI, StorageResolver storage) {
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -36,8 +36,8 @@ import org.w3c.dom.Element;
public class X509IssuerSerialResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509IssuerSerialResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -36,8 +36,8 @@ import org.w3c.dom.Element;
public class X509SKIResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509SKIResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -36,8 +36,8 @@ import org.w3c.dom.Element;
public class X509SubjectNameResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(X509SubjectNameResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(X509SubjectNameResolver.class);
/**
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -35,8 +35,8 @@ import org.apache.xml.security.keys.stor
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);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(StorageResolver.class);
/** Field storageResolvers */
private 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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -44,8 +44,8 @@ import org.apache.xml.security.utils.Bas
public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(
CertsInFilesystemDirectoryResolver.class
);
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -57,8 +57,8 @@ public class Manifest extends SignatureE
public static final int MAXIMUM_REFERENCE_COUNT = 30;
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Manifest.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Manifest.class);
/** Field references */
private List<Reference> references;
@@ -371,7 +371,7 @@ public class Manifest extends SignatureE
break findManifest;
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
// Hm, seems not to be a ds:Manifest
}
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -128,8 +128,8 @@ public class Reference extends Signature
})).booleanValue();
/** {@link org.apache.commons.logging} logging facility */
- private static final org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Reference.class);
+ private static final org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Reference.class);
private Manifest manifest;
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -146,8 +146,8 @@ public final class XMLSignature extends
"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512";
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLSignature.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XMLSignature.class);
/** ds:Signature.ds:SignedInfo element */
private SignedInfo signedInfo;
@@ -603,7 +603,7 @@ public final class XMLSignature extends
so.close();
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
}
}
@@ -710,7 +710,7 @@ public final class XMLSignature extends
sigBytes = this.getSignatureValue();
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
// Impossible...
} catch (XMLSecurityException ex) {