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 [2/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/...
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java Fri Mar 22 11:25:01 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.config;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -58,7 +58,7 @@ import java.util.Map;
*/
public class XIncludeHandler extends DefaultHandler {
- private static final transient Log logger = LogFactory.getLog(XIncludeHandler.class);
+ private static final transient Logger logger = LoggerFactory.getLogger(XIncludeHandler.class);
private static final String xIncludeNS = "http://www.w3.org/2001/XInclude";
private static final String xIncludeLN = "include";
@@ -236,7 +236,7 @@ public class XIncludeHandler extends Def
@Override
public void fatalError(SAXParseException e) throws SAXException {
- logger.fatal(e.getMessage(), e);
+ logger.error(e.getMessage(), e);
}
private NodeList evaluateXPointer(String xpointer, Node node) throws SAXException {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java Fri Mar 22 11:25:01 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.stax.impl.DocumentContextImpl;
import org.apache.xml.security.stax.impl.InputProcessorChainImpl;
import org.apache.xml.security.stax.impl.SecurityContextImpl;
@@ -48,7 +48,7 @@ import java.util.List;
*/
public class InboundXMLSec {
- protected static final transient Log log = LogFactory.getLog(InboundXMLSec.class);
+ protected static final transient Logger log = LoggerFactory.getLogger(InboundXMLSec.class);
private static final XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java Fri Mar 22 11:25:01 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
@@ -36,7 +36,7 @@ import java.util.List;
*/
public class InputProcessorChainImpl implements InputProcessorChain {
- protected static final transient Log log = LogFactory.getLog(InputProcessorChainImpl.class);
+ protected static final transient Logger log = LoggerFactory.getLogger(InputProcessorChainImpl.class);
protected static final transient boolean isDebugEnabled = log.isDebugEnabled();
private List<InputProcessor> inputProcessors;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java Fri Mar 22 11:25:01 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
@@ -38,7 +38,7 @@ import java.util.List;
*/
public class OutputProcessorChainImpl implements OutputProcessorChain {
- protected static final transient Log log = LogFactory.getLog(OutputProcessorChainImpl.class);
+ protected static final transient Logger log = LoggerFactory.getLogger(OutputProcessorChainImpl.class);
protected static final transient boolean isDebugEnabled = log.isDebugEnabled();
private List<OutputProcessor> outputProcessors;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java Fri Mar 22 11:25:01 2013
@@ -19,8 +19,8 @@
package org.apache.xml.security.stax.impl.processor.input;
import org.apache.commons.codec.binary.Base64OutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
import org.apache.xml.security.binding.xmlenc.EncryptedDataType;
import org.apache.xml.security.binding.xmlenc.EncryptedKeyType;
@@ -65,7 +65,7 @@ import java.util.*;
*/
public abstract class AbstractDecryptInputProcessor extends AbstractInputProcessor {
- private static final transient Log logger = LogFactory.getLog(AbstractDecryptInputProcessor.class);
+ private static final transient Logger logger = LoggerFactory.getLogger(AbstractDecryptInputProcessor.class);
protected static final Integer maximumAllowedXMLStructureDepth =
Integer.valueOf(ConfigurationProperties.getProperty("MaximumAllowedXMLStructureDepth"));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java Fri Mar 22 11:25:01 2013
@@ -19,8 +19,8 @@
package org.apache.xml.security.stax.impl.processor.input;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.binding.excc14n.InclusiveNamespaces;
import org.apache.xml.security.binding.xmldsig.ReferenceType;
import org.apache.xml.security.binding.xmldsig.SignatureType;
@@ -56,7 +56,7 @@ import java.util.*;
*/
public abstract class AbstractSignatureReferenceVerifyInputProcessor extends AbstractInputProcessor {
- private static final transient Log logger = LogFactory.getLog(AbstractSignatureReferenceVerifyInputProcessor.class);
+ private static final transient Logger logger = LoggerFactory.getLogger(AbstractSignatureReferenceVerifyInputProcessor.class);
protected static final Integer maximumAllowedReferencesPerManifest =
Integer.valueOf(ConfigurationProperties.getProperty("MaximumAllowedReferencesPerManifest"));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/LogInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/LogInputProcessor.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/LogInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/LogInputProcessor.java Fri Mar 22 11:25:01 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.impl.processor.input;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
@@ -33,7 +33,7 @@ import java.io.StringWriter;
*/
public class LogInputProcessor extends AbstractInputProcessor {
- private static final transient Log logger = LogFactory.getLog(LogInputProcessor.class);
+ private static final transient Logger logger = LoggerFactory.getLogger(LogInputProcessor.class);
public LogInputProcessor(XMLSecurityProperties securityProperties) {
super(securityProperties);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java Fri Mar 22 11:25:01 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.impl.processor.input;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.binding.xmldsig.DigestMethodType;
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
import org.apache.xml.security.binding.xmlenc.EncryptedKeyType;
@@ -53,7 +53,7 @@ import java.util.Deque;
*/
public class XMLEncryptedKeyInputHandler extends AbstractInputSecurityHeaderHandler {
- private static final transient Log logger = LogFactory.getLog(XMLEncryptedKeyInputHandler.class);
+ private static final transient Logger logger = LoggerFactory.getLogger(XMLEncryptedKeyInputHandler.class);
@Override
public void handle(final InputProcessorChain inputProcessorChain, final XMLSecurityProperties securityProperties,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java Fri Mar 22 11:25:01 2013
@@ -23,8 +23,8 @@ import java.util.ArrayDeque;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractInputProcessor;
import org.apache.xml.security.stax.ext.InputProcessorChain;
@@ -42,7 +42,7 @@ import org.apache.xml.security.stax.ext.
*/
public class XMLSecurityInputProcessor extends AbstractInputProcessor {
- protected static final transient Log logger = LogFactory.getLog(XMLSecurityInputProcessor.class);
+ protected static final transient Logger logger = LoggerFactory.getLogger(XMLSecurityInputProcessor.class);
private final ArrayDeque<XMLSecEvent> xmlSecEventList = new ArrayDeque<XMLSecEvent>();
private int eventCount = 0;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java Fri Mar 22 11:25:01 2013
@@ -19,8 +19,8 @@
package org.apache.xml.security.stax.impl.processor.output;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
import org.apache.xml.security.stax.config.ResourceResolverMapper;
@@ -49,7 +49,7 @@ import java.util.*;
*/
public abstract class AbstractSignatureOutputProcessor extends AbstractOutputProcessor {
- private static final transient Log logger = LogFactory.getLog(AbstractSignatureOutputProcessor.class);
+ private static final transient Logger logger = LoggerFactory.getLogger(AbstractSignatureOutputProcessor.class);
private final List<SignaturePartDef> signaturePartDefList = new ArrayList<SignaturePartDef>();
private InternalSignatureOutputProcessor activeInternalSignatureOutputProcessor = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java Fri Mar 22 11:25:01 2013
@@ -19,8 +19,8 @@
package org.apache.xml.security.stax.impl.processor.output;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
import org.apache.xml.security.stax.ext.*;
@@ -52,7 +52,7 @@ import java.util.List;
*/
public class XMLEncryptOutputProcessor extends AbstractEncryptOutputProcessor {
- private static final transient Log logger = LogFactory.getLog(XMLEncryptOutputProcessor.class);
+ private static final transient Logger logger = LoggerFactory.getLogger(XMLEncryptOutputProcessor.class);
public XMLEncryptOutputProcessor() throws XMLSecurityException {
super();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java Fri Mar 22 11:25:01 2013
@@ -25,8 +25,8 @@ import javax.xml.stream.XMLStreamConstan
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Attribute;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.OutputProcessorChain;
import org.apache.xml.security.stax.ext.SecurePart;
@@ -42,7 +42,7 @@ import org.apache.xml.security.stax.impl
*/
public class XMLSignatureOutputProcessor extends AbstractSignatureOutputProcessor {
- private static final transient Log logger = LogFactory.getLog(XMLSignatureOutputProcessor.class);
+ private static final transient Logger logger = LoggerFactory.getLogger(XMLSignatureOutputProcessor.class);
public XMLSignatureOutputProcessor() throws XMLSecurityException {
super();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java Fri Mar 22 11:25:01 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.impl.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.OutputStream;
import java.security.MessageDigest;
@@ -32,7 +32,7 @@ import java.security.MessageDigest;
*/
public class DigestOutputStream extends OutputStream {
- protected static final transient Log log = LogFactory.getLog(DigestOutputStream.class);
+ protected static final transient Logger log = LoggerFactory.getLogger(DigestOutputStream.class);
protected static final transient boolean isDebugEnabled = log.isDebugEnabled();
private final MessageDigest messageDigest;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java Fri Mar 22 11:25:01 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.impl.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.impl.algorithms.SignatureAlgorithm;
@@ -31,7 +31,7 @@ import java.io.OutputStream;
*/
public class SignerOutputStream extends OutputStream {
- protected static final transient Log log = LogFactory.getLog(SignerOutputStream.class);
+ protected static final transient Logger log = LoggerFactory.getLogger(SignerOutputStream.class);
protected static final transient boolean isDebugEnabled = log.isDebugEnabled();
private final SignatureAlgorithm signatureAlgorithm;
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -66,8 +66,8 @@ import org.xml.sax.SAXException;
public final class Transform extends SignatureElementProxy {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Transform.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Transform.class);
/** All available Transform classes are registered here */
private static Map<String, Class<? extends 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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -98,8 +98,8 @@ public class Transforms extends Signatur
= "http://www.w3.org/2002/06/xmldsig-filter2";
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Transforms.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -60,8 +60,8 @@ public class TransformXSLT extends Trans
static final String defaultXSLTSpecNSprefix = "xslt";
static final String XSLTSTYLESHEET = "stylesheet";
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(TransformXSLT.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(TransformXSLT.class);
/**
* Method engineGetURI
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java Fri Mar 22 11:25:01 2013
@@ -35,8 +35,8 @@ import java.util.List;
public final class ClassLoaderUtils {
/** {@link org.apache.commons.logging} logging facility */
- private static final org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ClassLoaderUtils.class);
+ private static final org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ClassLoaderUtils.class);
private ClassLoaderUtils() {
}
@@ -121,7 +121,7 @@ public final class ClassLoaderUtils {
urls = Thread.currentThread().getContextClassLoader().getResources(resourceName);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
//ignore
}
@@ -134,7 +134,7 @@ public final class ClassLoaderUtils {
);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
// ignore
}
@@ -149,7 +149,7 @@ public final class ClassLoaderUtils {
urls = cluClassloader.getResources(resourceName);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
// ignore
}
@@ -160,7 +160,7 @@ public final class ClassLoaderUtils {
urls = cluClassloader.getResources(resourceName.substring(1));
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
// ignore
}
@@ -174,7 +174,7 @@ public final class ClassLoaderUtils {
urls = cl.getResources(resourceName);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
// ignore
}
@@ -213,7 +213,7 @@ public final class ClassLoaderUtils {
return (url != null) ? url.openStream() : null;
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
return null;
}
@@ -243,7 +243,7 @@ public final class ClassLoaderUtils {
}
} catch (ClassNotFoundException e) {
if (log.isDebugEnabled()) {
- log.debug(e);
+ log.debug(e.getMessage(), e);
}
//ignore
}
@@ -265,7 +265,7 @@ public final class ClassLoaderUtils {
}
}
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
throw ex;
}
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -27,8 +27,8 @@ import org.apache.xml.security.algorithm
*
*/
public class DigesterOutputStream extends ByteArrayOutputStream {
- private static final org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(DigesterOutputStream.class);
+ private static final org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(DigesterOutputStream.class);
final MessageDigestAlgorithm 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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -37,8 +37,8 @@ import org.w3c.dom.Text;
*/
public abstract class ElementProxy {
- protected static final org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ElementProxy.class);
+ protected static final org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ElementProxy.class);
/**
* What XML element does this ElementProxy instance wrap?
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -31,8 +31,8 @@ import org.xml.sax.SAXParseException;
public class IgnoreAllErrorHandler implements ErrorHandler {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(IgnoreAllErrorHandler.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(IgnoreAllErrorHandler.class);
/** Field throwExceptions */
private 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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -32,8 +32,8 @@ import java.io.InputStream;
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);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(JavaUtils.class);
private JavaUtils() {
// we don't allow instantiation
@@ -105,7 +105,7 @@ public class JavaUtils {
fos.close();
} catch (IOException ioe) {
if (log.isDebugEnabled()) {
- log.debug(ioe);
+ log.debug(ioe.getMessage(), ioe);
}
}
}
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -28,8 +28,8 @@ 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);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SignerOutputStream.class);
final SignatureAlgorithm sa;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java Fri Mar 22 11:25:01 2013
@@ -61,8 +61,8 @@ public class XMLUtils {
private static volatile String xenc11Prefix = "xenc11";
/** {@link org.apache.commons.logging} logging facility */
- private static final org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLUtils.class);
+ private static final org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XMLUtils.class);
/**
@@ -200,16 +200,16 @@ public class XMLUtils {
);
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
}
catch (InvalidCanonicalizerException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
} catch (CanonicalizationException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
}
}
@@ -234,17 +234,17 @@ public class XMLUtils {
);
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
// throw new RuntimeException(ex.getMessage());
} catch (InvalidCanonicalizerException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
// throw new RuntimeException(ex.getMessage());
} catch (CanonicalizationException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
// throw new RuntimeException(ex.getMessage());
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java Fri Mar 22 11:25:01 2013
@@ -44,8 +44,8 @@ import org.w3c.dom.NodeList;
*/
public class XalanXPathAPI implements XPathAPI {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XalanXPathAPI.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XalanXPathAPI.class);
private String xpathStr = null;
@@ -152,7 +152,7 @@ public class XalanXPathAPI implements XP
xpath = (XPath) constructor.newInstance(objects);
} catch (Exception ex) {
if (log.isDebugEnabled()) {
- log.debug(ex);
+ log.debug(ex.getMessage(), ex);
}
}
if (xpath == null) {
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -38,8 +38,8 @@ import org.w3c.dom.Attr;
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);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ResourceResolver.class);
/** these are the system-wide resolvers */
private static List<ResourceResolver> resolverList = new ArrayList<ResourceResolver>();
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -31,8 +31,8 @@ import org.apache.xml.security.signature
public abstract class ResourceResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResourceResolverSpi.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -58,8 +58,8 @@ import org.apache.xml.security.utils.res
public class ResolverDirectHTTP extends ResourceResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResolverDirectHTTP.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -38,8 +38,8 @@ import org.w3c.dom.Node;
public class ResolverFragment extends ResourceResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResolverFragment.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -35,8 +35,8 @@ public class ResolverLocalFilesystem ext
private static final int FILE_URI_LENGTH = "file:/".length();
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResolverLocalFilesystem.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ResolverLocalFilesystem.class);
@Override
public boolean engineIsThreadSafe() {
@@ -127,7 +127,7 @@ public class ResolverLocalFilesystem ext
}
} catch (Exception 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/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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -45,8 +45,8 @@ import org.w3c.dom.Node;
public class ResolverXPointer extends ResourceResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ResolverXPointer.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -36,8 +36,8 @@ import org.apache.jcp.xml.dsig.internal.
*/
public class ClassLoaderTest extends org.junit.Assert {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ClassLoaderTest.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ClassLoaderTest.class);
@org.junit.Test
public void testMultipleLoaders() throws Exception {
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=1459726&r1=1459725&r2=1459726&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 Fri Mar 22 11:25:01 2013
@@ -27,8 +27,8 @@ import javax.xml.crypto.dsig.spec.C14NMe
*/
public class Driver {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Driver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Driver.class);
public void dsig() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java Fri Mar 22 11:25:01 2013
@@ -31,8 +31,8 @@ import org.w3c.dom.Document;
public class SignatureAlgorithmTest extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(SignatureAlgorithmTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SignatureAlgorithmTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java Fri Mar 22 11:25:01 2013
@@ -27,8 +27,8 @@ import org.apache.xml.security.c14n.help
public class C14nHelperTest extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(C14nHelperTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(C14nHelperTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java Fri Mar 22 11:25:01 2013
@@ -51,8 +51,8 @@ import org.xml.sax.SAXException;
public class Canonicalizer11Test extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Canonicalizer11Test.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Canonicalizer11Test.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java Fri Mar 22 11:25:01 2013
@@ -67,8 +67,8 @@ public class Canonicalizer20010315Exclus
}
/** {@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(
Canonicalizer20010315ExclusiveTest.class.getName()
);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Fri Mar 22 11:25:01 2013
@@ -64,8 +64,8 @@ import org.xml.sax.SAXException;
public class Canonicalizer20010315Test extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Canonicalizer20010315Test.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Canonicalizer20010315Test.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java Fri Mar 22 11:25:01 2013
@@ -35,8 +35,8 @@ import org.w3c.dom.Element;
public class ExclusiveC14NInteropTest extends InteropTestBase {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ExclusiveC14NInteropTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ExclusiveC14NInteropTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java Fri Mar 22 11:25:01 2013
@@ -74,8 +74,8 @@ public class BaltimoreEncTest extends or
private boolean haveKeyWraps;
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(BaltimoreEncTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(BaltimoreEncTest.class.getName());
/**
* Constructor BaltimoreEncTest
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java Fri Mar 22 11:25:01 2013
@@ -40,8 +40,8 @@ import org.w3c.dom.Element;
public class BobKeyResolver extends KeyResolverSpi {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(BobKeyResolver.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(BobKeyResolver.class.getName());
private KeyName _kn = null;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java Fri Mar 22 11:25:01 2013
@@ -43,8 +43,8 @@ import org.w3c.dom.NodeList;
public class EncryptContentTest extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(EncryptContentTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(EncryptContentTest.class.getName());
private static final String DATA =
"<users>\n" +
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java Fri Mar 22 11:25:01 2013
@@ -33,8 +33,8 @@ import org.w3c.dom.Element;
public class ReferenceListTest extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ReferenceListTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ReferenceListTest.class.getName());
private DocumentBuilder db;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java Fri Mar 22 11:25:01 2013
@@ -62,8 +62,8 @@ import org.w3c.dom.NodeList;
public class XMLCipherTest extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLCipherTest.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XMLCipherTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java Fri Mar 22 11:25:01 2013
@@ -72,8 +72,8 @@ public class XMLEncryption11Test extends
private boolean haveISOPadding;
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLEncryption11Test.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XMLEncryption11Test.class.getName());
/**
* Constructor XMLEncryption11Test
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java Fri Mar 22 11:25:01 2013
@@ -33,8 +33,8 @@ import org.apache.xml.security.signature
public class BaltimoreTest extends InteropTestBase {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(BaltimoreTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(BaltimoreTest.class.getName());
/** Field merlinsDir15 */
static String merlinsDir15 =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java Fri Mar 22 11:25:01 2013
@@ -34,8 +34,8 @@ import org.apache.xml.security.utils.res
public class IAIKTest extends InteropTestBase {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(IAIKTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(IAIKTest.class.getName());
/** Field gregorsDir */
static String gregorsDir = "src/test/resources/at/iaik/ixsil/";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java Fri Mar 22 11:25:01 2013
@@ -47,8 +47,8 @@ import org.apache.xml.security.utils.res
public class IBMTest extends InteropTestBase {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(IBMTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(IBMTest.class.getName());
/** Field kentsDir */
static final String kentsDir = "data/com/ibm/xss4j-20030127/";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java Fri Mar 22 11:25:01 2013
@@ -42,8 +42,8 @@ import org.w3c.dom.Node;
public class InteropTestBase extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(InteropTestBase.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(InteropTestBase.class.getName());
/** Field dbf */
static javax.xml.parsers.DocumentBuilderFactory dbf = null;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java Fri Mar 22 11:25:01 2013
@@ -33,8 +33,8 @@ import org.apache.xml.security.utils.res
public class RSASecurityTest extends InteropTestBase {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(RSASecurityTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(RSASecurityTest.class.getName());
/** Field blakesDir */
static String blakesDir =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java Fri Mar 22 11:25:01 2013
@@ -36,8 +36,8 @@ import org.xml.sax.InputSource;
public class TestVectorResolver implements EntityResolver {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(TestVectorResolver.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(TestVectorResolver.class.getName());
/** Field alreadyInitialized */
static boolean alreadyInitialized = false;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java Fri Mar 22 11:25:01 2013
@@ -33,8 +33,8 @@ import org.w3c.dom.Element;
public class ForbiddenAlgorithmTest extends InteropTestBase {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ForbiddenAlgorithmTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ForbiddenAlgorithmTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java Fri Mar 22 11:25:01 2013
@@ -33,8 +33,8 @@ import org.w3c.dom.Element;
public class ForbiddenRefCountTest extends InteropTestBase {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ForbiddenRefCountTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ForbiddenRefCountTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java Fri Mar 22 11:25:01 2013
@@ -33,8 +33,8 @@ import org.w3c.dom.Element;
public class ForbiddenReferenceTest extends InteropTestBase {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ForbiddenReferenceTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ForbiddenReferenceTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java Fri Mar 22 11:25:01 2013
@@ -33,8 +33,8 @@ import org.w3c.dom.Element;
public class WrappingAttackTest extends InteropTestBase {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(WrappingAttackTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(WrappingAttackTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java Fri Mar 22 11:25:01 2013
@@ -55,8 +55,8 @@ import org.w3c.dom.Element;
public class CreateSignatureTest extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(CreateSignatureTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateSignatureTest.class.getName());
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java Fri Mar 22 11:25:01 2013
@@ -52,8 +52,8 @@ import org.w3c.dom.Element;
public class ECDSASignatureTest extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(ECDSASignatureTest.class.getName());
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(ECDSASignatureTest.class.getName());
private static final String BASEDIR = System.getProperty("basedir");
private static final String SEP = System.getProperty("file.separator");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java Fri Mar 22 11:25:01 2013
@@ -34,8 +34,8 @@ import org.apache.xml.security.utils.Con
public class HMACOutputLengthTest extends org.junit.Assert {
/** {@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
(HMACOutputLengthTest.class.getName());
private static DocumentBuilderFactory dbf = null;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java Fri Mar 22 11:25:01 2013
@@ -36,8 +36,8 @@ import org.apache.xml.security.signature
public class XMLSignatureInputTest extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XMLSignatureInputTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XMLSignatureInputTest.class.getName());
static final String _octetStreamTextInput = "Kleiner Test";
static final String _nodeSetInput1 =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java Fri Mar 22 11:25:01 2013
@@ -44,8 +44,8 @@ import org.w3c.dom.NodeList;
* @author wglas
*/
public class XPointerResourceResolver extends ResourceResolverSpi {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(XPointerResourceResolver.class);
+ private static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(XPointerResourceResolver.class);
private static final String XP_OPEN = "xpointer(";
private static final String XNS_OPEN = "xmlns(";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java Fri Mar 22 11:25:01 2013
@@ -54,8 +54,8 @@ public class XmlSecTest extends org.juni
private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger
(XmlSecTest.class.getName());
@org.junit.Test
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java Fri Mar 22 11:25:01 2013
@@ -42,8 +42,8 @@ import org.w3c.dom.Node;
public class TransformBase64DecodeTest extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(TransformBase64DecodeTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(TransformBase64DecodeTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java Fri Mar 22 11:25:01 2013
@@ -49,8 +49,8 @@ public class TransformXSLTTest extends o
private static final String STYLESHEET_FILE = "document-stylesheet.xml";
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(TransformXSLTTest.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(TransformXSLTTest.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java Fri Mar 22 11:25:01 2013
@@ -32,8 +32,8 @@ import org.apache.xml.security.utils.XML
public class Base64Test extends org.junit.Assert {
/** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(Base64Test.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(Base64Test.class.getName());
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java Fri Mar 22 11:25:01 2013
@@ -44,8 +44,8 @@ import org.apache.xml.security.utils.res
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/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java?rev=1459726&r1=1459725&r2=1459726&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java Fri Mar 22 11:25:01 2013
@@ -33,8 +33,8 @@ import org.apache.xml.security.utils.res
public class ResourceResolverTest extends org.junit.Assert {
/** {@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
(ResourceResolverTest.class.getName());
static {