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 2017/02/13 13:22:39 UTC
svn commit: r1782767 [3/4] - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/
main/java/org/apache/xml/security/algorithms/ main/ja...
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -59,7 +59,7 @@ import java.util.*;
*/
public abstract class AbstractSignatureReferenceVerifyInputProcessor extends AbstractInputProcessor {
- private static final transient Logger log = LoggerFactory.getLogger(AbstractSignatureReferenceVerifyInputProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(AbstractSignatureReferenceVerifyInputProcessor.class);
protected static final Integer maximumAllowedReferencesPerManifest =
Integer.valueOf(ConfigurationProperties.getProperty("MaximumAllowedReferencesPerManifest"));
@@ -386,8 +386,8 @@ public abstract class AbstractSignatureR
protected void compareDigest(byte[] calculatedDigest, ReferenceType referenceType) throws XMLSecurityException {
if (log.isDebugEnabled()) {
- log.debug("Calculated Digest: " + new String(Base64.encodeBase64(calculatedDigest)));
- log.debug("Stored Digest: " + new String(Base64.encodeBase64(referenceType.getDigestValue())));
+ LOG.debug("Calculated Digest: " + new String(Base64.encodeBase64(calculatedDigest)));
+ LOG.debug("Stored Digest: " + new String(Base64.encodeBase64(referenceType.getDigestValue())));
}
if (!MessageDigest.isEqual(referenceType.getDigestValue(), calculatedDigest)) {
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -33,7 +33,7 @@ import java.io.StringWriter;
*/
public class LogInputProcessor extends AbstractInputProcessor {
- private static final transient Logger log = LoggerFactory.getLogger(LogInputProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(LogInputProcessor.class);
public LogInputProcessor(XMLSecurityProperties securityProperties) {
super(securityProperties);
@@ -52,7 +52,7 @@ public class LogInputProcessor extends A
XMLSecEvent xmlSecEvent = inputProcessorChain.processEvent();
StringWriter stringWriter = new StringWriter();
xmlSecEvent.writeAsEncodedUnicode(stringWriter);
- log.trace(stringWriter.toString());
+ LOG.trace(stringWriter.toString());
return xmlSecEvent;
}
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -57,7 +57,7 @@ import java.util.Deque;
*/
public class XMLEncryptedKeyInputHandler extends AbstractInputSecurityHeaderHandler {
- private static final transient Logger log = LoggerFactory.getLogger(XMLEncryptedKeyInputHandler.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XMLEncryptedKeyInputHandler.class);
@Override
public void handle(final InputProcessorChain inputProcessorChain, final XMLSecurityProperties securityProperties,
@@ -245,7 +245,7 @@ public class XMLEncryptedKeyInputHandler
} catch (IllegalStateException e) {
throw new XMLSecurityException(e);
} catch (Exception e) {
- log.warn("Unwrapping of the encrypted key failed with error: " + e.getMessage() + ". " +
+ LOG.warn("Unwrapping of the encrypted key failed with error: " + e.getMessage() + ". " +
"Generating a faked one to mitigate timing attacks.");
int keyLength = JCEAlgorithmMapper.getKeyLengthFromURI(symmetricAlgorithmURI);
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -49,7 +49,7 @@ import java.util.*;
*/
public abstract class AbstractSignatureOutputProcessor extends AbstractOutputProcessor {
- private static final transient Logger log = LoggerFactory.getLogger(AbstractSignatureOutputProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(AbstractSignatureOutputProcessor.class);
private final List<SignaturePartDef> signaturePartDefList = new ArrayList<>();
private InternalSignatureOutputProcessor activeInternalSignatureOutputProcessor;
@@ -129,7 +129,7 @@ public abstract class AbstractSignatureO
String calculatedDigest = new String(Base64.encodeBase64(digestOutputStream.getDigestValue()));
if (log.isDebugEnabled()) {
- log.debug("Calculated Digest: " + calculatedDigest);
+ LOG.debug("Calculated Digest: " + calculatedDigest);
}
signaturePartDef.setDigestValue(calculatedDigest);
@@ -295,7 +295,7 @@ public abstract class AbstractSignatureO
}
String calculatedDigest = new String(Base64.encodeBase64(this.digestOutputStream.getDigestValue()));
if (log.isDebugEnabled()) {
- log.debug("Calculated Digest: " + calculatedDigest);
+ LOG.debug("Calculated Digest: " + calculatedDigest);
}
signaturePartDef.setDigestValue(calculatedDigest);
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -56,7 +56,7 @@ import java.util.List;
*/
public class XMLEncryptOutputProcessor extends AbstractEncryptOutputProcessor {
- private static final transient Logger log = LoggerFactory.getLogger(XMLEncryptOutputProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XMLEncryptOutputProcessor.class);
public XMLEncryptOutputProcessor() throws XMLSecurityException {
super();
@@ -71,7 +71,7 @@ public class XMLEncryptOutputProcessor e
if (getActiveInternalEncryptionOutputProcessor() == null) {
SecurePart securePart = securePartMatches(xmlSecStartElement, outputProcessorChain, XMLSecurityConstants.ENCRYPTION_PARTS);
if (securePart != null) {
- log.debug("Matched encryptionPart for encryption");
+ LOG.debug("Matched encryptionPart for encryption");
String tokenId = outputProcessorChain.getSecurityContext().get(
XMLSecurityConstants.PROP_USE_THIS_TOKEN_ID_FOR_ENCRYPTION);
SecurityTokenProvider<OutboundSecurityToken> securityTokenProvider =
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -42,7 +42,7 @@ import org.apache.xml.security.stax.impl
*/
public class XMLSignatureOutputProcessor extends AbstractSignatureOutputProcessor {
- private static final transient Logger log = LoggerFactory.getLogger(XMLSignatureOutputProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XMLSignatureOutputProcessor.class);
public XMLSignatureOutputProcessor() throws XMLSecurityException {
super();
@@ -66,7 +66,7 @@ public class XMLSignatureOutputProcessor
if (getActiveInternalSignatureOutputProcessor() == null) {
SecurePart securePart = securePartMatches(xmlSecStartElement, outputProcessorChain, XMLSecurityConstants.SIGNATURE_PARTS);
if (securePart != null) {
- log.debug("Matched securePart for signature");
+ LOG.debug("Matched securePart for signature");
InternalSignatureOutputProcessor internalSignatureOutputProcessor = null;
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -33,8 +33,8 @@ import org.slf4j.LoggerFactory;
*/
public class DigestOutputStream extends OutputStream {
- protected static final transient Logger log = LoggerFactory.getLogger(DigestOutputStream.class);
- protected static final transient boolean isDebugEnabled = log.isDebugEnabled();
+ protected static final transient Logger LOG = LoggerFactory.getLogger(DigestOutputStream.class);
+ protected static final transient boolean isDebugEnabled = LOG.isDebugEnabled();
private final MessageDigest messageDigest;
private StringBuilder stringBuilder;
@@ -67,16 +67,16 @@ public class DigestOutputStream extends
try {
stringBuilder.append(new String(arg0, arg1, arg2, "UTF-8"));
} catch (UnsupportedEncodingException e) {
- log.warn(e.toString(), e);//UTF-8 is mandatory actually
+ LOG.warn(e.toString(), e);//UTF-8 is mandatory actually
}
}
}
public byte[] getDigestValue() {
if (isDebugEnabled) {
- log.debug("Pre Digest: ");
- log.debug(stringBuilder.toString());
- log.debug("End pre Digest ");
+ LOG.debug("Pre Digest: ");
+ LOG.debug(stringBuilder.toString());
+ LOG.debug("End pre Digest ");
stringBuilder = new StringBuilder();
}
return messageDigest.digest();
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory;
*/
public class SignerOutputStream extends OutputStream {
- protected static final transient Logger log = LoggerFactory.getLogger(SignerOutputStream.class);
- protected static final transient boolean isDebugEnabled = log.isDebugEnabled();
+ protected static final transient Logger LOG = LoggerFactory.getLogger(SignerOutputStream.class);
+ protected static final transient boolean isDebugEnabled = LOG.isDebugEnabled();
private final SignatureAlgorithm signatureAlgorithm;
private StringBuilder stringBuilder;
@@ -73,15 +73,15 @@ public class SignerOutputStream extends
} catch (XMLSecurityException e) {
throw new RuntimeException(e);
} catch (UnsupportedEncodingException e) {
- log.warn(e.toString(), e);//UTF-8 is mandatory actually
+ LOG.warn(e.toString(), e);//UTF-8 is mandatory actually
}
}
public boolean verify(byte[] signatureValue) throws XMLSecurityException {
if (isDebugEnabled) {
- log.debug("Pre Signed: ");
- log.debug(stringBuilder.toString());
- log.debug("End pre Signed ");
+ LOG.debug("Pre Signed: ");
+ LOG.debug(stringBuilder.toString());
+ LOG.debug("End pre Signed ");
stringBuilder = new StringBuilder();
}
return signatureAlgorithm.engineVerify(signatureValue);
@@ -89,9 +89,9 @@ public class SignerOutputStream extends
public byte[] sign() throws XMLSecurityException {
if (isDebugEnabled) {
- log.debug("Pre Signed: ");
- log.debug(stringBuilder.toString());
- log.debug("End pre Signed ");
+ LOG.debug("Pre Signed: ");
+ LOG.debug(stringBuilder.toString());
+ LOG.debug("End pre Signed ");
stringBuilder = new StringBuilder();
}
return signatureAlgorithm.engineSign();
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -66,7 +66,7 @@ import org.xml.sax.SAXException;
*/
public final class Transform extends SignatureElementProxy {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Transform.class);
/** All available Transform classes are registered here */
@@ -357,9 +357,9 @@ public final class Transform extends Sig
}
if (log.isDebugEnabled()) {
- log.debug("Create URI \"" + algorithmURI + "\" class \""
+ LOG.debug("Create URI \"" + algorithmURI + "\" class \""
+ newTransformSpi.getClass() + "\"");
- log.debug("The NodeList is " + contextNodes);
+ LOG.debug("The NodeList is " + contextNodes);
}
// give it to the current document
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -97,7 +97,7 @@ public class Transforms extends Signatur
public static final String TRANSFORM_XPATH2FILTER
= "http://www.w3.org/2002/06/xmldsig-filter2";
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Transforms.class);
private Element[] transforms;
@@ -162,7 +162,7 @@ public class Transforms extends Signatur
public void addTransform(String transformURI) throws TransformationException {
try {
if (log.isDebugEnabled()) {
- log.debug("Transforms.addTransform(" + transformURI + ")");
+ LOG.debug("Transforms.addTransform(" + transformURI + ")");
}
Transform transform = new Transform(getDocument(), transformURI);
@@ -186,7 +186,7 @@ public class Transforms extends Signatur
throws TransformationException {
try {
if (log.isDebugEnabled()) {
- log.debug("Transforms.addTransform(" + transformURI + ")");
+ LOG.debug("Transforms.addTransform(" + transformURI + ")");
}
Transform transform = new Transform(getDocument(), transformURI, contextElement);
@@ -224,7 +224,7 @@ public class Transforms extends Signatur
*/
private void addTransform(Transform transform) {
if (log.isDebugEnabled()) {
- log.debug("Transforms.addTransform(" + transform.getURI() + ")");
+ LOG.debug("Transforms.addTransform(" + transform.getURI() + ")");
}
Element transformElement = transform.getElement();
@@ -265,7 +265,7 @@ public class Transforms extends Signatur
Transform t = this.item(i);
if (log.isDebugEnabled()) {
String uri = t.getURI();
- log.debug("Perform the (" + i + ")th " + uri + " transform");
+ LOG.debug("Perform the (" + i + ")th " + uri + " transform");
}
checkSecureValidation(t);
xmlSignatureInput = t.performTransform(xmlSignatureInput);
@@ -274,7 +274,7 @@ public class Transforms extends Signatur
Transform t = this.item(last);
if (log.isDebugEnabled()) {
String uri = t.getURI();
- log.debug("Perform the (" + last + ")th " + uri + " transform");
+ LOG.debug("Perform the (" + last + ")th " + uri + " transform");
}
checkSecureValidation(t);
xmlSignatureInput = t.performTransform(xmlSignatureInput, os);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java Mon Feb 13 13:22:37 2017
@@ -53,7 +53,7 @@ import org.apache.xml.security.utils.Jav
* <p>This transform requires an octet stream for input.
* If an XPath node-set (or sufficiently functional alternative) is
* given as input, then it is converted to an octet stream by
- * performing operations logically equivalent to 1) applying an XPath
+ * performing operations LOGically equivalent to 1) applying an XPath
* transform with expression self::text(), then 2) taking the string-value
* of the node-set. Thus, if an XML element is identified by a barename
* XPointer in the Reference URI, and its content consists solely of base64
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -61,7 +61,7 @@ public class TransformXSLT extends Trans
static final String defaultXSLTSpecNSprefix = "xslt";
static final String XSLTSTYLESHEET = "stylesheet";
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(TransformXSLT.class);
/**
@@ -131,7 +131,7 @@ public class TransformXSLT extends Trans
try {
transformer.setOutputProperty("{http://xml.apache.org/xalan}line-separator", "\n");
} catch (Exception e) {
- log.warn("Unable to set Xalan line-separator property: " + e.getMessage());
+ LOG.warn("Unable to set Xalan line-separator property: " + e.getMessage());
}
try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -34,7 +34,7 @@ import java.util.List;
*/
public final class ClassLoaderUtils {
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ClassLoaderUtils.class);
private ClassLoaderUtils() {
@@ -120,7 +120,7 @@ public final class ClassLoaderUtils {
urls = Thread.currentThread().getContextClassLoader().getResources(resourceName);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
//ignore
}
@@ -133,7 +133,7 @@ public final class ClassLoaderUtils {
);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
// ignore
}
@@ -148,7 +148,7 @@ public final class ClassLoaderUtils {
urls = cluClassloader.getResources(resourceName);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
// ignore
}
@@ -159,7 +159,7 @@ public final class ClassLoaderUtils {
urls = cluClassloader.getResources(resourceName.substring(1));
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
// ignore
}
@@ -173,7 +173,7 @@ public final class ClassLoaderUtils {
urls = cl.getResources(resourceName);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
// ignore
}
@@ -212,7 +212,7 @@ public final class ClassLoaderUtils {
return (url != null) ? url.openStream() : null;
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
return null;
}
@@ -242,7 +242,7 @@ public final class ClassLoaderUtils {
}
} catch (ClassNotFoundException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
//ignore
}
@@ -264,7 +264,7 @@ public final class ClassLoaderUtils {
}
}
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), 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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -27,7 +27,7 @@ import org.apache.xml.security.algorithm
*
*/
public class DigesterOutputStream extends ByteArrayOutputStream {
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DigesterOutputStream.class);
final MessageDigestAlgorithm mda;
@@ -52,12 +52,12 @@ public class DigesterOutputStream extend
/** @inheritDoc */
public void write(byte[] arg0, int arg1, int arg2) {
if (log.isDebugEnabled()) {
- log.debug("Pre-digested input:");
+ LOG.debug("Pre-digested input:");
StringBuilder sb = new StringBuilder(arg2);
for (int i = arg1; i < (arg1 + arg2); i++) {
sb.append((char)arg0[i]);
}
- log.debug(sb.toString());
+ LOG.debug(sb.toString());
}
mda.update(arg0, arg1, arg2);
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -37,7 +37,7 @@ import org.w3c.dom.Text;
*/
public abstract class ElementProxy {
- protected static final org.slf4j.Logger log =
+ protected static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ElementProxy.class);
/**
@@ -88,7 +88,7 @@ public abstract class ElementProxy {
}
if (log.isDebugEnabled()) {
- log.debug("setElement(\"" + element.getTagName() + "\", \"" + baseURI + "\")");
+ LOG.debug("setElement(\"" + element.getTagName() + "\", \"" + baseURI + "\")");
}
setElement(element);
@@ -178,7 +178,7 @@ public abstract class ElementProxy {
}
if (log.isDebugEnabled()) {
- log.debug("setElement(" + element.getTagName() + ", \"" + baseURI + "\"");
+ LOG.debug("setElement(" + element.getTagName() + ", \"" + baseURI + "\"");
}
setElement(element);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java?rev=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -23,14 +23,14 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
/**
- * This {@link org.xml.sax.ErrorHandler} does absolutely nothing but log
+ * This {@link org.xml.sax.ErrorHandler} does absolutely nothing but LOG
* the events.
*
* @author Christian Geuer-Pollmann
*/
public class IgnoreAllErrorHandler implements ErrorHandler {
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(IgnoreAllErrorHandler.class);
/** Field throwExceptions */
@@ -56,7 +56,7 @@ public class IgnoreAllErrorHandler imple
@Override
public void warning(SAXParseException ex) throws SAXException {
if (IgnoreAllErrorHandler.warnOnExceptions) {
- log.warn("", ex);
+ LOG.warn("", ex);
}
if (IgnoreAllErrorHandler.throwExceptions) {
throw ex;
@@ -68,7 +68,7 @@ public class IgnoreAllErrorHandler imple
@Override
public void error(SAXParseException ex) throws SAXException {
if (IgnoreAllErrorHandler.warnOnExceptions) {
- log.error("", ex);
+ LOG.error("", ex);
}
if (IgnoreAllErrorHandler.throwExceptions) {
throw ex;
@@ -80,7 +80,7 @@ public class IgnoreAllErrorHandler imple
@Override
public void fatalError(SAXParseException ex) throws SAXException {
if (IgnoreAllErrorHandler.warnOnExceptions) {
- log.warn("", ex);
+ LOG.warn("", ex);
}
if (IgnoreAllErrorHandler.throwExceptions) {
throw ex;
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -32,7 +32,7 @@ import java.security.SecurityPermission;
*/
public final class JavaUtils {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(JavaUtils.class);
private static final SecurityPermission REGISTER_PERMISSION =
@@ -84,12 +84,12 @@ public final class JavaUtils {
fos.write(bytes);
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
}
} else {
if (log.isDebugEnabled()) {
- log.debug("writeBytesToFilename got null byte[] pointed");
+ LOG.debug("writeBytesToFilename got null byte[] pointed");
}
}
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -28,7 +28,7 @@ import org.apache.xml.security.signature
*
*/
public class SignerOutputStream extends ByteArrayOutputStream {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignerOutputStream.class);
final SignatureAlgorithm sa;
@@ -61,12 +61,12 @@ public class SignerOutputStream extends
/** @inheritDoc */
public void write(byte[] arg0, int arg1, int arg2) {
if (log.isDebugEnabled()) {
- log.debug("Canonicalized SignedInfo:");
+ LOG.debug("Canonicalized SignedInfo:");
StringBuilder sb = new StringBuilder(arg2);
for (int i = arg1; i < (arg1 + arg2); i++) {
sb.append((char)arg0[i]);
}
- log.debug(sb.toString());
+ LOG.debug(sb.toString());
}
try {
sa.update(arg0, arg1, arg2);
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -82,7 +82,7 @@ public final class XMLUtils {
private static volatile String xencPrefix = "xenc";
private static volatile String xenc11Prefix = "xenc11";
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLUtils.class);
@@ -234,16 +234,16 @@ public final class XMLUtils {
);
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
}
catch (InvalidCanonicalizerException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
} catch (CanonicalizationException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
}
}
@@ -268,17 +268,17 @@ public final class XMLUtils {
);
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
// throw new RuntimeException(ex.getMessage());
} catch (InvalidCanonicalizerException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
// throw new RuntimeException(ex.getMessage());
} catch (CanonicalizationException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
// throw new RuntimeException(ex.getMessage());
}
@@ -973,7 +973,7 @@ public final class XMLUtils {
// Continue searching to find duplicates
foundElement = attr.getOwnerElement();
} else {
- log.debug("Multiple elements with the same 'Id' attribute value!");
+ LOG.debug("Multiple elements with the same 'Id' attribute value!");
return false;
}
}
@@ -1033,7 +1033,7 @@ public final class XMLUtils {
for (int i = 0; i < length; i++) {
Attr attr = (Attr)attributes.item(i);
if (attr.isId() && id.equals(attr.getValue()) && se != knownElement) {
- log.debug("Multiple elements with the same 'Id' attribute value!");
+ LOG.debug("Multiple elements with the same 'Id' attribute value!");
return false;
}
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -44,7 +44,7 @@ import org.w3c.dom.NodeList;
*/
public class XalanXPathAPI implements XPathAPI {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XalanXPathAPI.class);
private String xpathStr;
@@ -152,7 +152,7 @@ public class XalanXPathAPI implements XP
xpath = (XPath) constructor.newInstance(objects);
} catch (Exception ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
}
if (xpath == null) {
@@ -165,13 +165,13 @@ public class XalanXPathAPI implements XP
installed = false;
if (new FunctionTable().functionAvailable("here")) {
if (log.isDebugEnabled()) {
- log.debug("Here function already registered");
+ LOG.debug("Here function already registered");
}
installed = true;
return;
}
if (log.isDebugEnabled()) {
- log.debug("Registering Here function");
+ LOG.debug("Registering Here function");
}
/**
* Try to register our here() implementation as internal function.
@@ -185,7 +185,7 @@ public class XalanXPathAPI implements XP
installed = true;
}
} catch (Exception ex) {
- log.debug("Error installing function using the static installFunction method", ex);
+ LOG.debug("Error installing function using the static installFunction method", ex);
}
if (!installed) {
try {
@@ -196,15 +196,15 @@ public class XalanXPathAPI implements XP
installFunction.invoke(funcTable, params);
installed = true;
} catch (Exception ex) {
- log.debug("Error installing function using the static installFunction method", ex);
+ LOG.debug("Error installing function using the static installFunction method", ex);
}
}
if (log.isDebugEnabled()) {
if (installed) {
- log.debug("Registered class " + FuncHere.class.getName()
+ LOG.debug("Registered class " + FuncHere.class.getName()
+ " for XPath function 'here()' function in internal table");
} else {
- log.debug("Unable to register class " + FuncHere.class.getName()
+ LOG.debug("Unable to register class " + FuncHere.class.getName()
+ " for XPath function 'here()' function in internal table");
}
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -39,7 +39,7 @@ import org.w3c.dom.Attr;
*/
public class ResourceResolver {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ResourceResolver.class);
/** these are the system-wide resolvers */
@@ -91,7 +91,7 @@ public class ResourceResolver {
}
if (log.isDebugEnabled()) {
- log.debug(
+ LOG.debug(
"check resolvability by class " + resolverTmp.getClass().getName()
);
}
@@ -148,7 +148,7 @@ public class ResourceResolver {
Attr uri, String baseURI, List<ResourceResolver> individualResolvers, boolean secureValidation
) throws ResourceResolverException {
if (log.isDebugEnabled()) {
- log.debug(
+ LOG.debug(
"I was asked to create a ResourceResolver and got "
+ (individualResolvers == null ? 0 : individualResolvers.size())
);
@@ -164,7 +164,7 @@ public class ResourceResolver {
if (resolver != null) {
if (log.isDebugEnabled()) {
String currentClass = resolver.resolverSpi.getClass().getName();
- log.debug("check resolvability by class " + currentClass);
+ LOG.debug("check resolvability by class " + currentClass);
}
if (resolver.canResolve(context)) {
@@ -178,7 +178,7 @@ public class ResourceResolver {
}
/**
- * Registers a ResourceResolverSpi class. This method logs a warning if
+ * Registers a ResourceResolverSpi class. This method LOGs a warning if
* the class cannot be registered.
*
* @param className the name of the ResourceResolverSpi class to be registered
@@ -194,13 +194,13 @@ public class ResourceResolver {
ClassLoaderUtils.loadClass(className, ResourceResolver.class);
register(resourceResolverClass, false);
} catch (ClassNotFoundException e) {
- log.warn("Error loading resolver " + className + " disabling it");
+ LOG.warn("Error loading resolver " + className + " disabling it");
}
}
/**
* Registers a ResourceResolverSpi class at the beginning of the provider
- * list. This method logs a warning if the class cannot be registered.
+ * list. This method LOGs a warning if the class cannot be registered.
*
* @param className the name of the ResourceResolverSpi class to be registered
* @throws SecurityException if a security manager is installed and the
@@ -215,12 +215,12 @@ public class ResourceResolver {
ClassLoaderUtils.loadClass(className, ResourceResolver.class);
register(resourceResolverClass, true);
} catch (ClassNotFoundException e) {
- log.warn("Error loading resolver " + className + " disabling it");
+ LOG.warn("Error loading resolver " + className + " disabling it");
}
}
/**
- * Registers a ResourceResolverSpi class. This method logs a warning if the class
+ * Registers a ResourceResolverSpi class. This method LOGs a warning if the class
* cannot be registered.
* @param className
* @param start
@@ -233,14 +233,14 @@ public class ResourceResolver {
ResourceResolverSpi resourceResolverSpi = className.newInstance();
register(resourceResolverSpi, start);
} catch (IllegalAccessException e) {
- log.warn("Error loading resolver " + className + " disabling it");
+ LOG.warn("Error loading resolver " + className + " disabling it");
} catch (InstantiationException e) {
- log.warn("Error loading resolver " + className + " disabling it");
+ LOG.warn("Error loading resolver " + className + " disabling it");
}
}
/**
- * Registers a ResourceResolverSpi instance. This method logs a warning if the class
+ * Registers a ResourceResolverSpi instance. This method LOGs a warning if the class
* cannot be registered.
* @param resourceResolverSpi
* @param start
@@ -257,7 +257,7 @@ public class ResourceResolver {
}
}
if (log.isDebugEnabled()) {
- log.debug("Registered resolver: " + resourceResolverSpi.toString());
+ LOG.debug("Registered resolver: " + resourceResolverSpi.toString());
}
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -30,7 +30,7 @@ import org.apache.xml.security.signature
*/
public abstract class ResourceResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ResourceResolverSpi.class);
/** Field properties */
@@ -158,8 +158,8 @@ public abstract class ResourceResolverSp
&& ch1 == ':' && ch2 == '/'
&& ch3 != '/';
- if (isDosFilename && log.isDebugEnabled()) {
- log.debug("Found DOS filename: " + str);
+ if (isDosFilename && LOG.isDebugEnabled()) {
+ LOG.debug("Found DOS filename: " + str);
}
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -57,7 +57,7 @@ import org.apache.xml.security.utils.res
*/
public class ResolverDirectHTTP extends ResourceResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ResolverDirectHTTP.class);
/** Field properties[] */
@@ -138,7 +138,7 @@ public class ResolverDirectHTTP extends
}
if (log.isDebugEnabled()) {
- log.debug("Fetched " + summarized + " bytes from URI " + uriNew.toString());
+ LOG.debug("Fetched " + summarized + " bytes from URI " + uriNew.toString());
}
XMLSignatureInput result = new XMLSignatureInput(baos.toByteArray());
@@ -204,32 +204,32 @@ public class ResolverDirectHTTP extends
public boolean engineCanResolveURI(ResourceResolverContext context) {
if (context.uriToResolve == null) {
if (log.isDebugEnabled()) {
- log.debug("quick fail, uri == null");
+ LOG.debug("quick fail, uri == null");
}
return false;
}
if (context.uriToResolve.equals("") || context.uriToResolve.charAt(0) == '#') {
if (log.isDebugEnabled()) {
- log.debug("quick fail for empty URIs and local ones");
+ LOG.debug("quick fail for empty URIs and local ones");
}
return false;
}
if (log.isDebugEnabled()) {
- log.debug("I was asked whether I can resolve " + context.uriToResolve);
+ LOG.debug("I was asked whether I can resolve " + context.uriToResolve);
}
if (context.uriToResolve.startsWith("http:") ||
context.baseUri != null && context.baseUri.startsWith("http:")) {
if (log.isDebugEnabled()) {
- log.debug("I state that I can resolve " + context.uriToResolve);
+ LOG.debug("I state that I can resolve " + context.uriToResolve);
}
return true;
}
if (log.isDebugEnabled()) {
- log.debug("I state that I can't resolve " + context.uriToResolve);
+ LOG.debug("I state that I can't resolve " + context.uriToResolve);
}
return false;
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -37,7 +37,7 @@ import org.w3c.dom.Node;
*/
public class ResolverFragment extends ResourceResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ResolverFragment.class);
@Override
@@ -61,7 +61,7 @@ public class ResolverFragment extends Re
* resource containing the signature
*/
if (log.isDebugEnabled()) {
- log.debug("ResolverFragment with empty URI (means complete document)");
+ LOG.debug("ResolverFragment with empty URI (means complete document)");
}
selectedElem = doc;
} else {
@@ -92,7 +92,7 @@ public class ResolverFragment extends Re
}
}
if (log.isDebugEnabled()) {
- log.debug(
+ LOG.debug(
"Try to catch an Element with ID " + id + " and Element was " + selectedElem
);
}
@@ -119,7 +119,7 @@ public class ResolverFragment extends Re
public boolean engineCanResolveURI(ResourceResolverContext context) {
if (context.uriToResolve == null) {
if (log.isDebugEnabled()) {
- log.debug("Quick fail for null uri");
+ LOG.debug("Quick fail for null uri");
}
return false;
}
@@ -128,12 +128,12 @@ public class ResolverFragment extends Re
context.uriToResolve.charAt(0) == '#' && !context.uriToResolve.startsWith("#xpointer(")
) {
if (log.isDebugEnabled()) {
- log.debug("State I can resolve reference: \"" + context.uriToResolve + "\"");
+ LOG.debug("State I can resolve reference: \"" + context.uriToResolve + "\"");
}
return true;
}
if (log.isDebugEnabled()) {
- log.debug("Do not seem to be able to resolve reference: \"" + context.uriToResolve + "\"");
+ LOG.debug("Do not seem to be able to resolve reference: \"" + context.uriToResolve + "\"");
}
return false;
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -34,7 +34,7 @@ public class ResolverLocalFilesystem ext
private static final int FILE_URI_LENGTH = "file:/".length();
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ResolverLocalFilesystem.class);
@Override
@@ -116,23 +116,23 @@ public class ResolverLocalFilesystem ext
try {
if (log.isDebugEnabled()) {
- log.debug("I was asked whether I can resolve " + context.uriToResolve);
+ LOG.debug("I was asked whether I can resolve " + context.uriToResolve);
}
if (context.uriToResolve.startsWith("file:") || context.baseUri.startsWith("file:")) {
if (log.isDebugEnabled()) {
- log.debug("I state that I can resolve " + context.uriToResolve);
+ LOG.debug("I state that I can resolve " + context.uriToResolve);
}
return true;
}
} catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
}
if (log.isDebugEnabled()) {
- log.debug("But I can't");
+ LOG.debug("But I can't");
}
return false;
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -44,7 +44,7 @@ import org.w3c.dom.Node;
*/
public class ResolverXPointer extends ResourceResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ResolverXPointer.class);
private static final String XP = "#xpointer(id(";
@@ -145,7 +145,7 @@ public class ResolverXPointer extends Re
if (idPlusDelim.charAt(0) == '"' && idPlusDelim.charAt(idLen) == '"'
|| idPlusDelim.charAt(0) == '\'' && idPlusDelim.charAt(idLen) == '\'') {
if (log.isDebugEnabled()) {
- log.debug("Id = " + idPlusDelim.substring(1, idLen));
+ LOG.debug("Id = " + idPlusDelim.substring(1, idLen));
}
return true;
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -36,7 +36,7 @@ import org.apache.jcp.xml.dsig.internal.
*/
public class ClassLoaderTest extends org.junit.Assert {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ClassLoaderTest.class);
@SuppressWarnings("resource")
@@ -107,7 +107,7 @@ public class ClassLoaderTest extends org
long end = System.currentTimeMillis();
long elapsed = end-start;
if (log.isDebugEnabled()) {
- log.debug("Elapsed: " + elapsed);
+ LOG.debug("Elapsed: " + elapsed);
}
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -27,7 +27,7 @@ import javax.xml.crypto.dsig.spec.C14NMe
*/
public class Driver {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Driver.class);
public void dsig() throws Exception {
@@ -42,8 +42,8 @@ public class Driver {
long end = System.currentTimeMillis();
long elapsed = end - start;
if (log.isDebugEnabled()) {
- log.debug("Elapsed: " + elapsed);
- log.debug("dsig succeeded");
+ LOG.debug("Elapsed: " + elapsed);
+ LOG.debug("dsig succeeded");
}
}
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
public class SignatureAlgorithmTest extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignatureAlgorithmTest.class);
static {
@@ -51,7 +51,7 @@ public class SignatureAlgorithmTest exte
try {
otherSignatureAlgorithm.initSign(pk);
} catch (XMLSecurityException ex) {
- log.warn(
+ LOG.warn(
"Test testSameKeySeveralAlgorithmSigning skipped as necessary algorithms "
+ "not available"
);
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -26,7 +26,7 @@ import org.apache.xml.security.c14n.help
*/
public class C14nHelperTest extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(C14nHelperTest.class);
static {
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -50,7 +50,7 @@ import org.xml.sax.SAXException;
*/
public class Canonicalizer11Test extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Canonicalizer11Test.class);
static {
@@ -403,7 +403,7 @@ public class Canonicalizer11Test extends
FileOutputStream fos = new FileOutputStream(f);
fos.write(c14nBytes);
- log.debug("Wrote erroneous result to file " + f.toURI().toURL().toString());
+ LOG.debug("Wrote erroneous result to file " + f.toURI().toURL().toString());
assertEquals(new String(refBytes), new String(c14nBytes));
fos.close();
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -65,7 +65,7 @@ public class Canonicalizer20010315Exclus
org.apache.xml.security.Init.init();
}
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(
Canonicalizer20010315ExclusiveTest.class
);
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -63,7 +63,7 @@ import org.xml.sax.SAXException;
*/
public class Canonicalizer20010315Test extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Canonicalizer20010315Test.class);
static {
@@ -689,7 +689,7 @@ public class Canonicalizer20010315Test e
} catch (CanonicalizationException cex) {
// if we reach this point - good.
- log.debug("We catched the C14nEx, that's good: " + cex.getMessage());
+ LOG.debug("We catched the C14nEx, that's good: " + cex.getMessage());
weCatchedTheRelativeNS = true;
}
@@ -1090,7 +1090,7 @@ public class Canonicalizer20010315Test e
FileOutputStream fos = new FileOutputStream(f);
fos.write(c14nBytes);
- log.debug("Wrote erroneous result to file " + f.toURI().toURL().toString());
+ LOG.debug("Wrote erroneous result to file " + f.toURI().toURL().toString());
assertEquals(new String(refBytes),new String(c14nBytes));
fos.close();
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
*/
public class ExclusiveC14NInteropTest extends InteropTestBase {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ExclusiveC14NInteropTest.class);
static {
@@ -135,7 +135,7 @@ public class ExclusiveC14NInteropTest ex
boolean verify =
signature.checkSignatureValue(signature.getKeyInfo().getPublicKey());
- log.debug(" signature.checkSignatureValue finished: " + verify);
+ LOG.debug(" signature.checkSignatureValue finished: " + verify);
// if (!verify) {
StringBuilder sb = new StringBuilder();
@@ -146,7 +146,7 @@ public class ExclusiveC14NInteropTest ex
//JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
if (refVerify) {
- log.debug("Reference " + i + " was OK");
+ LOG.debug("Reference " + i + " was OK");
} else {
sb.append(i);
sb.append(" ");
@@ -158,7 +158,7 @@ public class ExclusiveC14NInteropTest ex
int length = reference.getTransforms().getLength();
String algo = reference.getTransforms().item(length - 1).getURI();
- log.debug("Reference " + i + " failed: " + algo);
+ LOG.debug("Reference " + i + " failed: " + algo);
}
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -73,7 +73,7 @@ public class BaltimoreEncTest extends or
private boolean haveISOPadding;
private boolean haveKeyWraps;
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(BaltimoreEncTest.class);
/**
@@ -163,7 +163,7 @@ public class BaltimoreEncTest extends or
Document dd = decryptElement(filename);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_content_3des_cbs as necessary "
+ "crypto algorithms are not available"
);
@@ -185,7 +185,7 @@ public class BaltimoreEncTest extends or
Document dd = decryptElement(filename);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_content_aes256_cbc as necessary "
+ "crypto algorithms are not available"
);
@@ -207,7 +207,7 @@ public class BaltimoreEncTest extends or
Document dd = decryptElement(filename);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_content_aes128_cbc_kw_aes192 as necessary "
+ "crypto algorithms are not available"
);
@@ -230,7 +230,7 @@ public class BaltimoreEncTest extends or
Document dd = decryptElement(filename);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_content_3des_cbc_kw_aes128 as necessary "
+ "crypto algorithms are not available"
);
@@ -252,7 +252,7 @@ public class BaltimoreEncTest extends or
Document dd = decryptElement(filename);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_content_aes128_cbc_rsa_15 as necessary "
+ "crypto algorithms are not available"
);
@@ -276,7 +276,7 @@ public class BaltimoreEncTest extends or
// due to the encrypted text remainin in the reference nodes
checkDecryptedDoc(dd, false);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_element_aes192_cbc_ref as necessary "
+ "crypto algorithms are not available"
);
@@ -298,7 +298,7 @@ public class BaltimoreEncTest extends or
byte[] decrypt = decryptData(filename);
checkDecryptedData(decrypt);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_data_aes128_cbc as necessary "
+ "crypto algorithms are not available"
);
@@ -320,7 +320,7 @@ public class BaltimoreEncTest extends or
byte[] decrypt = decryptData(filename);
checkDecryptedData(decrypt);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_data_aes256_cbc_3des as necessary "
+ "crypto algorithms are not available"
);
@@ -342,7 +342,7 @@ public class BaltimoreEncTest extends or
byte[] decrypt = decryptData(filename);
checkDecryptedData(decrypt);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_data_aes192_cbc_aes256 as necessary "
+ "crypto algorithms are not available"
);
@@ -364,7 +364,7 @@ public class BaltimoreEncTest extends or
byte[] decrypt = decryptData(filename);
checkDecryptedData(decrypt);
} else {
- log.warn(
+ LOG.warn(
"Skipping test test_five_data_3des_cbc_rsa_oaep as necessary "
+ "crypto algorithms are not available"
);
@@ -598,7 +598,7 @@ public class BaltimoreEncTest extends or
private void checkDecryptedDoc(Document d, boolean doNodeCheck) throws Exception {
String cc = retrieveCCNumber(d);
- log.debug("Retrieved Credit Card : " + cc);
+ LOG.debug("Retrieved Credit Card : " + cc);
assertTrue(cc, cc!= null && cc.equals(cardNumber));
// Test cc numbers
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
*/
public class BobKeyResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(BobKeyResolver.class);
private KeyName _kn;
@@ -56,7 +56,7 @@ public class BobKeyResolver extends KeyR
if (element == null) {
return false;
}
- log.debug("Can I resolve " + element.getTagName());
+ LOG.debug("Can I resolve " + element.getTagName());
boolean isKeyName = XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_KEYNAME);
try {
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -43,7 +43,7 @@ import org.w3c.dom.NodeList;
public class EncryptContentTest extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(EncryptContentTest.class);
private static final String DATA =
@@ -109,7 +109,7 @@ public class EncryptContentTest extends
@org.junit.Test
public void testContentRemoved() throws Exception {
if (!haveISOPadding) {
- log.warn("Test testContentRemoved skipped as necessary algorithms not available");
+ LOG.warn("Test testContentRemoved skipped as necessary algorithms not available");
return;
}
@@ -161,7 +161,7 @@ public class EncryptContentTest extends
@org.junit.Test
public void testMultipleKeyInfoElements() throws Exception {
if (!haveISOPadding) {
- log.warn("Test testMultipleKeyInfoElements skipped as necessary algorithms not available");
+ LOG.warn("Test testMultipleKeyInfoElements skipped as necessary algorithms not available");
return;
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
public class ReferenceListTest extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ReferenceListTest.class);
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -67,7 +67,7 @@ import org.w3c.dom.NodeList;
*/
public class XMLCipherTest extends org.junit.Assert {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLCipherTest.class);
static {
@@ -200,7 +200,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn(
+ LOG.warn(
"Test testAES128ElementAES192KWCipherUsingKEK skipped as "
+ "necessary algorithms not available"
);
@@ -256,8 +256,8 @@ public class XMLCipherTest extends org.j
builderKeyInfo.add(encryptedKey);
ed = cipher.doFinal(d, e);
- log.debug("Encrypted document");
- log.debug(toString(ed));
+ LOG.debug("Encrypted document");
+ LOG.debug(toString(ed));
//decrypt
@@ -271,7 +271,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn(
+ LOG.warn(
"Test testAES256ElementRSAKWCipherUsingKEK skipped as "
+ "necessary algorithms not available"
);
@@ -358,7 +358,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn(
+ LOG.warn(
"Test testAES192Element3DESKWCipher skipped as "
+ "necessary algorithms not available"
);
@@ -402,7 +402,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn(
+ LOG.warn(
"Test testTripleDesElementCipher skipped as necessary algorithms not available"
);
}
@@ -446,7 +446,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn(
+ LOG.warn(
"Test testAes128ElementCipher skipped as necessary algorithms not available"
);
}
@@ -492,7 +492,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn("Test testAes192ElementCipher skipped as necessary algorithms not available");
+ LOG.warn("Test testAes192ElementCipher skipped as necessary algorithms not available");
}
}
@@ -538,7 +538,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn("Test testAes265ElementCipher skipped as necessary algorithms not available");
+ LOG.warn("Test testAes265ElementCipher skipped as necessary algorithms not available");
}
}
@@ -580,7 +580,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn(
+ LOG.warn(
"Test testTripleDesDocumentCipher skipped as "
+ "necessary algorithms not available"
);
@@ -638,7 +638,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn(
+ LOG.warn(
"Test testTripleDesDocumentCipher skipped as "
+ "necessary algorithms not available"
);
@@ -711,7 +711,7 @@ public class XMLCipherTest extends org.j
assertEquals("A test encrypted secret",
new String(decryptBytes, "ASCII"));
} else {
- log.warn(
+ LOG.warn(
"Test testSameDocumentCipherReference skipped as "
+ "necessary algorithms not available"
);
@@ -819,7 +819,7 @@ public class XMLCipherTest extends org.j
n = n.getNextSibling();
assertNull(n);
} else {
- log.warn(
+ LOG.warn(
"Test testPhysicalRepresentation skipped as "
+ "necessary algorithms not available"
);
@@ -829,7 +829,7 @@ public class XMLCipherTest extends org.j
@org.junit.Test
public void testSerializedData() throws Exception {
if (!haveISOPadding) {
- log.warn("Test testSerializedData skipped as necessary algorithms not available");
+ LOG.warn("Test testSerializedData skipped as necessary algorithms not available");
return;
}
@@ -990,7 +990,7 @@ public class XMLCipherTest extends org.j
target = toString(dd);
assertEquals(source, target);
} else {
- log.warn(
+ LOG.warn(
"Test testAES128ElementAES192KWCipherUsingKEK skipped as "
+ "necessary algorithms not available"
);
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -71,7 +71,7 @@ public class XMLEncryption11Test extends
private static int nodeCount = 0;
private boolean haveISOPadding;
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLEncryption11Test.class);
/**
@@ -171,7 +171,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping testRSA2048 as necessary "
+ "crypto algorithms are not available"
);
@@ -236,7 +236,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping testRSA2048 as necessary "
+ "crypto algorithms are not available"
);
@@ -273,7 +273,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping testRSA3072 as necessary "
+ "crypto algorithms are not available"
);
@@ -338,7 +338,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping testRSA3072 as necessary "
+ "crypto algorithms are not available"
);
@@ -375,7 +375,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping testRSA307OAEP as necessary "
+ "crypto algorithms are not available"
);
@@ -440,7 +440,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping testRSA2048 as necessary "
+ "crypto algorithms are not available"
);
@@ -477,7 +477,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping testRSA4096 as necessary "
+ "crypto algorithms are not available"
);
@@ -542,7 +542,7 @@ public class XMLEncryption11Test extends
// XMLUtils.outputDOM(dd.getFirstChild(), System.out);
checkDecryptedDoc(dd, true);
} else {
- log.warn(
+ LOG.warn(
"Skipping testRSA2048 as necessary "
+ "crypto algorithms are not available"
);
@@ -750,7 +750,7 @@ public class XMLEncryption11Test extends
private void checkDecryptedDoc(Document d, boolean doNodeCheck) throws Exception {
String cc = retrieveCCNumber(d);
- log.debug("Retrieved Credit Card : " + cc);
+ LOG.debug("Retrieved Credit Card : " + cc);
assertTrue(cc, cc!= null && cc.equals(cardNumber));
// Test cc numbers