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:23:26 UTC
svn commit: r1782769 [2/2] - 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/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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -100,7 +100,7 @@ public class RetrievalMethodResolver ext
// which points to this element
if (XMLUtils.elementIsInSignatureSpace(e, Constants._TAG_RETRIEVALMETHOD)) {
if (secureValidation) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
String error = "Error: It is forbidden to have one RetrievalMethod "
+ "point to another with secure validation";
LOG.debug(error);
@@ -111,7 +111,7 @@ public class RetrievalMethodResolver ext
XMLSignatureInput resource2 = resolveInput(rm2, baseURI, secureValidation);
Element e2 = obtainReferenceElement(resource2, secureValidation);
if (e2 == element) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Error: Can't have RetrievalMethods pointing to each other");
}
return null;
@@ -120,23 +120,23 @@ public class RetrievalMethodResolver ext
return resolveKey(e, baseURI, storage);
} catch (XMLSecurityException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("XMLSecurityException", ex);
}
} catch (CertificateException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("CertificateException", ex);
}
} catch (IOException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("IOException", ex);
}
} catch (ParserConfigurationException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("ParserConfigurationException", e);
}
} catch (SAXException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("SAXException", e);
}
}
@@ -170,7 +170,7 @@ public class RetrievalMethodResolver ext
// which points to this element
if (XMLUtils.elementIsInSignatureSpace(e, Constants._TAG_RETRIEVALMETHOD)) {
if (secureValidation) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
String error = "Error: It is forbidden to have one RetrievalMethod "
+ "point to another with secure validation";
LOG.debug(error);
@@ -181,7 +181,7 @@ public class RetrievalMethodResolver ext
XMLSignatureInput resource2 = resolveInput(rm2, baseURI, secureValidation);
Element e2 = obtainReferenceElement(resource2, secureValidation);
if (e2 == element) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Error: Can't have RetrievalMethods pointing to each other");
}
return null;
@@ -190,23 +190,23 @@ public class RetrievalMethodResolver ext
return resolveCertificate(e, baseURI, storage);
} catch (XMLSecurityException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("XMLSecurityException", ex);
}
} catch (CertificateException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("CertificateException", ex);
}
} catch (IOException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("IOException", ex);
}
} catch (ParserConfigurationException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("ParserConfigurationException", e);
}
} catch (SAXException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("SAXException", e);
}
}
@@ -224,7 +224,7 @@ public class RetrievalMethodResolver ext
private static X509Certificate resolveCertificate(
Element e, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ e.getLocalName() + " Element");
}
@@ -246,7 +246,7 @@ public class RetrievalMethodResolver ext
private static PublicKey resolveKey(
Element e, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ e.getLocalName() + " Element");
}
@@ -271,7 +271,7 @@ public class RetrievalMethodResolver ext
byte inputBytes[] = resource.getBytes();
e = getDocFromBytes(inputBytes, secureValidation);
// otherwise, we parse the resource, create an Element and delegate
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("we have to parse " + inputBytes.length + " bytes");
}
}
@@ -303,7 +303,7 @@ public class RetrievalMethodResolver ext
ResourceResolver resRes = ResourceResolver.getInstance(uri, baseURI, secureValidation);
XMLSignatureInput resource = resRes.resolve(uri, baseURI, secureValidation);
if (transforms != null) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -105,7 +105,7 @@ public class SecretKeyResolver extends K
public SecretKey engineResolveSecretKey(
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Can I resolve " + element.getTagName() + "?");
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -95,7 +95,7 @@ public class SingleKeyResolver extends K
public PublicKey engineLookupAndResolvePublicKey(
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Can I resolve " + element.getTagName() + "?");
}
@@ -138,7 +138,7 @@ public class SingleKeyResolver extends K
public SecretKey engineResolveSecretKey(
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Can I resolve " + element.getTagName() + "?");
}
@@ -166,7 +166,7 @@ public class SingleKeyResolver extends K
public PrivateKey engineLookupAndResolvePrivateKey(
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Can I resolve " + element.getTagName() + "?");
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -100,7 +100,7 @@ public class X509CertificateResolver ext
}
return null;
} catch (XMLSecurityException | IOException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -78,7 +78,7 @@ public class X509DigestResolver extends
public X509Certificate engineLookupResolveX509Certificate(Element element, String baseURI, StorageResolver storage)
throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Can I resolve " + element.getTagName());
}
@@ -89,7 +89,7 @@ public class X509DigestResolver extends
try {
return resolveCertificate(element, baseURI, storage);
} catch (XMLSecurityException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("XMLSecurityException", e);
}
}
@@ -141,7 +141,7 @@ public class X509DigestResolver extends
byte[] certDigestBytes = XMLX509Digest.getDigestBytesFromCert(cert, keyInfoDigest.getAlgorithm());
if (Arrays.equals(keyInfoDigest.getDigestBytes(), certDigestBytes)) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Found certificate with: " + cert.getSubjectX500Principal().getName());
}
return cert;
@@ -167,7 +167,7 @@ public class X509DigestResolver extends
if (storage == null) {
Object exArgs[] = { Constants._TAG_X509DIGEST };
KeyResolverException ex = new KeyResolverException("KeyResolver.needStorageResolver", exArgs);
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -58,7 +58,7 @@ public class X509IssuerSerialResolver ex
public X509Certificate engineLookupResolveX509Certificate(
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Can I resolve " + element.getTagName() + "?");
}
@@ -66,12 +66,12 @@ public class X509IssuerSerialResolver ex
try {
x509data = new X509Data(element, baseURI);
} catch (XMLSignatureException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I can't");
}
return null;
} catch (XMLSecurityException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I can't");
}
return null;
@@ -86,7 +86,7 @@ public class X509IssuerSerialResolver ex
KeyResolverException ex =
new KeyResolverException("KeyResolver.needStorageResolver", exArgs);
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("", ex);
}
throw ex;
@@ -99,7 +99,7 @@ public class X509IssuerSerialResolver ex
X509Certificate cert = (X509Certificate)storageIterator.next();
XMLX509IssuerSerial certSerial = new XMLX509IssuerSerial(element.getOwnerDocument(), cert);
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Found Certificate Issuer: " + certSerial.getIssuerName());
LOG.debug("Found Certificate Serial: " + certSerial.getSerialNumber().toString());
}
@@ -107,7 +107,7 @@ public class X509IssuerSerialResolver ex
for (int i = 0; i < noOfISS; i++) {
XMLX509IssuerSerial xmliss = x509data.itemIssuerSerial(i);
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Found Element Issuer: "
+ xmliss.getIssuerName());
LOG.debug("Found Element Serial: "
@@ -115,12 +115,12 @@ public class X509IssuerSerialResolver ex
}
if (certSerial.equals(xmliss)) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("match !!! ");
}
return cert;
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("no match...");
}
}
@@ -128,7 +128,7 @@ public class X509IssuerSerialResolver ex
return null;
} catch (XMLSecurityException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("XMLSecurityException", 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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -74,11 +74,11 @@ public class X509SKIResolver extends Key
public X509Certificate engineLookupResolveX509Certificate(
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Can I resolve " + element.getTagName() + "?");
}
if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I can't");
}
return null;
@@ -90,7 +90,7 @@ public class X509SKIResolver extends Key
x509childNodes = XMLUtils.selectDsNodes(element.getFirstChild(), Constants._TAG_X509SKI);
if (!(x509childNodes != null && x509childNodes.length > 0)) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I can't");
}
return null;
@@ -101,7 +101,7 @@ public class X509SKIResolver extends Key
KeyResolverException ex =
new KeyResolverException("KeyResolver.needStorageResolver", exArgs);
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("", ex);
}
@@ -121,7 +121,7 @@ public class X509SKIResolver extends Key
for (int i = 0; i < x509childObject.length; i++) {
if (certSKI.equals(x509childObject[i])) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Return PublicKey from " + cert.getSubjectX500Principal().getName());
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -74,14 +74,14 @@ public class X509SubjectNameResolver ext
public X509Certificate engineLookupResolveX509Certificate(
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Can I resolve " + element.getTagName() + "?");
}
Element[] x509childNodes = null;
XMLX509SubjectName x509childObject[] = null;
if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I can't");
}
return null;
@@ -90,7 +90,7 @@ public class X509SubjectNameResolver ext
XMLUtils.selectDsNodes(element.getFirstChild(), Constants._TAG_X509SUBJECTNAME);
if (!(x509childNodes != null && x509childNodes.length > 0)) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I can't");
}
return null;
@@ -102,7 +102,7 @@ public class X509SubjectNameResolver ext
KeyResolverException ex =
new KeyResolverException("KeyResolver.needStorageResolver", exArgs);
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("", ex);
}
@@ -121,24 +121,24 @@ public class X509SubjectNameResolver ext
XMLX509SubjectName certSN =
new XMLX509SubjectName(element.getOwnerDocument(), cert);
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Found Certificate SN: " + certSN.getSubjectName());
}
for (int i = 0; i < x509childObject.length; i++) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Found Element SN: "
+ x509childObject[i].getSubjectName());
}
if (certSN.equals(x509childObject[i])) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("match !!! ");
}
return cert;
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("no match...");
}
}
@@ -146,7 +146,7 @@ public class X509SubjectNameResolver ext
return null;
} catch (XMLSecurityException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("XMLSecurityException", 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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -111,23 +111,23 @@ public class CertsInFilesystemDirectoryR
dn = cert.getSubjectX500Principal().getName();
added = true;
} catch (FileNotFoundException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Could not add certificate from file " + filename, ex);
}
} catch (CertificateNotYetValidException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Could not add certificate from file " + filename, ex);
}
} catch (CertificateExpiredException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Could not add certificate from file " + filename, ex);
}
} catch (CertificateException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Could not add certificate from file " + filename, ex);
}
} catch (IOException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Could not add certificate from file " + filename, ex);
}
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -307,7 +307,7 @@ public class Manifest extends SignatureE
getFirstChild(), Constants._TAG_REFERENCE
);
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("verify " + referencesEl.length + " References");
LOG.debug("I am " + (followManifests
? "" : "not") + " requested to follow nested Manifests");
@@ -338,13 +338,13 @@ public class Manifest extends SignatureE
if (!currentRefVerified) {
verify = false;
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("We have to follow a nested Manifest");
}
@@ -369,7 +369,7 @@ public class Manifest extends SignatureE
);
break;
} catch (XMLSecurityException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
// Hm, seems not to be a ds:Manifest
@@ -395,7 +395,7 @@ public class Manifest extends SignatureE
LOG.warn("The nested Manifest was invalid (bad)");
} else {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("The nested Manifest was valid (good)");
}
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -804,7 +804,7 @@ public class Reference extends Signature
LOG.warn("Expected Digest: " + Base64.getMimeEncoder().encodeToString(elemDig));
LOG.warn("Actual Digest: " + Base64.getMimeEncoder().encodeToString(calcDig));
} else {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -712,7 +712,7 @@ public final class XMLSignature extends
//create a SignatureAlgorithms from the SignatureMethod inside
//SignedInfo. This is used to validate the signature.
SignatureAlgorithm sa = si.getSignatureAlgorithm();
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("signatureMethodURI = " + sa.getAlgorithmURI());
LOG.debug("jceSigAlgorithm = " + sa.getJCEAlgorithmString());
LOG.debug("jceSigProvider = " + sa.getJCEProviderName());
@@ -730,7 +730,7 @@ public final class XMLSignature extends
// retrieve the byte[] from the stored signature
sigBytes = this.getSignatureValue();
} catch (IOException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
// Impossible...
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -145,10 +145,10 @@ public class InboundXMLSec {
inputProcessorChain.addProcessor(new XMLSecurityInputProcessor(securityProperties));
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
LogInputProcessor LOGInputProcessor = new LogInputProcessor(securityProperties);
LOGInputProcessor.addAfterProcessor(XMLSecurityInputProcessor.class.getName());
- inputProcessorChain.addProcessor(logInputProcessor);
+ inputProcessorChain.addProcessor(LOGInputProcessor);
}
return new XMLSecurityStreamReader(inputProcessorChain, securityProperties);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java?rev=1782769&r1=1782768&r2=1782769&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java Mon Feb 13 13:23:24 2017
@@ -268,7 +268,7 @@ public class XMLSecurityStreamWriter imp
@Override
public void writeDTD(String dtd) throws XMLStreamException {
if (elementStack != null) {
- throw new XMLStreamException("Not in prolog");
+ throw new XMLStreamException("Not in proLOG");
}
chainProcessEvent(XMLSecEventFactory.createXMLSecDTD(dtd));
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -385,7 +385,7 @@ public abstract class AbstractSignatureR
}
protected void compareDigest(byte[] calculatedDigest, ReferenceType referenceType) throws XMLSecurityException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Calculated Digest: " + new String(Base64.encodeBase64(calculatedDigest)));
LOG.debug("Stored Digest: " + new String(Base64.encodeBase64(referenceType.getDigestValue())));
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -128,7 +128,7 @@ public abstract class AbstractSignatureO
}
String calculatedDigest = new String(Base64.encodeBase64(digestOutputStream.getDigestValue()));
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Calculated Digest: " + calculatedDigest);
}
@@ -294,7 +294,7 @@ public abstract class AbstractSignatureO
throw new XMLSecurityException(e);
}
String calculatedDigest = new String(Base64.encodeBase64(this.digestOutputStream.getDigestValue()));
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Calculated Digest: " + calculatedDigest);
}
signaturePartDef.setDigestValue(calculatedDigest);
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -356,7 +356,7 @@ public final class Transform extends Sig
);
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Create URI \"" + algorithmURI + "\" class \""
+ newTransformSpi.getClass() + "\"");
LOG.debug("The NodeList is " + contextNodes);
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -161,7 +161,7 @@ public class Transforms extends Signatur
*/
public void addTransform(String transformURI) throws TransformationException {
try {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Transforms.addTransform(" + transformURI + ")");
}
@@ -185,7 +185,7 @@ public class Transforms extends Signatur
public void addTransform(String transformURI, Element contextElement)
throws TransformationException {
try {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Transforms.addTransform(" + transformURI + ")");
}
@@ -223,7 +223,7 @@ public class Transforms extends Signatur
* @param transform {@link Transform} object
*/
private void addTransform(Transform transform) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Transforms.addTransform(" + transform.getURI() + ")");
}
@@ -263,7 +263,7 @@ public class Transforms extends Signatur
int last = this.getLength() - 1;
for (int i = 0; i < last; i++) {
Transform t = this.item(i);
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
String uri = t.getURI();
LOG.debug("Perform the (" + i + ")th " + uri + " transform");
}
@@ -272,7 +272,7 @@ public class Transforms extends Signatur
}
if (last >= 0) {
Transform t = this.item(last);
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
String uri = t.getURI();
LOG.debug("Perform the (" + last + ")th " + uri + " transform");
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -119,7 +119,7 @@ public final class ClassLoaderUtils {
try {
urls = Thread.currentThread().getContextClassLoader().getResources(resourceName);
} catch (IOException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(e.getMessage(), e);
}
//ignore
@@ -132,7 +132,7 @@ public final class ClassLoaderUtils {
resourceName.substring(1)
);
} catch (IOException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(e.getMessage(), e);
}
// ignore
@@ -147,7 +147,7 @@ public final class ClassLoaderUtils {
try {
urls = cluClassloader.getResources(resourceName);
} catch (IOException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(e.getMessage(), e);
}
// ignore
@@ -158,7 +158,7 @@ public final class ClassLoaderUtils {
try {
urls = cluClassloader.getResources(resourceName.substring(1));
} catch (IOException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(e.getMessage(), e);
}
// ignore
@@ -172,7 +172,7 @@ public final class ClassLoaderUtils {
try {
urls = cl.getResources(resourceName);
} catch (IOException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(e.getMessage(), e);
}
// ignore
@@ -211,7 +211,7 @@ public final class ClassLoaderUtils {
try {
return (url != null) ? url.openStream() : null;
} catch (IOException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(e.getMessage(), e);
}
return null;
@@ -241,7 +241,7 @@ public final class ClassLoaderUtils {
return cl.loadClass(className);
}
} catch (ClassNotFoundException e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(e.getMessage(), e);
}
//ignore
@@ -263,7 +263,7 @@ public final class ClassLoaderUtils {
return callingClass.getClassLoader().loadClass(className);
}
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -51,7 +51,7 @@ public class DigesterOutputStream extend
/** @inheritDoc */
public void write(byte[] arg0, int arg1, int arg2) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Pre-digested input:");
StringBuilder sb = new StringBuilder(arg2);
for (int i = arg1; i < (arg1 + arg2); i++) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -87,7 +87,7 @@ public abstract class ElementProxy {
throw new XMLSecurityException("ElementProxy.nullElement");
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("setElement(\"" + element.getTagName() + "\", \"" + baseURI + "\")");
}
@@ -177,7 +177,7 @@ public abstract class ElementProxy {
throw new XMLSecurityException("ElementProxy.nullElement");
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("setElement(" + element.getTagName() + ", \"" + baseURI + "\"");
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -83,12 +83,12 @@ public final class JavaUtils {
try (FileOutputStream fos = new FileOutputStream(f)) {
fos.write(bytes);
} catch (IOException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
}
} else {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -60,7 +60,7 @@ public class SignerOutputStream extends
/** @inheritDoc */
public void write(byte[] arg0, int arg1, int arg2) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Canonicalized SignedInfo:");
StringBuilder sb = new StringBuilder(arg2);
for (int i = arg1; i < (arg1 + arg2); i++) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -233,16 +233,16 @@ public final class XMLUtils {
Canonicalizer.ALGO_ID_C14N_PHYSICAL).canonicalizeSubtree(contextNode)
);
} catch (IOException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
}
catch (InvalidCanonicalizerException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
} catch (CanonicalizationException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
}
@@ -267,17 +267,17 @@ public final class XMLUtils {
Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS).canonicalizeSubtree(contextNode)
);
} catch (IOException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
// throw new RuntimeException(ex.getMessage());
} catch (InvalidCanonicalizerException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
// throw new RuntimeException(ex.getMessage());
} catch (CanonicalizationException ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
// throw new RuntimeException(ex.getMessage());
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java?rev=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -151,7 +151,7 @@ public class XalanXPathAPI implements XP
Constructor<?> constructor = XPath.class.getConstructor(classes);
xpath = (XPath) constructor.newInstance(objects);
} catch (Exception ex) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(ex.getMessage(), ex);
}
}
@@ -164,13 +164,13 @@ public class XalanXPathAPI implements XP
private static synchronized void fixupFunctionTable() {
installed = false;
if (new FunctionTable().functionAvailable("here")) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Here function already registered");
}
installed = true;
return;
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Registering Here function");
}
/**
@@ -199,7 +199,7 @@ public class XalanXPathAPI implements XP
LOG.debug("Error installing function using the static installFunction method", ex);
}
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
if (installed) {
LOG.debug("Registered 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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -90,7 +90,7 @@ public class ResourceResolver {
}
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(
"check resolvability by class " + resolverTmp.getClass().getName()
);
@@ -147,7 +147,7 @@ public class ResourceResolver {
public static ResourceResolver getInstance(
Attr uri, String baseURI, List<ResourceResolver> individualResolvers, boolean secureValidation
) throws ResourceResolverException {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(
"I was asked to create a ResourceResolver and got "
+ (individualResolvers == null ? 0 : individualResolvers.size())
@@ -162,7 +162,7 @@ public class ResourceResolver {
ResourceResolver resolver = individualResolvers.get(i);
if (resolver != null) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
String currentClass = resolver.resolverSpi.getClass().getName();
LOG.debug("check resolvability by class " + currentClass);
}
@@ -256,7 +256,7 @@ public class ResourceResolver {
resolverList.add(new ResourceResolver(resourceResolverSpi));
}
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Registered resolver: " + resourceResolverSpi.toString());
}
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -137,7 +137,7 @@ public class ResolverDirectHTTP extends
summarized += read;
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Fetched " + summarized + " bytes from URI " + uriNew.toString());
}
@@ -203,32 +203,32 @@ public class ResolverDirectHTTP extends
*/
public boolean engineCanResolveURI(ResourceResolverContext context) {
if (context.uriToResolve == null) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("quick fail, uri == null");
}
return false;
}
if (context.uriToResolve.equals("") || context.uriToResolve.charAt(0) == '#') {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("quick fail for empty URIs and local ones");
}
return false;
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I state that I can resolve " + context.uriToResolve);
}
return true;
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I state that I can't resolve " + context.uriToResolve);
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -60,7 +60,7 @@ public class ResolverFragment extends Re
* Identifies the node-set (minus any comment nodes) of the XML
* resource containing the signature
*/
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("ResolverFragment with empty URI (means complete document)");
}
selectedElem = doc;
@@ -91,7 +91,7 @@ public class ResolverFragment extends Re
);
}
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(
"Try to catch an Element with ID " + id + " and Element was " + selectedElem
);
@@ -118,7 +118,7 @@ public class ResolverFragment extends Re
*/
public boolean engineCanResolveURI(ResourceResolverContext context) {
if (context.uriToResolve == null) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Quick fail for null uri");
}
return false;
@@ -127,12 +127,12 @@ public class ResolverFragment extends Re
if (context.uriToResolve.equals("") ||
context.uriToResolve.charAt(0) == '#' && !context.uriToResolve.startsWith("#xpointer(")
) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("State I can resolve reference: \"" + context.uriToResolve + "\"");
}
return true;
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -115,23 +115,23 @@ public class ResolverLocalFilesystem ext
}
try {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I was asked whether I can resolve " + context.uriToResolve);
}
if (context.uriToResolve.startsWith("file:") || context.baseUri.startsWith("file:")) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("I state that I can resolve " + context.uriToResolve);
}
return true;
}
} catch (Exception e) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(e.getMessage(), e);
}
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("But I can't");
}
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -144,7 +144,7 @@ public class ResolverXPointer extends Re
int idLen = idPlusDelim.length() -1;
if (idPlusDelim.charAt(0) == '"' && idPlusDelim.charAt(idLen) == '"'
|| idPlusDelim.charAt(0) == '\'' && idPlusDelim.charAt(idLen) == '\'') {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -106,7 +106,7 @@ public class ClassLoaderTest extends org
}
long end = System.currentTimeMillis();
long elapsed = end-start;
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
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=1782769&r1=1782768&r2=1782769&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:23:24 2017
@@ -41,7 +41,7 @@ public class Driver {
}
long end = System.currentTimeMillis();
long elapsed = end - start;
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.debug("Elapsed: " + elapsed);
LOG.debug("dsig succeeded");
}