You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/01/08 14:53:04 UTC
svn commit: r1556531 [1/2] - in /webservices/wss4j/trunk:
ws-security-common/src/main/java/org/apache/wss4j/common/
ws-security-common/src/main/java/org/apache/wss4j/common/crypto/
ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/ ws-s...
Author: coheigea
Date: Wed Jan 8 13:53:03 2014
New Revision: 1556531
URL: http://svn.apache.org/r1556531
Log:
Making LOG variables consistent
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientAction.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceAction.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/X509Util.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java Wed Jan 8 13:53:03 2014
@@ -29,7 +29,7 @@ import javax.security.auth.callback.Unsu
public class NamePasswordCallbackHandler implements CallbackHandler {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(NamePasswordCallbackHandler.class);
private static final String PASSWORD_CALLBACK_NAME = "setObject";
@@ -62,7 +62,7 @@ public class NamePasswordCallbackHandler
PasswordCallback pwCallback = (PasswordCallback) callback;
pwCallback.setPassword(password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
- log.error("Unsupported callback type " + callbacks[i].getClass().getName());
+ LOG.error("Unsupported callback type " + callbacks[i].getClass().getName());
throw new UnsupportedCallbackException(callbacks[i], "Unsupported callback type " + callbacks[i].getClass().getName());
}
}
@@ -89,7 +89,7 @@ public class NamePasswordCallbackHandler
return true;
} catch (Exception e) {
// ignore and continue
- log.warn(e.toString());
+ LOG.warn(e.toString());
}
}
return false;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java Wed Jan 8 13:53:03 2014
@@ -37,7 +37,7 @@ import org.apache.wss4j.common.ext.WSSec
* </pre>
*/
public class DERDecoder {
- private static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(DERDecoder.class);
+ private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(DERDecoder.class);
/** DER type identifier for a bit string value */
public static final byte TYPE_BIT_STRING = 0x03;
@@ -114,7 +114,7 @@ public class DERDecoder {
*/
public void expect(byte val) throws WSSecurityException {
if (!test(val)) {
- log.debug("DER mismatch: expected " + val + ", got " + arr[pos]);
+ LOG.debug("DER mismatch: expected " + val + ", got " + arr[pos]);
throw new WSSecurityException(
WSSecurityException.ErrorCode.UNSUPPORTED_SECURITY_TOKEN,
"noSKIHandling",
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientAction.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientAction.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientAction.java Wed Jan 8 13:53:03 2014
@@ -34,7 +34,7 @@ import org.ietf.jgss.Oid;
* Key Distribution Center.
*/
public class KerberosClientAction implements PrivilegedAction<byte[]> {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(KerberosClientAction.class);
private Principal clientPrincipal;
@@ -68,8 +68,8 @@ public class KerberosClientAction implem
secContext.dispose();
return returnedToken;
} catch (GSSException e) {
- if (log.isDebugEnabled()) {
- log.debug("Error in obtaining a Kerberos token", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error in obtaining a Kerberos token", e);
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceAction.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceAction.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceAction.java Wed Jan 8 13:53:03 2014
@@ -35,7 +35,7 @@ import org.ietf.jgss.Oid;
* This class represents a PrivilegedAction implementation to validate a received ticket to a KDC.
*/
public class KerberosServiceAction implements PrivilegedAction<Principal> {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(KerberosServiceAction.class);
private byte[] ticket;
@@ -65,8 +65,8 @@ public class KerberosServiceAction imple
secContext.dispose();
return new KerberosPrincipal(clientName.toString());
} catch (GSSException e) {
- if (log.isDebugEnabled()) {
- log.debug("Error in validating a Kerberos token", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error in validating a Kerberos token", e);
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java Wed Jan 8 13:53:03 2014
@@ -30,7 +30,7 @@ import org.ietf.jgss.Oid;
* Kerberos Key Distribution Center.
*/
public class DefaultSpnegoClientAction implements SpnegoClientAction {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DefaultSpnegoClientAction.class);
private String serviceName;
@@ -68,8 +68,8 @@ public class DefaultSpnegoClientAction i
byte[] token = new byte[0];
return secContext.initSecContext(token, 0, token.length);
} catch (GSSException e) {
- if (log.isDebugEnabled()) {
- log.debug("Error in obtaining a Kerberos token", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error in obtaining a Kerberos token", e);
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java Wed Jan 8 13:53:03 2014
@@ -30,7 +30,7 @@ import org.ietf.jgss.Oid;
* to a KDC.
*/
public class DefaultSpnegoServiceAction implements SpnegoServiceAction {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DefaultSpnegoServiceAction.class);
private byte[] ticket;
@@ -64,8 +64,8 @@ public class DefaultSpnegoServiceAction
return secContext.acceptSecContext(ticket, 0, ticket.length);
} catch (GSSException e) {
- if (log.isDebugEnabled()) {
- log.debug("Error in obtaining a Kerberos token", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error in obtaining a Kerberos token", e);
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java Wed Jan 8 13:53:03 2014
@@ -22,7 +22,7 @@ package org.apache.wss4j.common.util;
import java.util.Date;
public final class DateUtil {
- private static org.slf4j.Logger LOG =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DateUtil.class);
/**
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java Wed Jan 8 13:53:03 2014
@@ -26,7 +26,7 @@ import org.apache.wss4j.common.ext.WSSec
import org.apache.xml.security.algorithms.JCEMapper;
public final class KeyUtils {
- private static org.slf4j.Logger LOG =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(KeyUtils.class);
/**
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java Wed Jan 8 13:53:03 2014
@@ -29,7 +29,7 @@ import java.security.PrivilegedAction;
* <p/>
*/
public class Loader {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Loader.class);
/**
@@ -53,7 +53,7 @@ public class Loader {
try {
ClassLoader classLoader = getTCL();
if (classLoader != null) {
- log.debug("Trying to find [" + resource + "] using " + classLoader + " class loader.");
+ LOG.debug("Trying to find [" + resource + "] using " + classLoader + " class loader.");
url = classLoader.getResource(resource);
if (url == null && resource.startsWith("/")) {
//certain classloaders need it without the leading /
@@ -64,7 +64,7 @@ public class Loader {
}
}
} catch (Exception e) {
- log.warn("Caught Exception while in Loader.getResource. This may be innocuous.", e);
+ LOG.warn("Caught Exception while in Loader.getResource. This may be innocuous.", e);
}
ClassLoader cluClassloader = Loader.class.getClassLoader();
@@ -84,7 +84,7 @@ public class Loader {
// may be the case that clazz was loaded by the Extension class
// loader which the parent of the system class loader. Hence the
// code below.
- log.debug("Trying to find [" + resource + "] using ClassLoader.getSystemResource().");
+ LOG.debug("Trying to find [" + resource + "] using ClassLoader.getSystemResource().");
return ClassLoader.getSystemResource(resource);
}
@@ -110,7 +110,7 @@ public class Loader {
URL url = null;
try {
if (loader != null) {
- log.debug("Trying to find [" + resource + "] using " + loader + " class loader.");
+ LOG.debug("Trying to find [" + resource + "] using " + loader + " class loader.");
url = loader.getResource(resource);
if (url == null && resource.startsWith("/")) {
//certain classloaders need it without the leading /
@@ -121,7 +121,7 @@ public class Loader {
}
}
} catch (Exception e) {
- log.warn("Caught Exception while in Loader.getResource. This may be innocuous.", e);
+ LOG.warn("Caught Exception while in Loader.getResource. This may be innocuous.", e);
}
return getResource(resource);
}
@@ -174,7 +174,7 @@ public class Loader {
}
}
} catch (Exception e) {
- log.warn(e.getMessage(), e);
+ LOG.warn(e.getMessage(), e);
}
return loadClass(clazz, true);
}
@@ -200,7 +200,7 @@ public class Loader {
}
}
} catch (Exception e) {
- log.warn(e.getMessage(), e);
+ LOG.warn(e.getMessage(), e);
}
return loadClass(clazz, true, type);
}
@@ -253,9 +253,9 @@ public class Loader {
}
} catch (Exception e) {
if (warn) {
- log.warn(e.getMessage(), e);
+ LOG.warn(e.getMessage(), e);
} else {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java Wed Jan 8 13:53:03 2014
@@ -41,7 +41,7 @@ import java.util.List;
*
*/
public class NSStack {
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(NSStack.class);
private Mapping[] stack;
@@ -51,7 +51,7 @@ public class NSStack {
// invariant member variable to track low-level logging requirements
// we cache this once per instance lifecycle to avoid repeated lookups
// in heavily used code.
- private final boolean traceEnabled = log.isTraceEnabled();
+ private final boolean traceEnabled = LOG.isTraceEnabled();
public NSStack() {
stack = new Mapping[32];
@@ -69,7 +69,7 @@ public class NSStack {
stack = newstack;
}
if (traceEnabled) {
- log.trace("NSPush (" + stack.length + ")");
+ LOG.trace("NSPush (" + stack.length + ")");
}
stack[top] = null;
}
@@ -96,12 +96,12 @@ public class NSStack {
}
if (top == 0) {
if (traceEnabled) {
- log.trace("NSPop (empty)");
+ LOG.trace("NSPop (empty)");
}
return;
}
if (traceEnabled) {
- log.trace("NSPop (" + stack.length + ")");
+ LOG.trace("NSPop (" + stack.length + ")");
}
}
@@ -278,9 +278,9 @@ public class NSStack {
for (int cursor = top; cursor > 0; cursor--) {
Mapping map = stack[cursor];
if (map == null) {
- log.trace(dumpPrefix + "stackFrame00");
+ LOG.trace(dumpPrefix + "stackFrame00");
} else {
- log.trace(dumpPrefix + map.getNamespaceURI() + " -> " + map.getPrefix());
+ LOG.trace(dumpPrefix + map.getNamespaceURI() + " -> " + map.getPrefix());
}
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java Wed Jan 8 13:53:03 2014
@@ -28,7 +28,7 @@ import org.apache.xml.security.stax.ext.
public final class UsernameTokenUtil {
public static final int DEFAULT_ITERATION = 1000;
- private static org.slf4j.Logger LOG =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(UsernameTokenUtil.class);
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java Wed Jan 8 13:53:03 2014
@@ -42,7 +42,7 @@ import org.w3c.dom.Node;
* WS-Security Engine.
*/
public class WSSecurityEngine {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecurityEngine.class);
/**
@@ -231,9 +231,9 @@ public class WSSecurityEngine {
Crypto sigVerCrypto,
Crypto decCrypto
) throws WSSecurityException {
- doDebug = log.isDebugEnabled();
+ doDebug = LOG.isDebugEnabled();
if (doDebug) {
- log.debug("enter processSecurityHeader()");
+ LOG.debug("enter processSecurityHeader()");
}
if (actor == null) {
@@ -243,7 +243,7 @@ public class WSSecurityEngine {
Element elem = WSSecurityUtil.getSecurityHeader(doc, actor);
if (elem != null) {
if (doDebug) {
- log.debug("Processing WS-Security header for '" + actor + "' actor.");
+ LOG.debug("Processing WS-Security header for '" + actor + "' actor.");
}
wsResult = processSecurityHeader(elem, cb, sigVerCrypto, decCrypto);
}
@@ -330,7 +330,7 @@ public class WSSecurityEngine {
Element elem = WSSecurityUtil.getSecurityHeader(doc, actor);
if (elem != null) {
if (doDebug) {
- log.debug("Processing WS-Security header for '" + actor + "' actor.");
+ LOG.debug("Processing WS-Security header for '" + actor + "' actor.");
}
wsResult = processSecurityHeader(elem, requestData);
}
@@ -423,7 +423,7 @@ public class WSSecurityEngine {
returnResults.addAll(0, results);
} else {
if (doDebug) {
- log.debug(
+ LOG.debug(
"Unknown Element: " + node.getLocalName() + " " + node.getNamespaceURI()
);
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java Wed Jan 8 13:53:03 2014
@@ -38,7 +38,7 @@ import org.w3c.dom.Document;
public class SAMLTokenSignedAction implements Action {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SAMLTokenSignedAction.class);
public void execute(WSHandler handler, SecurityActionToken actionToken,
@@ -54,8 +54,8 @@ public class SAMLTokenSignedAction imple
try {
crypto = handler.loadSignatureCrypto(reqData);
} catch (Exception ex) {
- if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(ex.getMessage(), ex);
}
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java Wed Jan 8 13:53:03 2014
@@ -37,15 +37,15 @@ import java.util.ArrayList;
import java.util.List;
public class SignatureConfirmationAction implements Action {
- private static final org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignatureConfirmationAction.class);
@SuppressWarnings("unchecked")
public void execute(WSHandler handler, SecurityActionToken actionToken,
Document doc, RequestData reqData)
throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("Perform Signature confirmation");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Perform Signature confirmation");
}
List<WSHandlerResult> results =
@@ -81,8 +81,8 @@ public class SignatureConfirmationAction
}
List<WSEncryptionPart> signatureParts = signatureToken.getParts();
if (signatureActions.size() > 0) {
- if (log.isDebugEnabled()) {
- log.debug("Signature Confirmation: number of Signature results: "
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Signature Confirmation: number of Signature results: "
+ signatureActions.size());
}
for (int i = 0; i < signatureActions.size(); i++) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java Wed Jan 8 13:53:03 2014
@@ -62,12 +62,12 @@ import org.w3c.dom.Document;
* Extended to all passwordless UsernameTokens and configurable identities.
*/
public abstract class WSHandler {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSHandler.class);
protected WSSecurityEngine secEngine = new WSSecurityEngine();
protected Map<String, Crypto> cryptos = new ConcurrentHashMap<String, Crypto>();
- private boolean doDebug = log.isDebugEnabled();
+ private boolean doDebug = LOG.isDebugEnabled();
/**
* Performs all defined security actions to set-up the SOAP request.
@@ -210,7 +210,7 @@ public abstract class WSHandler {
*/
for (HandlerAction actionToDo : actionsToPerform) {
if (doDebug) {
- log.debug("Performing Action: " + actionToDo.getAction());
+ LOG.debug("Performing Action: " + actionToDo.getAction());
}
switch (actionToDo.getAction()) {
@@ -228,14 +228,14 @@ public abstract class WSHandler {
//
// Handle any "custom" actions, similarly,
// but to preserve behavior from previous
- // versions, consume (but log) action lookup failures.
+ // versions, consume (but LOG. action lookup failures.
//
default:
Action doit = null;
try {
doit = wssConfig.getAction(actionToDo.getAction());
} catch (final WSSecurityException e) {
- log.warn(
+ LOG.warn(
"Error trying to locate a custom action (" + actionToDo + ")",
e
);
@@ -409,7 +409,7 @@ public abstract class WSHandler {
List<WSSecurityEngineResult> resultList
) throws WSSecurityException{
if (doDebug) {
- log.debug("Check Signature confirmation");
+ LOG.debug("Check Signature confirmation");
}
//
// First get all Signature values stored during sending the request
@@ -981,7 +981,7 @@ public abstract class WSHandler {
}
}
if (crypto == null) {
- log.warn("The Crypto reference " + refId + " specified by "
+ LOG.warn("The Crypto reference " + refId + " specified by "
+ cryptoPropertyRefId + " could not be loaded"
);
}
@@ -999,7 +999,7 @@ public abstract class WSHandler {
cryptos.put(propFile, crypto);
}
if (crypto == null) {
- log.warn(
+ LOG.warn(
"The Crypto properties file " + propFile + " specified by "
+ cryptoPropertyFile + " could not be loaded or found"
);
@@ -1228,7 +1228,7 @@ public abstract class WSHandler {
if (partDef.length == 1) {
if (doDebug) {
- log.debug("single partDef: '" + partDef[0] + "'");
+ LOG.debug("single partDef: '" + partDef[0] + "'");
}
encPart =
new WSEncryptionPart(partDef[0].trim(),
@@ -1256,7 +1256,7 @@ public abstract class WSHandler {
}
String element = partDef[2].trim();
if (doDebug) {
- log.debug(
+ LOG.debug(
"partDefs: '" + mode + "' ,'" + nmSpace + "' ,'" + element + "'"
);
}
@@ -1337,7 +1337,7 @@ public abstract class WSHandler {
try {
subjectCertConstraints.add(Pattern.compile(certConstraint.trim()));
} catch (PatternSyntaxException ex) {
- log.debug(ex.getMessage(), ex);
+ LOG.debug(ex.getMessage(), ex);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex);
}
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java Wed Jan 8 13:53:03 2014
@@ -57,7 +57,7 @@ import javax.xml.crypto.dsig.spec.ExcC14
*/
public class WSSecDKSign extends WSSecDerivedKeyBase {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecDKSign.class);
private String sigAlgo = WSConstants.HMAC_SHA1;
@@ -154,7 +154,7 @@ public class WSSecDKSign extends WSSecDe
c14nMethod = signatureFactory.newCanonicalizationMethod(canonAlgo, c14nSpec);
} catch (Exception ex) {
- log.error("", ex);
+ LOG.error("", ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_SIGNATURE, "noXMLSig", ex
);
@@ -301,7 +301,7 @@ public class WSSecDKSign extends WSSecDe
signatureValue = sig.getSignatureValue().getValue();
} catch (Exception ex) {
- log.error(ex.getMessage(), ex);
+ LOG.error(ex.getMessage(), ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_SIGNATURE, ex
);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java Wed Jan 8 13:53:03 2014
@@ -61,7 +61,7 @@ import java.util.*;
* and adds the encryption data.
*/
public class WSSecEncrypt extends WSSecEncryptedKey {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecEncrypt.class);
/**
@@ -192,7 +192,7 @@ public class WSSecEncrypt extends WSSecE
*/
public Document build(Document doc, Crypto crypto, WSSecHeader secHeader)
throws WSSecurityException {
- doDebug = log.isDebugEnabled();
+ doDebug = LOG.isDebugEnabled();
prepare(doc, crypto);
@@ -213,7 +213,7 @@ public class WSSecEncrypt extends WSSecE
}
if (doDebug) {
- log.debug("Beginning Encryption...");
+ LOG.debug("Beginning Encryption...");
}
Element refs = encryptForRef(null, parts);
@@ -230,7 +230,7 @@ public class WSSecEncrypt extends WSSecE
prependBSTElementToHeader(secHeader);
}
- log.debug("Encryption complete.");
+ LOG.debug("Encryption complete.");
return doc;
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java Wed Jan 8 13:53:03 2014
@@ -64,7 +64,7 @@ import org.w3c.dom.Text;
*/
public class WSSecEncryptedKey extends WSSecBase {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecEncryptedKey.class);
protected Document document;
@@ -281,7 +281,7 @@ public class WSSecEncryptedKey extends W
}
int blockSize = cipher.getBlockSize();
if (doDebug) {
- log.debug(
+ LOG.debug(
"cipher blksize: " + blockSize + ", symm key: " + secretKey.toString()
);
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java Wed Jan 8 13:53:03 2014
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
*/
public class WSSecSAMLToken extends WSSecBase {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecSAMLToken.class);
private Document document;
@@ -111,7 +111,7 @@ public class WSSecSAMLToken extends WSSe
* @return Document with UsernameToken added
*/
public Document build(Document doc, SamlAssertionWrapper samlAssertion, WSSecHeader secHeader) {
- log.debug("Begin add SAMLAssertion token...");
+ LOG.debug("Begin add SAMLAssertion token...");
prepare(doc, samlAssertion);
prependToHeader(secHeader);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java Wed Jan 8 13:53:03 2014
@@ -75,7 +75,7 @@ import javax.xml.crypto.dsig.spec.ExcC14
*/
public class WSSecSignature extends WSSecSignatureBase {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecSignature.class);
protected boolean useSingleCert = true;
@@ -177,7 +177,7 @@ public class WSSecSignature extends WSSe
c14nMethod = signatureFactory.newCanonicalizationMethod(canonAlgo, c14nSpec);
} catch (Exception ex) {
- log.error("", ex);
+ LOG.error("", ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_SIGNATURE, "noXMLSig", ex
);
@@ -327,7 +327,7 @@ public class WSSecSignature extends WSSe
java.util.Collections.singletonList(keyValue), keyInfoUri
);
} catch (java.security.KeyException ex) {
- log.error("", ex);
+ LOG.error("", ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_SIGNATURE, "noXMLSig", ex
);
@@ -366,10 +366,10 @@ public class WSSecSignature extends WSSe
*/
public Document build(Document doc, Crypto cr, WSSecHeader secHeader)
throws WSSecurityException {
- doDebug = log.isDebugEnabled();
+ doDebug = LOG.isDebugEnabled();
if (doDebug) {
- log.debug("Beginning signing...");
+ LOG.debug("Beginning signing...");
}
prepare(doc, cr, secHeader);
@@ -584,7 +584,7 @@ public class WSSecSignature extends WSSe
signatureValue = sig.getSignatureValue().getValue();
} catch (Exception ex) {
ex.printStackTrace();
- log.error(ex.getMessage(), ex);
+ LOG.error(ex.getMessage(), ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_SIGNATURE, ex
);
@@ -832,7 +832,7 @@ public class WSSecSignature extends WSSe
//
if (sigAlgo == null) {
String pubKeyAlgo = certs[0].getPublicKey().getAlgorithm();
- log.debug("Automatic signature algorithm detection: " + pubKeyAlgo);
+ LOG.debug("Automatic signature algorithm detection: " + pubKeyAlgo);
if (pubKeyAlgo.equalsIgnoreCase("DSA")) {
sigAlgo = WSConstants.DSA;
} else if (pubKeyAlgo.equalsIgnoreCase("RSA")) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java Wed Jan 8 13:53:03 2014
@@ -55,7 +55,7 @@ import org.w3c.dom.Node;
*/
public class WSSecSignatureBase extends WSSecBase {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecSignatureBase.class);
public WSSecSignatureBase() {
@@ -91,7 +91,7 @@ public class WSSecSignatureBase extends
try {
digestMethod = signatureFactory.newDigestMethod(digestAlgo, null);
} catch (Exception ex) {
- log.error("", ex);
+ LOG.error("", ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_SIGNATURE, "noXMLSig", ex
);
@@ -272,7 +272,7 @@ public class WSSecSignatureBase extends
}
}
} catch (Exception ex) {
- log.error("", ex);
+ LOG.error("", ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_SIGNATURE, "noXMLSig", ex
);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java Wed Jan 8 13:53:03 2014
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
* Builds a WS SignatureConfirmation and inserts it into the SOAP Envelope.
*/
public class WSSecSignatureConfirmation extends WSSecBase {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecSignatureConfirmation.class);
private SignatureConfirmation sc;
@@ -94,7 +94,7 @@ public class WSSecSignatureConfirmation
* @return Document with SignatureConfirmation added
*/
public Document build(Document doc, byte[] sigVal, WSSecHeader secHeader) {
- log.debug("Begin add signature confirmation...");
+ LOG.debug("Begin add signature confirmation...");
signatureValue = sigVal;
prepare(doc);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java Wed Jan 8 13:53:03 2014
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
*/
public class WSSecTimestamp extends WSSecBase {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecTimestamp.class);
private Timestamp ts;
@@ -100,7 +100,7 @@ public class WSSecTimestamp extends WSSe
* @throws Exception
*/
public Document build(Document doc, WSSecHeader secHeader) {
- log.debug("Begin add timestamp...");
+ LOG.debug("Begin add timestamp...");
prepare(doc);
prependToHeader(secHeader);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java Wed Jan 8 13:53:03 2014
@@ -36,7 +36,7 @@ import org.w3c.dom.Element;
* Refer to the WS specification, UsernameToken profile
*/
public class WSSecUsernameToken extends WSSecBase {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecUsernameToken.class);
private String passwordType = WSConstants.PASSWORD_DIGEST;
@@ -230,7 +230,7 @@ public class WSSecUsernameToken extends
* @return Document with UsernameToken added
*/
public Document build(Document doc, WSSecHeader secHeader) {
- log.debug("Begin add username token...");
+ LOG.debug("Begin add username token...");
prepare(doc);
prependToHeader(secHeader);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java Wed Jan 8 13:53:03 2014
@@ -55,7 +55,7 @@ import org.w3c.dom.Text;
public class DerivedKeyToken {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DerivedKeyToken.class);
// These are the elements that are used to create the SecurityContextToken
@@ -87,7 +87,7 @@ public class DerivedKeyToken {
* @param doc The DOM document
*/
public DerivedKeyToken(int version, Document doc) throws ConversationException {
- log.debug("DerivedKeyToken: created");
+ LOG.debug("DerivedKeyToken: created");
ns = ConversationConstants.getWSCNs(version);
element =
@@ -104,7 +104,7 @@ public class DerivedKeyToken {
* @throws WSSecurityException If the element is not a derived key token
*/
public DerivedKeyToken(Element elem, BSPEnforcer bspEnforcer) throws WSSecurityException {
- log.debug("DerivedKeyToken: created : element constructor");
+ LOG.debug("DerivedKeyToken: created : element constructor");
element = elem;
this.bspEnforcer = bspEnforcer;
QName el = new QName(element.getNamespaceURI(), element.getLocalName());
@@ -564,7 +564,7 @@ public class DerivedKeyToken {
result = 31 * result + tokenReference.hashCode();
}
} catch (WSSecurityException e) {
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
}
Map<String, String> properties = getProperties();
@@ -609,7 +609,7 @@ public class DerivedKeyToken {
return false;
}
} catch (WSSecurityException e) {
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
return false;
}
if (!compare(getProperties(), token.getProperties())) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java Wed Jan 8 13:53:03 2014
@@ -46,7 +46,7 @@ import org.w3c.dom.Element;
*/
public class KerberosSecurity extends BinarySecurity {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(KerberosSecurity.class);
private SecretKey secretKey;
@@ -155,16 +155,16 @@ public class KerberosSecurity extends Bi
}
loginContext.login();
} catch (LoginException ex) {
- if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(ex.getMessage(), ex);
}
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE,
"kerberosLoginError",
ex, ex.getMessage());
}
- if (log.isDebugEnabled()) {
- log.debug("Successfully authenticated to the TGT");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Successfully authenticated to the TGT");
}
Subject clientSubject = loginContext.getSubject();
@@ -187,8 +187,8 @@ public class KerberosSecurity extends Bi
WSSecurityException.ErrorCode.FAILURE, "kerberosServiceTicketError"
);
}
- if (log.isDebugEnabled()) {
- log.debug("Successfully retrieved a service ticket");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Successfully retrieved a service ticket");
}
// Get the Service Ticket (private credential)
@@ -211,8 +211,8 @@ public class KerberosSecurity extends Bi
private KerberosTicket getKerberosTicket(Subject clientSubject, KerberosTicket previousTicket) {
Set<KerberosTicket> privateCredentials = clientSubject.getPrivateCredentials(KerberosTicket.class);
if (privateCredentials == null || privateCredentials.isEmpty()) {
- if (log.isDebugEnabled()) {
- log.debug("Kerberos client subject private credentials are null");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Kerberos client subject private credentials are null");
}
return null;
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java Wed Jan 8 13:53:03 2014
@@ -62,7 +62,7 @@ public class SecurityTokenReference {
WSConstants.SOAPMESSAGE_NS11 + "#" + WSConstants.THUMBPRINT;
public static final String ENC_KEY_SHA1_URI =
WSConstants.SOAPMESSAGE_NS11 + "#" + WSConstants.ENC_KEY_SHA1_URI;
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SecurityTokenReference.class);
private Element element;
@@ -208,9 +208,9 @@ public class SecurityTokenReference {
uri = getKeyIdentifierValue();
valueType = getKeyIdentifierValueType();
}
- if (log.isDebugEnabled()) {
- log.debug("Token reference uri: " + uri);
- log.debug("Token reference ValueType: " + valueType);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Token reference uri: " + uri);
+ LOG.debug("Token reference ValueType: " + valueType);
}
if (uri == null) {
@@ -318,7 +318,7 @@ public class SecurityTokenReference {
return (Element)doc.importNode(assertionElem, true);
}
} catch (Exception e) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
// Consume this failure
}
}
@@ -564,7 +564,7 @@ public class SecurityTokenReference {
try {
skiBytes = Base64.decode(((Text) node).getData());
} catch (Exception e) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
return null;
}
}
@@ -849,7 +849,7 @@ public class SecurityTokenReference {
result = 31 * result + reference.hashCode();
}
} catch (WSSecurityException e) {
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
}
String keyIdentifierEncodingType = getKeyIdentifierEncodingType();
if (keyIdentifierEncodingType != null) {
@@ -878,7 +878,7 @@ public class SecurityTokenReference {
issuer = getIssuerSerial().getIssuer();
serialNumber = getIssuerSerial().getSerialNumber();
} catch (WSSecurityException e) {
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
}
if (issuer != null) {
result = 31 * result + issuer.hashCode();
@@ -900,7 +900,7 @@ public class SecurityTokenReference {
return false;
}
} catch (WSSecurityException e) {
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
return false;
}
if (!compare(getKeyIdentifierEncodingType(), tokenReference.getKeyIdentifierEncodingType())) {
@@ -928,7 +928,7 @@ public class SecurityTokenReference {
}
}
} catch (WSSecurityException e) {
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
return false;
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java Wed Jan 8 13:53:03 2014
@@ -54,7 +54,7 @@ import org.apache.wss4j.dom.util.WSSecur
*/
public class EncryptedDataProcessor implements Processor {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(EncryptedDataProcessor.class);
public List<WSSecurityEngineResult> handleToken(
@@ -62,8 +62,8 @@ public class EncryptedDataProcessor impl
RequestData request,
WSDocInfo wsDocInfo
) throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("Found EncryptedData element");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found EncryptedData element");
}
final String encryptedDataId = elem.getAttributeNS(null, "Id");
@@ -161,8 +161,8 @@ public class EncryptedDataProcessor impl
QName el = new QName(decryptedElem.getNamespaceURI(), decryptedElem.getLocalName());
Processor proc = request.getWssConfig().getProcessor(el);
if (proc != null) {
- if (log.isDebugEnabled()) {
- log.debug("Processing decrypted element with: " + proc.getClass().getName());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Processing decrypted element with: " + proc.getClass().getName());
}
List<WSSecurityEngineResult> results =
proc.handleToken(decryptedElem, request, wsDocInfo);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java Wed Jan 8 13:53:03 2014
@@ -55,7 +55,7 @@ import org.apache.xml.security.exception
import org.apache.xml.security.utils.Base64;
public class EncryptedKeyProcessor implements Processor {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(EncryptedKeyProcessor.class);
public List<WSSecurityEngineResult> handleToken(
@@ -72,8 +72,8 @@ public class EncryptedKeyProcessor imple
WSDocInfo wsDocInfo,
AlgorithmSuite algorithmSuite
) throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("Found encrypted key element");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found encrypted key element");
}
// See if this key has already been processed. If so then just return the result
@@ -106,7 +106,7 @@ public class EncryptedKeyProcessor imple
if (WSConstants.KEYTRANSPORT_RSA15.equals(encryptedKeyTransportMethod)
&& !data.isAllowRSA15KeyTransportAlgorithm()
&& !algorithmSuite.getKeyWrapAlgorithms().contains(WSConstants.KEYTRANSPORT_RSA15)) {
- log.debug(
+ LOG.debug(
"The Key transport method does not match the requirement"
);
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY);
@@ -436,8 +436,8 @@ public class EncryptedKeyProcessor imple
byte[] decryptedData,
RequestData data
) throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("found data reference: " + dataRefURI);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("found data reference: " + dataRefURI);
}
//
// Find the encrypted data element referenced by dataRefURI
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java Wed Jan 8 13:53:03 2014
@@ -66,7 +66,7 @@ import org.apache.xml.security.encryptio
import org.apache.xml.security.encryption.XMLEncryptionException;
public class ReferenceListProcessor implements Processor {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ReferenceListProcessor.class);
public List<WSSecurityEngineResult> handleToken(
@@ -74,8 +74,8 @@ public class ReferenceListProcessor impl
RequestData data,
WSDocInfo wsDocInfo
) throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("Found reference list element");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found reference list element");
}
List<WSDataRef> dataRefs = handleReferenceList(elem, data, wsDocInfo);
WSSecurityEngineResult result =
@@ -137,8 +137,8 @@ public class ReferenceListProcessor impl
WSDocInfo wsDocInfo,
boolean asymBinding
) throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("Found data reference: " + dataRefURI);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found data reference: " + dataRefURI);
}
//
// Find the encrypted data element referenced by dataRefURI
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java Wed Jan 8 13:53:03 2014
@@ -51,7 +51,7 @@ import org.opensaml.xml.signature.KeyInf
import org.opensaml.xml.signature.Signature;
public class SAMLTokenProcessor implements Processor {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SAMLTokenProcessor.class);
private XMLSignatureFactory signatureFactory;
@@ -70,17 +70,17 @@ public class SAMLTokenProcessor implemen
RequestData data,
WSDocInfo wsDocInfo
) throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("Found SAML Assertion element");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found SAML Assertion element");
}
Validator validator =
data.getValidator(new QName(elem.getNamespaceURI(), elem.getLocalName()));
Credential credential = handleSAMLToken(elem, data, validator, wsDocInfo);
SamlAssertionWrapper samlAssertion = credential.getSamlAssertion();
- if (log.isDebugEnabled()) {
- log.debug("SAML Assertion issuer " + samlAssertion.getIssuerString());
- log.debug(DOM2Writer.nodeToString(elem));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("SAML Assertion issuer " + samlAssertion.getIssuerString());
+ LOG.debug(DOM2Writer.nodeToString(elem));
}
// See if the token has been previously processed
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java Wed Jan 8 13:53:03 2014
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
import java.util.List;
public class SignatureConfirmationProcessor implements Processor {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignatureConfirmationProcessor.class);
public List<WSSecurityEngineResult> handleToken(
@@ -38,8 +38,8 @@ public class SignatureConfirmationProces
RequestData data,
WSDocInfo wsDocInfo
) throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("Found SignatureConfirmation list element");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found SignatureConfirmation list element");
}
//
// Decode SignatureConfirmation, just store in result
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java Wed Jan 8 13:53:03 2014
@@ -33,7 +33,7 @@ import org.apache.wss4j.dom.validate.Val
import org.w3c.dom.Element;
public class TimestampProcessor implements Processor {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(TimestampProcessor.class);
public List<WSSecurityEngineResult> handleToken(
@@ -41,8 +41,8 @@ public class TimestampProcessor implemen
RequestData data,
WSDocInfo wsDocInfo
) throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("Found Timestamp list element");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found Timestamp list element");
}
//
// Decode Timestamp, add the found time (created/expiry) to result
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java Wed Jan 8 13:53:03 2014
@@ -40,7 +40,7 @@ import org.apache.wss4j.dom.validate.Cre
import org.apache.wss4j.dom.validate.Validator;
public class UsernameTokenProcessor implements Processor {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(UsernameTokenProcessor.class);
public List<WSSecurityEngineResult> handleToken(
@@ -48,8 +48,8 @@ public class UsernameTokenProcessor impl
RequestData data,
WSDocInfo wsDocInfo
) throws WSSecurityException {
- if (log.isDebugEnabled()) {
- log.debug("Found UsernameToken list element");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found UsernameToken list element");
}
// See if the token has been previously processed
String id = elem.getAttributeNS(WSConstants.WSU_NS, "Id");
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/X509Util.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/X509Util.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/X509Util.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/X509Util.java Wed Jan 8 13:53:03 2014
@@ -36,7 +36,7 @@ import javax.security.auth.callback.Unsu
import java.io.IOException;
public final class X509Util {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(X509Util.class);
private X509Util() {
@@ -67,8 +67,8 @@ public final class X509Util {
);
}
}
- if (log.isDebugEnabled()) {
- log.debug("Sym Enc Algo: " + symEncAlgo);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sym Enc Algo: " + symEncAlgo);
}
return symEncAlgo;
}
@@ -96,7 +96,7 @@ public final class X509Util {
keyName = builder.toString();
}
if (keyName == null || keyName.length() <= 0) {
- log.debug("No Key Name available");
+ LOG.debug("No Key Name available");
}
WSPasswordCallback pwCb =
new WSPasswordCallback(keyName, WSPasswordCallback.SECRET_KEY);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java Wed Jan 8 13:53:03 2014
@@ -43,7 +43,7 @@ import org.w3c.dom.Element;
*/
public final class DOMSAMLUtil {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DOMSAMLUtil.class);
private DOMSAMLUtil() {
@@ -76,11 +76,11 @@ public final class DOMSAMLUtil {
(SamlAssertionWrapper)samlResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
if (!checkHolderOfKey(assertionWrapper, signedResults, tlsCerts)) {
- log.warn("Assertion fails holder-of-key requirements");
+ LOG.warn("Assertion fails holder-of-key requirements");
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY);
}
if (!checkSenderVouches(assertionWrapper, tlsCerts, body, signedResults)) {
- log.warn("Assertion fails sender-vouches requirements");
+ LOG.warn("Assertion fails sender-vouches requirements");
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY);
}
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java Wed Jan 8 13:53:03 2014
@@ -61,7 +61,7 @@ import org.w3c.dom.Element;
public class WSSecSignatureSAML extends WSSecSignature {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecSignatureSAML.class);
private boolean senderVouches;
private SecurityTokenReference secRefSaml;
@@ -78,14 +78,14 @@ public class WSSecSignatureSAML extends
*/
public WSSecSignatureSAML() {
super();
- doDebug = log.isDebugEnabled();
+ doDebug = LOG.isDebugEnabled();
}
/**
* Constructor.
*/
public WSSecSignatureSAML(WSSConfig config) {
super(config);
- doDebug = log.isDebugEnabled();
+ doDebug = LOG.isDebugEnabled();
}
/**
@@ -201,7 +201,7 @@ public class WSSecSignatureSAML extends
) throws WSSecurityException {
if (doDebug) {
- log.debug("Beginning ST signing...");
+ LOG.debug("Beginning ST signing...");
}
userCrypto = uCrypto;
@@ -291,7 +291,7 @@ public class WSSecSignatureSAML extends
}
String pubKeyAlgo = key.getAlgorithm();
- log.debug("automatic sig algo detection: " + pubKeyAlgo);
+ LOG.debug("automatic sig algo detection: " + pubKeyAlgo);
if (pubKeyAlgo.equalsIgnoreCase("DSA")) {
sigAlgo = WSConstants.DSA;
} else if (pubKeyAlgo.equalsIgnoreCase("RSA")) {
@@ -316,7 +316,7 @@ public class WSSecSignatureSAML extends
c14nMethod = signatureFactory.newCanonicalizationMethod(canonAlgo, c14nSpec);
} catch (Exception ex) {
- log.error("", ex);
+ LOG.error("", ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_SIGNATURE, "noXMLSig", ex
);
@@ -550,7 +550,7 @@ public class WSSecSignatureSAML extends
signatureValue = sig.getSignatureValue().getValue();
} catch (Exception ex) {
- log.error(ex.getMessage(), ex);
+ LOG.error(ex.getMessage(), ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_SIGNATURE, ex
);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java Wed Jan 8 13:53:03 2014
@@ -66,7 +66,7 @@ public class STRTransform extends Transf
private Element transformElement;
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(STRTransform.class);
public final AlgorithmParameterSpec getParameterSpec() {
@@ -191,7 +191,7 @@ public class STRTransform extends Transf
wsDocInfo = (WSDocInfo)wsDocInfoObject;
}
if (wsDocInfo == null) {
- log.debug("STRTransform: no WSDocInfo found");
+ LOG.debug("STRTransform: no WSDocInfo found");
}
Document doc = str.getOwnerDocument();
@@ -218,8 +218,8 @@ public class STRTransform extends Transf
// C14n with specified algorithm. According to WSS Specification.
//
buf = canon.canonicalizeSubtree(dereferencedToken, "#default", true);
- if (log.isDebugEnabled()) {
- log.debug("after c14n: " + new String(buf, "UTF-8"));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("after c14n: " + new String(buf, "UTF-8"));
}
if (os != null) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java Wed Jan 8 13:53:03 2014
@@ -34,10 +34,10 @@ import org.w3c.dom.Element;
import org.w3c.dom.Text;
/**
- * Utility class exposing the dereferencing logic of the {@link STRTransform} implementation.
+ * Utility class exposing the dereferencing LOG.c of the {@link STRTransform} implementation.
*/
public final class STRTransformUtil {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(STRTransformUtil.class);
/**
@@ -63,8 +63,8 @@ public final class STRTransformUtil {
// reference to the BST or Assertion. Copying is done by the caller.
//
if (secRef.containsReference()) {
- if (log.isDebugEnabled()) {
- log.debug("STR: Reference");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("STR: Reference");
}
return secRef.getTokenElement(doc, wsDocInfo, null);
}
@@ -73,8 +73,8 @@ public final class STRTransformUtil {
// to specification
//
else if (secRef.containsX509Data() || secRef.containsX509IssuerSerial()) {
- if (log.isDebugEnabled()) {
- log.debug("STR: IssuerSerial");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("STR: IssuerSerial");
}
X509Certificate[] certs =
secRef.getX509IssuerSerial(wsDocInfo.getCrypto());
@@ -89,8 +89,8 @@ public final class STRTransformUtil {
// be a SAML assertion, so try and find the referenced element.
//
else if (secRef.containsKeyIdentifier()) {
- if (log.isDebugEnabled()) {
- log.debug("STR: KeyIdentifier");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("STR: KeyIdentifier");
}
if (WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(secRef.getKeyIdentifierValueType())
|| WSConstants.WSS_SAML2_KI_VALUE_TYPE.equals(secRef.getKeyIdentifierValueType())) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java?rev=1556531&r1=1556530&r2=1556531&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java Wed Jan 8 13:53:03 2014
@@ -61,7 +61,7 @@ import java.util.Set;
* WS-Security Utility methods. <p/>
*/
public final class WSSecurityUtil {
- private static org.slf4j.Logger log =
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(WSSecurityUtil.class);
/**
@@ -118,8 +118,8 @@ public final class WSSecurityUtil {
if (WSSecurityUtil.isActorEqual(actor, hActor)) {
if (foundSecurityHeader != null) {
- if (log.isDebugEnabled()) {
- log.debug(
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(
"Two or more security headers have the same actor name: " + actor
);
}
@@ -408,7 +408,7 @@ public final class WSSecurityUtil {
if (foundElement == null) {
foundElement = se; // Continue searching to find duplicates
} else {
- log.warn("Multiple elements with the same 'ID' attribute value!");
+ LOG.warn("Multiple elements with the same 'ID' attribute value!");
return null;
}
}
@@ -444,7 +444,7 @@ public final class WSSecurityUtil {
* It's somewhat faster than XPath, and we do not deal with prefixes, just with the real
* namespace URI
*
- * If checkMultipleElements is true and there are multiple elements, we log a
+ * If checkMultipleElements is true and there are multiple elements, we LOG.a
* warning and return null as this can be used to get around the signature checking.
*
* @param startNode Where to start the search
@@ -480,7 +480,7 @@ public final class WSSecurityUtil {
} else if (foundElement == null) {
foundElement = se; // Continue searching to find duplicates
} else {
- log.warn("Multiple elements with the same 'Id' attribute value!");
+ LOG.warn("Multiple elements with the same 'Id' attribute value!");
return null;
}
}
@@ -753,8 +753,8 @@ public final class WSSecurityUtil {
if (WSSecurityUtil.isActorEqual(actor, hActor)) {
if (foundSecurityHeader != null) {
- if (log.isDebugEnabled()) {
- log.debug(
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(
"Two or more security headers have the same actor name: " + actor
);
}
@@ -1082,7 +1082,7 @@ public final class WSSecurityUtil {
requiredPart);
}
}
- log.debug("All required elements are protected");
+ LOG.debug("All required elements are protected");
}
}
@@ -1113,7 +1113,7 @@ public final class WSSecurityUtil {
);
}
- log.debug("Checking required elements are in the signature...");
+ LOG.debug("Checking required elements are in the signature...");
for (int i = 0; i < requiredIDs.length; i++) {
boolean found = false;
for (int j = 0; j < signedElemsRefList.size(); j++) {
@@ -1132,9 +1132,9 @@ public final class WSSecurityUtil {
"requiredElementNotSigned",
requiredIDs[i]);
}
- log.debug("Element with ID " + requiredIDs[i] + " was correctly signed");
+ LOG.debug("Element with ID " + requiredIDs[i] + " was correctly signed");
}
- log.debug("All required elements are signed");
+ LOG.debug("All required elements are signed");
}
@@ -1271,7 +1271,7 @@ public final class WSSecurityUtil {
if (!"".equals(uri)) {
boolean added = refs.add(WSSecurityUtil.getIDFromReference(uri));
if (!added) {
- log.warn("Duplicated reference uri: " + uri);
+ LOG.warn("Duplicated reference uri: " + uri);
}
}
}