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 [2/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/keys/KeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java Mon Feb 13 13:22:37 2017
@@ -90,7 +90,7 @@ import org.w3c.dom.Node;
*/
public class KeyInfo extends SignatureElementProxy {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(KeyInfo.class);
// We need at least one StorageResolver otherwise
@@ -823,26 +823,26 @@ public class KeyInfo extends SignatureEl
if (pk != null) {
if (log.isDebugEnabled()) {
- log.debug("I could find a key using the per-KeyInfo key resolvers");
+ LOG.debug("I could find a key using the per-KeyInfo key resolvers");
}
return pk;
}
if (log.isDebugEnabled()) {
- log.debug("I couldn't find a key using the per-KeyInfo key resolvers");
+ LOG.debug("I couldn't find a key using the per-KeyInfo key resolvers");
}
pk = this.getPublicKeyFromStaticResolvers();
if (pk != null) {
if (log.isDebugEnabled()) {
- log.debug("I could find a key using the system-wide key resolvers");
+ LOG.debug("I could find a key using the system-wide key resolvers");
}
return pk;
}
if (log.isDebugEnabled()) {
- log.debug("I couldn't find a key using the system-wide key resolvers");
+ LOG.debug("I couldn't find a key using the system-wide key resolvers");
}
return null;
@@ -889,7 +889,7 @@ public class KeyInfo extends SignatureEl
PublicKey getPublicKeyFromInternalResolvers() throws KeyResolverException {
for (KeyResolverSpi keyResolver : internalKeyResolvers) {
if (log.isDebugEnabled()) {
- log.debug("Try " + keyResolver.getClass().getName());
+ LOG.debug("Try " + keyResolver.getClass().getName());
}
keyResolver.setSecureValidation(secureValidation);
Node currentChild = getFirstChild();
@@ -926,13 +926,13 @@ public class KeyInfo extends SignatureEl
if (cert != null) {
if (log.isDebugEnabled()) {
- log.debug("I could find a X509Certificate using the per-KeyInfo key resolvers");
+ LOG.debug("I could find a X509Certificate using the per-KeyInfo key resolvers");
}
return cert;
}
if (log.isDebugEnabled()) {
- log.debug("I couldn't find a X509Certificate using the per-KeyInfo key resolvers");
+ LOG.debug("I couldn't find a X509Certificate using the per-KeyInfo key resolvers");
}
// Then use the system-wide Resolvers
@@ -940,13 +940,13 @@ public class KeyInfo extends SignatureEl
if (cert != null) {
if (log.isDebugEnabled()) {
- log.debug("I could find a X509Certificate using the system-wide key resolvers");
+ LOG.debug("I could find a X509Certificate using the system-wide key resolvers");
}
return cert;
}
if (log.isDebugEnabled()) {
- log.debug("I couldn't find a X509Certificate using the system-wide key resolvers");
+ LOG.debug("I couldn't find a X509Certificate using the system-wide key resolvers");
}
return null;
@@ -963,7 +963,7 @@ public class KeyInfo extends SignatureEl
X509Certificate getX509CertificateFromStaticResolvers()
throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug(
+ LOG.debug(
"Start getX509CertificateFromStaticResolvers() with " + KeyResolver.length()
+ " resolvers"
);
@@ -1012,7 +1012,7 @@ public class KeyInfo extends SignatureEl
X509Certificate getX509CertificateFromInternalResolvers()
throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug(
+ LOG.debug(
"Start getX509CertificateFromInternalResolvers() with "
+ this.lengthInternalKeyResolver() + " resolvers"
);
@@ -1020,7 +1020,7 @@ public class KeyInfo extends SignatureEl
String uri = this.getBaseURI();
for (KeyResolverSpi keyResolver : internalKeyResolvers) {
if (log.isDebugEnabled()) {
- log.debug("Try " + keyResolver.getClass().getName());
+ LOG.debug("Try " + keyResolver.getClass().getName());
}
keyResolver.setSecureValidation(secureValidation);
X509Certificate cert = applyCurrentResolver(uri, keyResolver);
@@ -1042,26 +1042,26 @@ public class KeyInfo extends SignatureEl
if (sk != null) {
if (log.isDebugEnabled()) {
- log.debug("I could find a secret key using the per-KeyInfo key resolvers");
+ LOG.debug("I could find a secret key using the per-KeyInfo key resolvers");
}
return sk;
}
if (log.isDebugEnabled()) {
- log.debug("I couldn't find a secret key using the per-KeyInfo key resolvers");
+ LOG.debug("I couldn't find a secret key using the per-KeyInfo key resolvers");
}
sk = this.getSecretKeyFromStaticResolvers();
if (sk != null) {
if (log.isDebugEnabled()) {
- log.debug("I could find a secret key using the system-wide key resolvers");
+ LOG.debug("I could find a secret key using the system-wide key resolvers");
}
return sk;
}
if (log.isDebugEnabled()) {
- log.debug("I couldn't find a secret key using the system-wide key resolvers");
+ LOG.debug("I couldn't find a secret key using the system-wide key resolvers");
}
return null;
@@ -1110,7 +1110,7 @@ public class KeyInfo extends SignatureEl
SecretKey getSecretKeyFromInternalResolvers() throws KeyResolverException {
for (KeyResolverSpi keyResolver : internalKeyResolvers) {
if (log.isDebugEnabled()) {
- log.debug("Try " + keyResolver.getClass().getName());
+ LOG.debug("Try " + keyResolver.getClass().getName());
}
keyResolver.setSecureValidation(secureValidation);
Node currentChild = getFirstChild();
@@ -1145,23 +1145,23 @@ public class KeyInfo extends SignatureEl
if (pk != null) {
if (log.isDebugEnabled()) {
- log.debug("I could find a private key using the per-KeyInfo key resolvers");
+ LOG.debug("I could find a private key using the per-KeyInfo key resolvers");
}
return pk;
}
if (log.isDebugEnabled()) {
- log.debug("I couldn't find a secret key using the per-KeyInfo key resolvers");
+ LOG.debug("I couldn't find a secret key using the per-KeyInfo key resolvers");
}
pk = this.getPrivateKeyFromStaticResolvers();
if (pk != null) {
if (log.isDebugEnabled()) {
- log.debug("I could find a private key using the system-wide key resolvers");
+ LOG.debug("I could find a private key using the system-wide key resolvers");
}
return pk;
}
if (log.isDebugEnabled()) {
- log.debug("I couldn't find a private key using the system-wide key resolvers");
+ LOG.debug("I couldn't find a private key using the system-wide key resolvers");
}
return null;
@@ -1209,7 +1209,7 @@ public class KeyInfo extends SignatureEl
PrivateKey getPrivateKeyFromInternalResolvers() throws KeyResolverException {
for (KeyResolverSpi keyResolver : internalKeyResolvers) {
if (log.isDebugEnabled()) {
- log.debug("Try " + keyResolver.getClass().getName());
+ LOG.debug("Try " + keyResolver.getClass().getName());
}
keyResolver.setSecureValidation(secureValidation);
Node currentChild = getFirstChild();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java Mon Feb 13 13:22:37 2017
@@ -37,7 +37,7 @@ import org.w3c.dom.Node;
public class X509Data extends SignatureElementProxy implements KeyInfoContent {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(X509Data.class);
/**
@@ -457,7 +457,7 @@ public class X509Data extends SignatureE
**/
public Element itemUnknownElement(int i) {
if (log.isDebugEnabled()) {
- log.debug("itemUnknownElement not implemented: " + i);
+ LOG.debug("itemUnknownElement not implemented: " + i);
}
return null;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java Mon Feb 13 13:22:37 2017
@@ -151,7 +151,7 @@ public class XMLX509Certificate extends
}
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
}
return result;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java Mon Feb 13 13:22:37 2017
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
public class XMLX509IssuerSerial extends SignatureElementProxy implements XMLX509DataContent {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLX509IssuerSerial.class);
/**
@@ -103,7 +103,7 @@ public class XMLX509IssuerSerial extends
String text =
this.getTextFromChildElement(Constants._TAG_X509SERIALNUMBER, Constants.SignatureSpecNS);
if (log.isDebugEnabled()) {
- log.debug("X509SerialNumber text: " + text);
+ LOG.debug("X509SerialNumber text: " + text);
}
return new BigInteger(text);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java Mon Feb 13 13:22:37 2017
@@ -36,7 +36,7 @@ import org.w3c.dom.Element;
*/
public class XMLX509SKI extends SignatureElementProxy implements XMLX509DataContent {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLX509SKI.class);
/**
@@ -134,7 +134,7 @@ public class XMLX509SKI extends Signatur
System.arraycopy(extensionValue, 4, skidValue, 0, skidValue.length);
if (log.isDebugEnabled()) {
- log.debug("Base64 of SKI is " + Base64.getMimeEncoder().encodeToString(skidValue));
+ LOG.debug("Base64 of SKI is " + Base64.getMimeEncoder().encodeToString(skidValue));
}
return skidValue;
@@ -164,7 +164,7 @@ public class XMLX509SKI extends Signatur
}
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
}
return result;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java Mon Feb 13 13:22:37 2017
@@ -49,7 +49,7 @@ import org.w3c.dom.Node;
*/
public class KeyResolver {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(KeyResolver.class);
/** Field resolverVector */
@@ -100,7 +100,7 @@ public class KeyResolver {
throw new KeyResolverException("utils.resolver.noClass", exArgs);
}
if (log.isDebugEnabled()) {
- log.debug("check resolvability by class " + resolver.getClass());
+ LOG.debug("check resolvability by class " + resolver.getClass());
}
X509Certificate cert = resolver.resolveX509Certificate(element, baseURI, storage);
@@ -141,7 +141,7 @@ public class KeyResolver {
throw new KeyResolverException("utils.resolver.noClass", exArgs);
}
if (log.isDebugEnabled()) {
- log.debug("check resolvability by class " + resolver.getClass());
+ LOG.debug("check resolvability by class " + resolver.getClass());
}
PublicKey cert = resolver.resolvePublicKey(element, baseURI, storage);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java Mon Feb 13 13:22:37 2017
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
*/
public class DEREncodedKeyValueResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DEREncodedKeyValueResolver.class);
/** {@inheritDoc}. */
@@ -54,7 +54,7 @@ public class DEREncodedKeyValueResolver
throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName());
+ LOG.debug("Can I resolve " + element.getTagName());
}
if (!engineCanResolve(element, baseURI, storage)) {
@@ -66,7 +66,7 @@ public class DEREncodedKeyValueResolver
return derKeyValue.getPublicKey();
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", e);
+ LOG.debug("XMLSecurityException", e);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java Mon Feb 13 13:22:37 2017
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
public class DSAKeyValueResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DSAKeyValueResolver.class);
@@ -72,7 +72,7 @@ public class DSAKeyValueResolver extends
return pk;
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
//do nothing
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java Mon Feb 13 13:22:37 2017
@@ -49,7 +49,7 @@ import org.w3c.dom.Element;
*/
public class EncryptedKeyResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(RSAKeyValueResolver.class);
private Key kek;
@@ -108,7 +108,7 @@ public class EncryptedKeyResolver extend
Element element, String baseURI, StorageResolver storage
) {
if (log.isDebugEnabled()) {
- log.debug("EncryptedKeyResolver - Can I resolve " + element.getTagName());
+ LOG.debug("EncryptedKeyResolver - Can I resolve " + element.getTagName());
}
if (element == null) {
@@ -120,7 +120,7 @@ public class EncryptedKeyResolver extend
XMLUtils.elementIsInEncryptionSpace(element, EncryptionConstants._TAG_ENCRYPTEDKEY);
if (isEncryptedKey) {
if (log.isDebugEnabled()) {
- log.debug("Passed an Encrypted Key");
+ LOG.debug("Passed an Encrypted Key");
}
try {
XMLCipher cipher = XMLCipher.getInstance();
@@ -135,7 +135,7 @@ public class EncryptedKeyResolver extend
key = (SecretKey) cipher.decryptKey(ek, algorithm);
} catch (XMLEncryptionException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java Mon Feb 13 13:22:37 2017
@@ -50,7 +50,7 @@ import org.xml.sax.SAXException;
*/
public class KeyInfoReferenceResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(KeyInfoReferenceResolver.class);
/** {@inheritDoc}. */
@@ -63,7 +63,7 @@ public class KeyInfoReferenceResolver ex
throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName());
+ LOG.debug("Can I resolve " + element.getTagName());
}
if (!engineCanResolve(element, baseURI, storage)) {
@@ -77,7 +77,7 @@ public class KeyInfoReferenceResolver ex
}
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", e);
+ LOG.debug("XMLSecurityException", e);
}
}
@@ -89,7 +89,7 @@ public class KeyInfoReferenceResolver ex
throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName());
+ LOG.debug("Can I resolve " + element.getTagName());
}
if (!engineCanResolve(element, baseURI, storage)) {
@@ -103,7 +103,7 @@ public class KeyInfoReferenceResolver ex
}
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", e);
+ LOG.debug("XMLSecurityException", e);
}
}
@@ -115,7 +115,7 @@ public class KeyInfoReferenceResolver ex
throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName());
+ LOG.debug("Can I resolve " + element.getTagName());
}
if (!engineCanResolve(element, baseURI, storage)) {
@@ -129,7 +129,7 @@ public class KeyInfoReferenceResolver ex
}
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", e);
+ LOG.debug("XMLSecurityException", e);
}
}
@@ -141,7 +141,7 @@ public class KeyInfoReferenceResolver ex
throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName());
+ LOG.debug("Can I resolve " + element.getTagName());
}
if (!engineCanResolve(element, baseURI, storage)) {
@@ -155,7 +155,7 @@ public class KeyInfoReferenceResolver ex
}
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", e);
+ LOG.debug("XMLSecurityException", e);
}
}
@@ -182,14 +182,14 @@ public class KeyInfoReferenceResolver ex
referentElement = obtainReferenceElement(resource);
} catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", e);
+ LOG.debug("XMLSecurityException", e);
}
return null;
}
if (referentElement == null) {
if (log.isDebugEnabled()) {
- log.debug("De-reference of KeyInfoReference URI returned null: " + uriAttr.getValue());
+ LOG.debug("De-reference of KeyInfoReference URI returned null: " + uriAttr.getValue());
}
return null;
}
@@ -262,7 +262,7 @@ public class KeyInfoReferenceResolver ex
if (resource.isElement()){
e = (Element) resource.getSubNode();
} else if (resource.isNodeSet()) {
- log.debug("De-reference of KeyInfoReference returned an unsupported NodeSet");
+ LOG.debug("De-reference of KeyInfoReference returned an unsupported NodeSet");
return null;
} else {
// Retrieved resource is a byte stream
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java Mon Feb 13 13:22:37 2017
@@ -49,7 +49,7 @@ import org.w3c.dom.Element;
*/
public class PrivateKeyResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(PrivateKeyResolver.class);
private KeyStore keyStore;
@@ -138,7 +138,7 @@ public class PrivateKeyResolver extends
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName() + "?");
+ LOG.debug("Can I resolve " + element.getTagName() + "?");
}
if (XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
@@ -147,7 +147,7 @@ public class PrivateKeyResolver extends
return privKey;
}
} else if (XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_KEYNAME)) {
- log.debug("Can I resolve KeyName?");
+ LOG.debug("Can I resolve KeyName?");
String keyName = element.getFirstChild().getNodeValue();
try {
@@ -156,16 +156,16 @@ public class PrivateKeyResolver extends
return (PrivateKey) key;
}
} catch (Exception e) {
- log.debug("Cannot recover the key", e);
+ LOG.debug("Cannot recover the key", e);
}
}
- log.debug("I can't");
+ LOG.debug("I can't");
return null;
}
private PrivateKey resolveX509Data(Element element, String baseURI) {
- log.debug("Can I resolve X509Data?");
+ LOG.debug("Can I resolve X509Data?");
try {
X509Data x509Data = new X509Data(element, baseURI);
@@ -206,9 +206,9 @@ public class PrivateKeyResolver extends
}
}
} catch (XMLSecurityException e) {
- log.debug("XMLSecurityException", e);
+ LOG.debug("XMLSecurityException", e);
} catch (KeyStoreException e) {
- log.debug("KeyStoreException", e);
+ LOG.debug("KeyStoreException", e);
}
return null;
@@ -218,7 +218,7 @@ public class PrivateKeyResolver extends
* Search for a private key entry in the KeyStore with the same Subject Key Identifier
*/
private PrivateKey resolveX509SKI(XMLX509SKI x509SKI) throws XMLSecurityException, KeyStoreException {
- log.debug("Can I resolve X509SKI?");
+ LOG.debug("Can I resolve X509SKI?");
Enumeration<String> aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
@@ -230,7 +230,7 @@ public class PrivateKeyResolver extends
XMLX509SKI certSKI = new XMLX509SKI(x509SKI.getDocument(), (X509Certificate) cert);
if (certSKI.equals(x509SKI)) {
- log.debug("match !!! ");
+ LOG.debug("match !!! ");
try {
Key key = keyStore.getKey(alias, password);
@@ -238,7 +238,7 @@ public class PrivateKeyResolver extends
return (PrivateKey) key;
}
} catch (Exception e) {
- log.debug("Cannot recover the key", e);
+ LOG.debug("Cannot recover the key", e);
// Keep searching
}
}
@@ -253,7 +253,7 @@ public class PrivateKeyResolver extends
* Search for a private key entry in the KeyStore with the same Issuer/Serial Number pair.
*/
private PrivateKey resolveX509IssuerSerial(XMLX509IssuerSerial x509Serial) throws KeyStoreException {
- log.debug("Can I resolve X509IssuerSerial?");
+ LOG.debug("Can I resolve X509IssuerSerial?");
Enumeration<String> aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
@@ -266,7 +266,7 @@ public class PrivateKeyResolver extends
new XMLX509IssuerSerial(x509Serial.getDocument(), (X509Certificate) cert);
if (certSerial.equals(x509Serial)) {
- log.debug("match !!! ");
+ LOG.debug("match !!! ");
try {
Key key = keyStore.getKey(alias, password);
@@ -274,7 +274,7 @@ public class PrivateKeyResolver extends
return (PrivateKey) key;
}
} catch (Exception e) {
- log.debug("Cannot recover the key", e);
+ LOG.debug("Cannot recover the key", e);
// Keep searching
}
}
@@ -289,7 +289,7 @@ public class PrivateKeyResolver extends
* Search for a private key entry in the KeyStore with the same Subject Name.
*/
private PrivateKey resolveX509SubjectName(XMLX509SubjectName x509SubjectName) throws KeyStoreException {
- log.debug("Can I resolve X509SubjectName?");
+ LOG.debug("Can I resolve X509SubjectName?");
Enumeration<String> aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
@@ -302,7 +302,7 @@ public class PrivateKeyResolver extends
new XMLX509SubjectName(x509SubjectName.getDocument(), (X509Certificate) cert);
if (certSN.equals(x509SubjectName)) {
- log.debug("match !!! ");
+ LOG.debug("match !!! ");
try {
Key key = keyStore.getKey(alias, password);
@@ -310,7 +310,7 @@ public class PrivateKeyResolver extends
return (PrivateKey) key;
}
} catch (Exception e) {
- log.debug("Cannot recover the key", e);
+ LOG.debug("Cannot recover the key", e);
// Keep searching
}
}
@@ -327,7 +327,7 @@ public class PrivateKeyResolver extends
private PrivateKey resolveX509Certificate(
XMLX509Certificate x509Cert
) throws XMLSecurityException, KeyStoreException {
- log.debug("Can I resolve X509Certificate?");
+ LOG.debug("Can I resolve X509Certificate?");
byte[] x509CertBytes = x509Cert.getCertificateBytes();
Enumeration<String> aliases = keyStore.aliases();
@@ -342,11 +342,11 @@ public class PrivateKeyResolver extends
try {
certBytes = cert.getEncoded();
} catch (CertificateEncodingException e1) {
- log.debug("Cannot recover the key", e1);
+ LOG.debug("Cannot recover the key", e1);
}
if (certBytes != null && Arrays.equals(certBytes, x509CertBytes)) {
- log.debug("match !!! ");
+ LOG.debug("match !!! ");
try {
Key key = keyStore.getKey(alias, password);
@@ -355,7 +355,7 @@ public class PrivateKeyResolver extends
}
}
catch (Exception e) {
- log.debug("Cannot recover the key", e);
+ LOG.debug("Cannot recover the key", e);
// Keep searching
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java Mon Feb 13 13:22:37 2017
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
public class RSAKeyValueResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(RSAKeyValueResolver.class);
@@ -41,7 +41,7 @@ public class RSAKeyValueResolver extends
Element element, String baseURI, StorageResolver storage
) {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName());
+ LOG.debug("Can I resolve " + element.getTagName());
}
if (element == null) {
return null;
@@ -68,7 +68,7 @@ public class RSAKeyValueResolver extends
return rsaKeyValue.getPublicKey();
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", ex);
+ LOG.debug("XMLSecurityException", ex);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Mon Feb 13 13:22:37 2017
@@ -64,7 +64,7 @@ import org.xml.sax.SAXException;
*/
public class RetrievalMethodResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(RetrievalMethodResolver.class);
/**
@@ -103,7 +103,7 @@ public class RetrievalMethodResolver ext
if (log.isDebugEnabled()) {
String error = "Error: It is forbidden to have one RetrievalMethod "
+ "point to another with secure validation";
- log.debug(error);
+ LOG.debug(error);
}
return null;
}
@@ -112,7 +112,7 @@ public class RetrievalMethodResolver ext
Element e2 = obtainReferenceElement(resource2, secureValidation);
if (e2 == element) {
if (log.isDebugEnabled()) {
- log.debug("Error: Can't have RetrievalMethods pointing to each other");
+ LOG.debug("Error: Can't have RetrievalMethods pointing to each other");
}
return null;
}
@@ -121,23 +121,23 @@ public class RetrievalMethodResolver ext
return resolveKey(e, baseURI, storage);
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", ex);
+ LOG.debug("XMLSecurityException", ex);
}
} catch (CertificateException ex) {
if (log.isDebugEnabled()) {
- log.debug("CertificateException", ex);
+ LOG.debug("CertificateException", ex);
}
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug("IOException", ex);
+ LOG.debug("IOException", ex);
}
} catch (ParserConfigurationException e) {
if (log.isDebugEnabled()) {
- log.debug("ParserConfigurationException", e);
+ LOG.debug("ParserConfigurationException", e);
}
} catch (SAXException e) {
if (log.isDebugEnabled()) {
- log.debug("SAXException", e);
+ LOG.debug("SAXException", e);
}
}
return null;
@@ -173,7 +173,7 @@ public class RetrievalMethodResolver ext
if (log.isDebugEnabled()) {
String error = "Error: It is forbidden to have one RetrievalMethod "
+ "point to another with secure validation";
- log.debug(error);
+ LOG.debug(error);
}
return null;
}
@@ -182,7 +182,7 @@ public class RetrievalMethodResolver ext
Element e2 = obtainReferenceElement(resource2, secureValidation);
if (e2 == element) {
if (log.isDebugEnabled()) {
- log.debug("Error: Can't have RetrievalMethods pointing to each other");
+ LOG.debug("Error: Can't have RetrievalMethods pointing to each other");
}
return null;
}
@@ -191,23 +191,23 @@ public class RetrievalMethodResolver ext
return resolveCertificate(e, baseURI, storage);
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", ex);
+ LOG.debug("XMLSecurityException", ex);
}
} catch (CertificateException ex) {
if (log.isDebugEnabled()) {
- log.debug("CertificateException", ex);
+ LOG.debug("CertificateException", ex);
}
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug("IOException", ex);
+ LOG.debug("IOException", ex);
}
} catch (ParserConfigurationException e) {
if (log.isDebugEnabled()) {
- log.debug("ParserConfigurationException", e);
+ LOG.debug("ParserConfigurationException", e);
}
} catch (SAXException e) {
if (log.isDebugEnabled()) {
- log.debug("SAXException", e);
+ LOG.debug("SAXException", e);
}
}
return null;
@@ -225,7 +225,7 @@ public class RetrievalMethodResolver ext
Element e, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ e.getLocalName() + " Element");
}
// An element has been provided
@@ -247,7 +247,7 @@ public class RetrievalMethodResolver ext
Element e, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ e.getLocalName() + " Element");
}
// An element has been provided
@@ -272,7 +272,7 @@ public class RetrievalMethodResolver ext
e = getDocFromBytes(inputBytes, secureValidation);
// otherwise, we parse the resource, create an Element and delegate
if (log.isDebugEnabled()) {
- log.debug("we have to parse " + inputBytes.length + " bytes");
+ LOG.debug("we have to parse " + inputBytes.length + " bytes");
}
}
return e;
@@ -304,7 +304,7 @@ public class RetrievalMethodResolver ext
XMLSignatureInput resource = resRes.resolve(uri, baseURI, secureValidation);
if (transforms != null) {
if (log.isDebugEnabled()) {
- log.debug("We have Transforms");
+ LOG.debug("We have Transforms");
}
resource = transforms.performTransforms(resource);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java Mon Feb 13 13:22:37 2017
@@ -37,7 +37,7 @@ import org.w3c.dom.Element;
*/
public class SecretKeyResolver extends KeyResolverSpi
{
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SecretKeyResolver.class);
private KeyStore keyStore;
@@ -106,7 +106,7 @@ public class SecretKeyResolver extends K
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName() + "?");
+ LOG.debug("Can I resolve " + element.getTagName() + "?");
}
if (XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_KEYNAME)) {
@@ -117,11 +117,11 @@ public class SecretKeyResolver extends K
return (SecretKey) key;
}
} catch (Exception e) {
- log.debug("Cannot recover the key", e);
+ LOG.debug("Cannot recover the key", e);
}
}
- log.debug("I can't");
+ LOG.debug("I can't");
return null;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java Mon Feb 13 13:22:37 2017
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
* Resolves a single Key based on the KeyName.
*/
public class SingleKeyResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SingleKeyResolver.class);
private String keyName;
@@ -96,7 +96,7 @@ public class SingleKeyResolver extends K
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName() + "?");
+ LOG.debug("Can I resolve " + element.getTagName() + "?");
}
if (publicKey != null
@@ -107,7 +107,7 @@ public class SingleKeyResolver extends K
}
}
- log.debug("I can't");
+ LOG.debug("I can't");
return null;
}
@@ -139,7 +139,7 @@ public class SingleKeyResolver extends K
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName() + "?");
+ LOG.debug("Can I resolve " + element.getTagName() + "?");
}
if (secretKey != null
@@ -150,7 +150,7 @@ public class SingleKeyResolver extends K
}
}
- log.debug("I can't");
+ LOG.debug("I can't");
return null;
}
@@ -167,7 +167,7 @@ public class SingleKeyResolver extends K
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName() + "?");
+ LOG.debug("Can I resolve " + element.getTagName() + "?");
}
if (privateKey != null
@@ -178,7 +178,7 @@ public class SingleKeyResolver extends K
}
}
- log.debug("I can't");
+ LOG.debug("I can't");
return null;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java Mon Feb 13 13:22:37 2017
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
*/
public class X509CertificateResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(X509CertificateResolver.class);
/**
@@ -101,7 +101,7 @@ public class X509CertificateResolver ext
return null;
} catch (XMLSecurityException | IOException ex) {
if (log.isDebugEnabled()) {
- log.debug("Security Exception", ex);
+ LOG.debug("Security Exception", ex);
}
throw new KeyResolverException(ex);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java Mon Feb 13 13:22:37 2017
@@ -44,7 +44,7 @@ import org.w3c.dom.Element;
*/
public class X509DigestResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(X509DigestResolver.class);
/** {@inheritDoc}. */
@@ -79,7 +79,7 @@ public class X509DigestResolver extends
throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName());
+ LOG.debug("Can I resolve " + element.getTagName());
}
if (!engineCanResolve(element, baseURI, storage)) {
@@ -90,7 +90,7 @@ public class X509DigestResolver extends
return resolveCertificate(element, baseURI, storage);
} catch (XMLSecurityException e) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", e);
+ LOG.debug("XMLSecurityException", e);
}
}
@@ -142,7 +142,7 @@ public class X509DigestResolver extends
if (Arrays.equals(keyInfoDigest.getDigestBytes(), certDigestBytes)) {
if (log.isDebugEnabled()) {
- log.debug("Found certificate with: " + cert.getSubjectX500Principal().getName());
+ LOG.debug("Found certificate with: " + cert.getSubjectX500Principal().getName());
}
return cert;
}
@@ -168,7 +168,7 @@ public class X509DigestResolver extends
Object exArgs[] = { Constants._TAG_X509DIGEST };
KeyResolverException ex = new KeyResolverException("KeyResolver.needStorageResolver", exArgs);
if (log.isDebugEnabled()) {
- log.debug("", ex);
+ LOG.debug("", ex);
}
throw ex;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java Mon Feb 13 13:22:37 2017
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
public class X509IssuerSerialResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(X509IssuerSerialResolver.class);
@@ -59,7 +59,7 @@ public class X509IssuerSerialResolver ex
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName() + "?");
+ LOG.debug("Can I resolve " + element.getTagName() + "?");
}
X509Data x509data = null;
@@ -67,12 +67,12 @@ public class X509IssuerSerialResolver ex
x509data = new X509Data(element, baseURI);
} catch (XMLSignatureException ex) {
if (log.isDebugEnabled()) {
- log.debug("I can't");
+ LOG.debug("I can't");
}
return null;
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug("I can't");
+ LOG.debug("I can't");
}
return null;
}
@@ -87,7 +87,7 @@ public class X509IssuerSerialResolver ex
new KeyResolverException("KeyResolver.needStorageResolver", exArgs);
if (log.isDebugEnabled()) {
- log.debug("", ex);
+ LOG.debug("", ex);
}
throw ex;
}
@@ -100,28 +100,28 @@ public class X509IssuerSerialResolver ex
XMLX509IssuerSerial certSerial = new XMLX509IssuerSerial(element.getOwnerDocument(), cert);
if (log.isDebugEnabled()) {
- log.debug("Found Certificate Issuer: " + certSerial.getIssuerName());
- log.debug("Found Certificate Serial: " + certSerial.getSerialNumber().toString());
+ LOG.debug("Found Certificate Issuer: " + certSerial.getIssuerName());
+ LOG.debug("Found Certificate Serial: " + certSerial.getSerialNumber().toString());
}
for (int i = 0; i < noOfISS; i++) {
XMLX509IssuerSerial xmliss = x509data.itemIssuerSerial(i);
if (log.isDebugEnabled()) {
- log.debug("Found Element Issuer: "
+ LOG.debug("Found Element Issuer: "
+ xmliss.getIssuerName());
- log.debug("Found Element Serial: "
+ LOG.debug("Found Element Serial: "
+ xmliss.getSerialNumber().toString());
}
if (certSerial.equals(xmliss)) {
if (log.isDebugEnabled()) {
- log.debug("match !!! ");
+ LOG.debug("match !!! ");
}
return cert;
}
if (log.isDebugEnabled()) {
- log.debug("no match...");
+ LOG.debug("no match...");
}
}
}
@@ -129,7 +129,7 @@ public class X509IssuerSerialResolver ex
return null;
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", ex);
+ LOG.debug("XMLSecurityException", ex);
}
throw new KeyResolverException(ex);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java Mon Feb 13 13:22:37 2017
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
public class X509SKIResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(X509SKIResolver.class);
@@ -75,11 +75,11 @@ public class X509SKIResolver extends Key
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName() + "?");
+ LOG.debug("Can I resolve " + element.getTagName() + "?");
}
if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
if (log.isDebugEnabled()) {
- log.debug("I can't");
+ LOG.debug("I can't");
}
return null;
}
@@ -91,7 +91,7 @@ public class X509SKIResolver extends Key
if (!(x509childNodes != null && x509childNodes.length > 0)) {
if (log.isDebugEnabled()) {
- log.debug("I can't");
+ LOG.debug("I can't");
}
return null;
}
@@ -102,7 +102,7 @@ public class X509SKIResolver extends Key
new KeyResolverException("KeyResolver.needStorageResolver", exArgs);
if (log.isDebugEnabled()) {
- log.debug("", ex);
+ LOG.debug("", ex);
}
throw ex;
@@ -122,7 +122,7 @@ public class X509SKIResolver extends Key
for (int i = 0; i < x509childObject.length; i++) {
if (certSKI.equals(x509childObject[i])) {
if (log.isDebugEnabled()) {
- log.debug("Return PublicKey from " + cert.getSubjectX500Principal().getName());
+ LOG.debug("Return PublicKey from " + cert.getSubjectX500Principal().getName());
}
return cert;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java Mon Feb 13 13:22:37 2017
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
public class X509SubjectNameResolver extends KeyResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(X509SubjectNameResolver.class);
@@ -75,14 +75,14 @@ public class X509SubjectNameResolver ext
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
if (log.isDebugEnabled()) {
- log.debug("Can I resolve " + element.getTagName() + "?");
+ LOG.debug("Can I resolve " + element.getTagName() + "?");
}
Element[] x509childNodes = null;
XMLX509SubjectName x509childObject[] = null;
if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
if (log.isDebugEnabled()) {
- log.debug("I can't");
+ LOG.debug("I can't");
}
return null;
}
@@ -91,7 +91,7 @@ public class X509SubjectNameResolver ext
if (!(x509childNodes != null && x509childNodes.length > 0)) {
if (log.isDebugEnabled()) {
- log.debug("I can't");
+ LOG.debug("I can't");
}
return null;
}
@@ -103,7 +103,7 @@ public class X509SubjectNameResolver ext
new KeyResolverException("KeyResolver.needStorageResolver", exArgs);
if (log.isDebugEnabled()) {
- log.debug("", ex);
+ LOG.debug("", ex);
}
throw ex;
@@ -122,24 +122,24 @@ public class X509SubjectNameResolver ext
new XMLX509SubjectName(element.getOwnerDocument(), cert);
if (log.isDebugEnabled()) {
- log.debug("Found Certificate SN: " + certSN.getSubjectName());
+ LOG.debug("Found Certificate SN: " + certSN.getSubjectName());
}
for (int i = 0; i < x509childObject.length; i++) {
if (log.isDebugEnabled()) {
- log.debug("Found Element SN: "
+ LOG.debug("Found Element SN: "
+ x509childObject[i].getSubjectName());
}
if (certSN.equals(x509childObject[i])) {
if (log.isDebugEnabled()) {
- log.debug("match !!! ");
+ LOG.debug("match !!! ");
}
return cert;
}
if (log.isDebugEnabled()) {
- log.debug("no match...");
+ LOG.debug("no match...");
}
}
}
@@ -147,7 +147,7 @@ public class X509SubjectNameResolver ext
return null;
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug("XMLSecurityException", ex);
+ LOG.debug("XMLSecurityException", ex);
}
throw new KeyResolverException(ex);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java Mon Feb 13 13:22:37 2017
@@ -34,7 +34,7 @@ import org.apache.xml.security.keys.stor
*/
public class StorageResolver {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(StorageResolver.class);
/** Field storageResolvers */
@@ -85,7 +85,7 @@ public class StorageResolver {
try {
this.add(new KeyStoreResolver(keyStore));
} catch (StorageResolverException ex) {
- log.error("Could not add KeyStore because of: ", ex);
+ LOG.error("Could not add KeyStore because of: ", ex);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Mon Feb 13 13:22:37 2017
@@ -43,7 +43,7 @@ import org.apache.xml.security.keys.stor
*/
public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(
CertsInFilesystemDirectoryResolver.class
);
@@ -112,28 +112,28 @@ public class CertsInFilesystemDirectoryR
added = true;
} catch (FileNotFoundException ex) {
if (log.isDebugEnabled()) {
- log.debug("Could not add certificate from file " + filename, ex);
+ LOG.debug("Could not add certificate from file " + filename, ex);
}
} catch (CertificateNotYetValidException ex) {
if (log.isDebugEnabled()) {
- log.debug("Could not add certificate from file " + filename, ex);
+ LOG.debug("Could not add certificate from file " + filename, ex);
}
} catch (CertificateExpiredException ex) {
if (log.isDebugEnabled()) {
- log.debug("Could not add certificate from file " + filename, ex);
+ LOG.debug("Could not add certificate from file " + filename, ex);
}
} catch (CertificateException ex) {
if (log.isDebugEnabled()) {
- log.debug("Could not add certificate from file " + filename, ex);
+ LOG.debug("Could not add certificate from file " + filename, ex);
}
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug("Could not add certificate from file " + filename, ex);
+ LOG.debug("Could not add certificate from file " + filename, ex);
}
}
- if (added && log.isDebugEnabled()) {
- log.debug("Added certificate: " + dn);
+ if (added && LOG.isDebugEnabled()) {
+ LOG.debug("Added certificate: " + dn);
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java Mon Feb 13 13:22:37 2017
@@ -56,7 +56,7 @@ public class Manifest extends SignatureE
*/
public static final int MAXIMUM_REFERENCE_COUNT = 30;
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Manifest.class);
/** Field references */
@@ -308,8 +308,8 @@ public class Manifest extends SignatureE
);
}
if (log.isDebugEnabled()) {
- log.debug("verify " + referencesEl.length + " References");
- log.debug("I am " + (followManifests
+ LOG.debug("verify " + referencesEl.length + " References");
+ LOG.debug("I am " + (followManifests
? "" : "not") + " requested to follow nested Manifests");
}
if (referencesEl.length == 0) {
@@ -339,13 +339,13 @@ public class Manifest extends SignatureE
verify = false;
}
if (log.isDebugEnabled()) {
- log.debug("The Reference has Type " + currentRef.getType());
+ LOG.debug("The Reference has Type " + currentRef.getType());
}
// was verification successful till now and do we want to verify the Manifest?
if (verify && followManifests && currentRef.typeIsReferenceToManifest()) {
if (log.isDebugEnabled()) {
- log.debug("We have to follow a nested Manifest");
+ LOG.debug("We have to follow a nested Manifest");
}
try {
@@ -370,7 +370,7 @@ public class Manifest extends SignatureE
break;
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
// Hm, seems not to be a ds:Manifest
}
@@ -393,10 +393,10 @@ public class Manifest extends SignatureE
if (!referencedManifestValid) {
verify = false;
- log.warn("The nested Manifest was invalid (bad)");
+ LOG.warn("The nested Manifest was invalid (bad)");
} else {
if (log.isDebugEnabled()) {
- log.debug("The nested Manifest was valid (good)");
+ LOG.debug("The nested Manifest was valid (good)");
}
}
} catch (IOException ex) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java Mon Feb 13 13:22:37 2017
@@ -127,7 +127,7 @@ public class Reference extends Signature
}
});
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Reference.class);
private Manifest manifest;
@@ -646,8 +646,8 @@ public class Reference extends Signature
}
};
} catch (Exception e) {
- // log a warning
- log.warn("cannot cache dereferenced data: " + e);
+ // LOG a warning
+ LOG.warn("cannot cache dereferenced data: " + e);
}
} else if (input.isElement()) {
referenceData = new ReferenceSubTreeData
@@ -658,8 +658,8 @@ public class Reference extends Signature
(input.getOctetStream(), input.getSourceURI(),
input.getMIMEType());
} catch (IOException ioe) {
- // log a warning
- log.warn("cannot cache dereferenced data: " + ioe);
+ // LOG a warning
+ LOG.warn("cannot cache dereferenced data: " + ioe);
}
}
}
@@ -761,7 +761,7 @@ public class Reference extends Signature
*/
private byte[] getPreCalculatedDigest(XMLSignatureInput input)
throws ReferenceNotInitializedException {
- log.debug("Verifying element with pre-calculated digest");
+ LOG.debug("Verifying element with pre-calculated digest");
String preCalculatedDigest = input.getPreCalculatedDigest();
return Base64.getMimeDecoder().decode(preCalculatedDigest);
}
@@ -800,12 +800,12 @@ public class Reference extends Signature
boolean equal = MessageDigestAlgorithm.isEqual(elemDig, calcDig);
if (!equal) {
- log.warn("Verification failed for URI \"" + this.getURI() + "\"");
- log.warn("Expected Digest: " + Base64.getMimeEncoder().encodeToString(elemDig));
- log.warn("Actual Digest: " + Base64.getMimeEncoder().encodeToString(calcDig));
+ LOG.warn("Verification failed for URI \"" + this.getURI() + "\"");
+ LOG.warn("Expected Digest: " + Base64.getMimeEncoder().encodeToString(elemDig));
+ LOG.warn("Actual Digest: " + Base64.getMimeEncoder().encodeToString(calcDig));
} else {
if (log.isDebugEnabled()) {
- log.debug("Verification successful for URI \"" + this.getURI() + "\"");
+ LOG.debug("Verification successful for URI \"" + this.getURI() + "\"");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java Mon Feb 13 13:22:37 2017
@@ -183,7 +183,7 @@ public final class XMLSignature extends
public static final String ALGO_ID_SIGNATURE_ECDSA_RIPEMD160 =
"http://www.w3.org/2007/05/xmldsig-more#ecdsa-ripemd160";
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLSignature.class);
/** ds:Signature.ds:SignedInfo element */
@@ -713,10 +713,10 @@ public final class XMLSignature extends
//SignedInfo. This is used to validate the signature.
SignatureAlgorithm sa = si.getSignatureAlgorithm();
if (log.isDebugEnabled()) {
- log.debug("signatureMethodURI = " + sa.getAlgorithmURI());
- log.debug("jceSigAlgorithm = " + sa.getJCEAlgorithmString());
- log.debug("jceSigProvider = " + sa.getJCEProviderName());
- log.debug("PublicKey = " + pk);
+ LOG.debug("signatureMethodURI = " + sa.getAlgorithmURI());
+ LOG.debug("jceSigAlgorithm = " + sa.getJCEAlgorithmString());
+ LOG.debug("jceSigProvider = " + sa.getJCEProviderName());
+ LOG.debug("PublicKey = " + pk);
}
byte sigBytes[] = null;
try (SignerOutputStream so = new SignerOutputStream(sa);
@@ -731,7 +731,7 @@ public final class XMLSignature extends
sigBytes = this.getSignatureValue();
} catch (IOException ex) {
if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
}
// Impossible...
} catch (XMLSecurityException ex) {
@@ -741,7 +741,7 @@ public final class XMLSignature extends
// have SignatureAlgorithm sign the input bytes and compare them to
// the bytes that were stored in the signature.
if (!sa.verify(sigBytes)) {
- log.warn("Signature verification failed.");
+ LOG.warn("Signature verification failed.");
return false;
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -62,7 +62,7 @@ import java.util.Map;
*/
public class XIncludeHandler extends DefaultHandler {
- private static final transient Logger log = LoggerFactory.getLogger(XIncludeHandler.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XIncludeHandler.class);
private static final String xIncludeNS = "http://www.w3.org/2001/XInclude";
private static final String xIncludeLN = "include";
@@ -231,17 +231,17 @@ public class XIncludeHandler extends Def
@Override
public void warning(SAXParseException e) throws SAXException {
- log.warn(e.getMessage(), e);
+ LOG.warn(e.getMessage(), e);
}
@Override
public void error(SAXParseException e) throws SAXException {
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
}
@Override
public void fatalError(SAXParseException e) throws SAXException {
- log.error(e.getMessage(), e);
+ LOG.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/AbstractInputSecurityHeaderHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java Mon Feb 13 13:22:37 2017
@@ -31,7 +31,7 @@ import java.util.Iterator;
import java.util.List;
/**
- * Abstract class for SecurityHeaderHandlers with parse logic for the xml structures
+ * Abstract class for SecurityHeaderHandlers with parse LOGic for the xml structures
*
* @author $Author$
* @version $Revision$ $Date$
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -48,7 +48,7 @@ import java.util.List;
*/
public class InboundXMLSec {
- protected static final transient Logger log = LoggerFactory.getLogger(InboundXMLSec.class);
+ protected static final transient Logger LOG = LoggerFactory.getLogger(InboundXMLSec.class);
private static final XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
@@ -60,7 +60,7 @@ public class InboundXMLSec {
xmlInputFactory.setProperty("org.codehaus.stax2.internNsUris", true);
xmlInputFactory.setProperty("org.codehaus.stax2.preserveLocation", false);
} catch (IllegalArgumentException e) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
//ignore
}
}
@@ -146,8 +146,8 @@ public class InboundXMLSec {
inputProcessorChain.addProcessor(new XMLSecurityInputProcessor(securityProperties));
if (log.isTraceEnabled()) {
- LogInputProcessor logInputProcessor = new LogInputProcessor(securityProperties);
- logInputProcessor.addAfterProcessor(XMLSecurityInputProcessor.class.getName());
+ LogInputProcessor LOGInputProcessor = new LogInputProcessor(securityProperties);
+ LOGInputProcessor.addAfterProcessor(XMLSecurityInputProcessor.class.getName());
inputProcessorChain.addProcessor(logInputProcessor);
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -36,8 +36,8 @@ import java.util.List;
*/
public class InputProcessorChainImpl implements InputProcessorChain {
- protected static final transient Logger log = LoggerFactory.getLogger(InputProcessorChainImpl.class);
- protected static final transient boolean isDebugEnabled = log.isDebugEnabled();
+ protected static final transient Logger LOG = LoggerFactory.getLogger(InputProcessorChainImpl.class);
+ protected static final transient boolean isDebugEnabled = LOG.isDebugEnabled();
private List<InputProcessor> inputProcessors;
private int startPos;
@@ -159,10 +159,10 @@ public class InputProcessorChainImpl imp
}
}
if (isDebugEnabled) {
- log.debug("Added " + newInputProcessor.getClass().getName() + " to input chain: ");
+ LOG.debug("Added " + newInputProcessor.getClass().getName() + " to input chain: ");
for (int i = 0; i < inputProcessors.size(); i++) {
InputProcessor inputProcessor = inputProcessors.get(i);
- log.debug("Name: " + inputProcessor.getClass().getName() + " phase: " + inputProcessor.getPhase());
+ LOG.debug("Name: " + inputProcessor.getClass().getName() + " phase: " + inputProcessor.getPhase());
}
}
}
@@ -170,7 +170,7 @@ public class InputProcessorChainImpl imp
@Override
public synchronized void removeProcessor(InputProcessor inputProcessor) {
if (isDebugEnabled) {
- log.debug("Removing processor " + inputProcessor.getClass().getName() + " from input chain");
+ LOG.debug("Removing processor " + inputProcessor.getClass().getName() + " from input chain");
}
if (this.inputProcessors.indexOf(inputProcessor) <= curPos) {
this.curPos--;
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -38,8 +38,8 @@ import java.util.List;
*/
public class OutputProcessorChainImpl implements OutputProcessorChain {
- protected static final transient Logger log = LoggerFactory.getLogger(OutputProcessorChainImpl.class);
- protected static final transient boolean isDebugEnabled = log.isDebugEnabled();
+ protected static final transient Logger LOG = LoggerFactory.getLogger(OutputProcessorChainImpl.class);
+ protected static final transient boolean isDebugEnabled = LOG.isDebugEnabled();
private List<OutputProcessor> outputProcessors;
private int startPos;
@@ -165,10 +165,10 @@ public class OutputProcessorChainImpl im
this.curPos++;
}
if (isDebugEnabled) {
- log.debug("Added " + newOutputProcessor.getClass().getName() + " to output chain: ");
+ LOG.debug("Added " + newOutputProcessor.getClass().getName() + " to output chain: ");
for (int i = 0; i < outputProcessors.size(); i++) {
OutputProcessor outputProcessor = outputProcessors.get(i);
- log.debug("Name: " + outputProcessor.getClass().getName() + " phase: " + outputProcessor.getPhase());
+ LOG.debug("Name: " + outputProcessor.getClass().getName() + " phase: " + outputProcessor.getPhase());
}
}
}
@@ -176,7 +176,7 @@ public class OutputProcessorChainImpl im
@Override
public void removeProcessor(OutputProcessor outputProcessor) {
if (isDebugEnabled) {
- log.debug("Removing processor " + outputProcessor.getClass().getName() + " from output chain");
+ LOG.debug("Removing processor " + outputProcessor.getClass().getName() + " from output chain");
}
if (this.outputProcessors.indexOf(outputProcessor) <= this.curPos) {
this.curPos--;
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -67,7 +67,7 @@ import java.util.*;
*/
public abstract class AbstractDecryptInputProcessor extends AbstractInputProcessor {
- private static final transient Logger log = LoggerFactory.getLogger(AbstractDecryptInputProcessor.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(AbstractDecryptInputProcessor.class);
protected static final Integer maximumAllowedXMLStructureDepth =
Integer.valueOf(ConfigurationProperties.getProperty("MaximumAllowedXMLStructureDepth"));
@@ -190,7 +190,7 @@ public abstract class AbstractDecryptInp
}
tmpXmlEventList.clear();
- //the following logic reads the encryptedData structure and doesn't pass them further
+ //the following LOGic reads the encryptedData structure and doesn't pass them further
//through the chain
InputProcessorChain subInputProcessorChain = inputProcessorChain.createSubChain(this);
@@ -261,7 +261,7 @@ public abstract class AbstractDecryptInp
//we have to start the thread before we call decryptionThread.getPipedInputStream().
//Otherwise we will end in a deadlock, because the StAX reader expects already data.
//@See some lines below:
- log.debug("Starting decryption thread");
+ LOG.debug("Starting decryption thread");
thread.start();
InputStream prologInputStream;
@@ -815,7 +815,7 @@ public abstract class AbstractDecryptInp
//close to get Cipher.doFinal() called
outputStreamWriter.close();
- log.debug("Decryption thread finished");
+ LOG.debug("Decryption thread finished");
} catch (Exception e) {
try {