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 [4/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/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java Mon Feb 13 13:22:37 2017
@@ -32,7 +32,7 @@ import org.apache.xml.security.signature
*/
public class BaltimoreTest extends InteropTestBase {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(BaltimoreTest.class);
/** Field merlinsDir15 */
@@ -73,7 +73,7 @@ public class BaltimoreTest extends Inter
"secret".getBytes("ASCII"));
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -96,7 +96,7 @@ public class BaltimoreTest extends Inter
this.verifyHMAC(filename, resolver, followManifests, hmacKey);
fail("HMACOutputLength Exception not caught");
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
} catch (XMLSignatureException ex) {
if (!ex.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
@@ -121,12 +121,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -148,12 +148,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -175,12 +175,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -202,12 +202,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -229,12 +229,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -256,12 +256,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -284,12 +284,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -315,12 +315,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (verify) {
- log.error("Verification passed (should have failed) for " + filename);
+ LOG.error("Verification passed (should have failed) for " + filename);
}
assertFalse(filename, verify);
@@ -339,7 +339,7 @@ public class BaltimoreTest extends Inter
"secret".getBytes("ASCII"));
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -362,7 +362,7 @@ public class BaltimoreTest extends Inter
this.verifyHMAC(filename, resolver, followManifests, hmacKey);
fail("HMACOutputLength Exception not caught");
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
} catch (XMLSignatureException ex) {
if (!ex.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
@@ -387,12 +387,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -414,12 +414,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -441,12 +441,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -468,12 +468,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -495,12 +495,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -522,12 +522,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -550,12 +550,12 @@ public class BaltimoreTest extends Inter
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java Mon Feb 13 13:22:37 2017
@@ -33,7 +33,7 @@ import org.apache.xml.security.utils.res
*/
public class IAIKTest extends InteropTestBase {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(IAIKTest.class);
/** Field gregorsDir */
@@ -73,7 +73,7 @@ public class IAIKTest extends InteropTes
this.verifyHMAC(filename, resolver, followManifests, hmacKey);
fail("HMACOutputLength Exception not caught");
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
} catch (XMLSignatureException ex) {
if (!ex.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
@@ -100,13 +100,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verifyHMAC(filename, resolver, followManifests, hmacKey);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -129,13 +129,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Core validation crashed for " + filename);
+ LOG.error("Core validation crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Core validation failed for " + filename);
+ LOG.error("Core validation failed for " + filename);
}
assertTrue("Core validation failed for " + filename, verify);
@@ -158,13 +158,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Following the ds:Manifest failed for " + filename);
+ LOG.error("Following the ds:Manifest failed for " + filename);
}
assertTrue("Following the ds:Manifest failed for " + filename, verify);
@@ -187,13 +187,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue("Verification failed for " + filename, verify);
@@ -219,13 +219,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -248,13 +248,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -277,13 +277,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -306,13 +306,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -334,13 +334,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -364,13 +364,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -392,13 +392,13 @@ public class IAIKTest extends InteropTes
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java Mon Feb 13 13:22:37 2017
@@ -46,7 +46,7 @@ import org.apache.xml.security.utils.res
*/
public class IBMTest extends InteropTestBase {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(IBMTest.class);
/** Field kentsDir */
@@ -91,12 +91,12 @@ public class IBMTest extends InteropTest
try {
verify = this.verifyHMAC(filename, resolver, followManifests, hmacKey);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -120,12 +120,12 @@ public class IBMTest extends InteropTest
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -149,12 +149,12 @@ public class IBMTest extends InteropTest
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -178,12 +178,12 @@ public class IBMTest extends InteropTest
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -207,12 +207,12 @@ public class IBMTest extends InteropTest
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -236,12 +236,12 @@ public class IBMTest extends InteropTest
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -265,12 +265,12 @@ public class IBMTest extends InteropTest
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -298,12 +298,12 @@ public class IBMTest extends InteropTest
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- log.error("Verification crashed for " + filename);
+ LOG.error("Verification crashed for " + filename);
throw ex;
}
if (verify) {
- log.error("Verification failed for " + filename + ", had to be broken but was successful");
+ LOG.error("Verification failed for " + filename + ", had to be broken but was successful");
}
assertTrue(filename, !verify);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java Mon Feb 13 13:22:37 2017
@@ -42,7 +42,7 @@ import org.w3c.dom.Node;
public class InteropTestBase extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(InteropTestBase.class);
/**
@@ -137,10 +137,10 @@ public class InteropTestBase extends org
signature.getSignedInfo().getVerificationResult(i);
if (refVerify) {
- log.debug("Reference " + i + " was OK");
+ LOG.debug("Reference " + i + " was OK");
} else {
// JavaUtils.writeBytesToFilename(filename + i + ".apache.txt", signature.getSignedInfo().item(i).getContentsAfterTransformation().getBytes());
- log.debug("Reference " + i + " was not OK");
+ LOG.debug("Reference " + i + " was not OK");
}
}
checkReferences(signature);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java Mon Feb 13 13:22:37 2017
@@ -32,7 +32,7 @@ import org.apache.xml.security.utils.res
*/
public class RSASecurityTest extends InteropTestBase {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(RSASecurityTest.class);
/** Field blakesDir */
@@ -63,7 +63,7 @@ public class RSASecurityTest extends Int
boolean verify = this.verify(filename, resolver, followManifests);
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -78,7 +78,7 @@ public class RSASecurityTest extends Int
boolean verify = this.verify(filename, resolver, followManifests);
if (!verify) {
- log.error("Verification failed for " + filename);
+ LOG.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java Mon Feb 13 13:22:37 2017
@@ -35,7 +35,7 @@ import org.xml.sax.InputSource;
*/
public class TestVectorResolver implements EntityResolver {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(TestVectorResolver.class);
/** Field alreadyInitialized */
@@ -84,7 +84,7 @@ public class TestVectorResolver implemen
org.apache.xml.security.utils.JavaUtils.getBytesFromStream(zis);
TestVectorResolver.vectors.put(ze.getName(), data);
- log.debug("Contents of " + thisClass + "/" + testVectorFile
+ LOG.debug("Contents of " + thisClass + "/" + testVectorFile
+ "#" + ze.getName() + " " + data.length + " bytes");
}
}
@@ -167,7 +167,7 @@ public class TestVectorResolver implemen
this._firstEntitySystemIdDirectory = getFilePath(systemId);
- log.debug("this._firstEntitySystemIdDirectory = "
+ LOG.debug("this._firstEntitySystemIdDirectory = "
+ this._firstEntitySystemIdDirectory);
}
@@ -186,7 +186,7 @@ public class TestVectorResolver implemen
systemId = this.getFileName(systemId);
- log.debug("publicId=\"" + publicId + "\" systemId=\"" + systemId
+ LOG.debug("publicId=\"" + publicId + "\" systemId=\"" + systemId
+ "\"");
// InputStream result = this.getInputStream(systemId);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java Mon Feb 13 13:22:37 2017
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
*/
public class ForbiddenAlgorithmTest extends InteropTestBase {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ForbiddenAlgorithmTest.class);
static {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java Mon Feb 13 13:22:37 2017
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
*/
public class ForbiddenRefCountTest extends InteropTestBase {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ForbiddenRefCountTest.class);
static {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java Mon Feb 13 13:22:37 2017
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
*/
public class ForbiddenReferenceTest extends InteropTestBase {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ForbiddenReferenceTest.class);
static {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java Mon Feb 13 13:22:37 2017
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
*/
public class WrappingAttackTest extends InteropTestBase {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WrappingAttackTest.class);
static {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java Mon Feb 13 13:22:37 2017
@@ -56,7 +56,7 @@ import org.w3c.dom.Element;
*/
public class CreateSignatureTest extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(CreateSignatureTest.class);
private static final String BASEDIR = System.getProperty("basedir");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java Mon Feb 13 13:22:37 2017
@@ -34,7 +34,7 @@ import org.apache.xml.security.utils.XML
public class HMACOutputLengthTest extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger
(HMACOutputLengthTest.class);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java Mon Feb 13 13:22:37 2017
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertTru
public class PreCalculatedDigestSignatureTest {
- private static Logger log = LoggerFactory.getLogger(PreCalculatedDigestSignatureTest.class);
+ private static Logger LOG = LoggerFactory.getLogger(PreCalculatedDigestSignatureTest.class);
/**
* External resource name to be signed
@@ -134,7 +134,7 @@ public class PreCalculatedDigestSignatur
private boolean validateSignature(XMLSignature signature) throws XMLSecurityException {
PublicKey publicKey = signature.getKeyInfo().getPublicKey();
boolean validSignature = signature.checkSignatureValue(publicKey);
- log.debug("Is signature valid: " + validSignature);
+ LOG.debug("Is signature valid: " + validSignature);
return validSignature;
}
@@ -178,7 +178,7 @@ public class PreCalculatedDigestSignatur
try {
fileOutputStream = new FileOutputStream(signatureFilePath);
XMLUtils.outputDOMc14nWithComments(doc, fileOutputStream);
- log.debug("Wrote signature to " + signatureFilePath);
+ LOG.debug("Wrote signature to " + signatureFilePath);
} finally {
fileOutputStream.close();
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java Mon Feb 13 13:22:37 2017
@@ -35,7 +35,7 @@ import org.apache.xml.security.signature
*/
public class XMLSignatureInputTest extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLSignatureInputTest.class);
static final String _octetStreamTextInput = "Kleiner Test";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java Mon Feb 13 13:22:37 2017
@@ -44,7 +44,7 @@ import org.w3c.dom.NodeList;
* @author wglas
*/
public class XPointerResourceResolver extends ResourceResolverSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XPointerResourceResolver.class);
private static final String XP_OPEN = "xpointer(";
@@ -72,7 +72,7 @@ public class XPointerResourceResolver ex
try {
xpURI = URLDecoder.decode(v, "utf-8");
} catch (UnsupportedEncodingException e) {
- log.warn("utf-8 not a valid encoding",e);
+ LOG.warn("utf-8 not a valid encoding",e);
return false;
}
@@ -94,8 +94,8 @@ public class XPointerResourceResolver ex
return false;
}
- log.debug("xpURI = " + xpURI);
- log.debug("BaseURI = " + context.baseUri);
+ LOG.debug("xpURI = " + xpURI);
+ LOG.debug("BaseURI = " + context.baseUri);
return true;
}
@@ -113,7 +113,7 @@ public class XPointerResourceResolver ex
try {
xpURI = URLDecoder.decode(v, "utf-8");
} catch (UnsupportedEncodingException e) {
- log.warn("utf-8 not a valid encoding ", e);
+ LOG.warn("utf-8 not a valid encoding ", e);
return null;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java Mon Feb 13 13:22:37 2017
@@ -54,7 +54,7 @@ public class XmlSecTest extends org.juni
private static final String BASEDIR =
System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger
(XmlSecTest.class.getName());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java Mon Feb 13 13:22:37 2017
@@ -42,7 +42,7 @@ import org.w3c.dom.Node;
*/
public class TransformBase64DecodeTest extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(TransformBase64DecodeTest.class);
static {
@@ -150,7 +150,7 @@ public class TransformBase64DecodeTest e
if (doc == null) {
throw new RuntimeException("Could not create a Document");
} else {
- log.debug("I could create the Document");
+ LOG.debug("I could create the Document");
}
return doc;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java Mon Feb 13 13:22:37 2017
@@ -47,7 +47,7 @@ public class TransformXSLTTest extends o
"signature-rsa-detached-xslt-transform.xml";
private static final String STYLESHEET_FILE = "document-stylesheet.xml";
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(TransformXSLTTest.class);
static {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java Mon Feb 13 13:22:37 2017
@@ -43,7 +43,7 @@ import org.apache.xml.security.utils.res
*/
public class OfflineResolver extends ResourceResolverSpi {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(OfflineResolver.class);
/** Field _uriMap */
@@ -105,11 +105,11 @@ public class OfflineResolver extends Res
if (OfflineResolver._uriMap.containsKey(URI)) {
String newURI = OfflineResolver._uriMap.get(URI);
- log.debug("Mapped " + URI + " to " + newURI);
+ LOG.debug("Mapped " + URI + " to " + newURI);
InputStream is = new FileInputStream(newURI);
- log.debug("Available bytes = " + is.available());
+ LOG.debug("Available bytes = " + is.available());
XMLSignatureInput result = new XMLSignatureInput(is);
@@ -147,7 +147,7 @@ public class OfflineResolver extends Res
try {
uriNew = getNewURI(context.uriToResolve, context.baseUri);
if (uriNew.getScheme().equals("http")) {
- log.debug("I state that I can resolve " + uriNew.toString());
+ LOG.debug("I state that I can resolve " + uriNew.toString());
return true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java Mon Feb 13 13:22:37 2017
@@ -32,7 +32,7 @@ import org.w3c.dom.Document;
*/
public class ResourceResolverTest extends org.junit.Assert {
- static org.slf4j.Logger log =
+ static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger
(ResourceResolverTest.class);