Author: coheigea
Date: Wed Feb 27 23:14:34 2013
New Revision: 1451027
URL: http://svn.apache.org/r1451027
Log:
Minor refactor
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.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/XMLUtils.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.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/SignatureConfirmationAction.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.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/WSSecDerivedKeyBase.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/WSSecHeader.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/BinarySecurity.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/Reference.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.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/message/token/SignatureConfirmation.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.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/util/WSSecurityUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
Wed Feb 27 23:14:34 2013
@@ -46,7 +46,7 @@ import org.apache.wss4j.common.ext.WSSec
*/
public class CertificateStore extends CryptoBase {
- protected X509Certificate[] trustedCerts;
+ private X509Certificate[] trustedCerts;
/**
* Constructor
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
Wed Feb 27 23:14:34 2013
@@ -118,7 +118,6 @@ public class Merlin extends CryptoBase {
org.apache.commons.logging.LogFactory.getLog(Merlin.class);
private static final boolean DO_DEBUG = LOG.isDebugEnabled();
- protected static CertificateFactory certFact;
protected Properties properties = null;
protected KeyStore keystore = null;
protected KeyStore truststore = null;
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthenticationStatementBean.java
Wed Feb 27 23:14:34 2013
@@ -30,7 +30,7 @@ import org.joda.time.DateTime;
*/
public class AuthenticationStatementBean {
private SubjectBean subject;
- DateTime authenticationInstant;
+ private DateTime authenticationInstant;
private String authenticationMethod;
private SubjectLocalityBean subjectLocality;
private String sessionIndex;
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -44,7 +44,7 @@ import java.util.List;
* @author Sam Ruby ([email protected])
*/
public class NSStack {
- protected static final org.apache.commons.logging.Log log =
+ private static final org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(NSStack.class);
private Mapping[] stack;
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java
Wed Feb 27 23:14:34 2013
@@ -54,11 +54,10 @@ public class XMLUtils {
if (parentNode == null) {
return null;
}
- for (
- Node currentChild = parentNode.getFirstChild();
- currentChild != null;
- currentChild = currentChild.getNextSibling()
- ) {
+ for (Node currentChild = parentNode.getFirstChild();
+ currentChild != null;
+ currentChild = currentChild.getNextSibling()
+ ) {
if (Node.ELEMENT_NODE == currentChild.getNodeType()
&& localName.equals(currentChild.getLocalName())
&& namespace.equals(currentChild.getNamespaceURI())) {
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
Wed Feb 27 23:14:34 2013
@@ -45,12 +45,12 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class WSDocInfo {
- private Document doc = null;
- private Crypto crypto = null;
- private List<Element> tokenList = null;
- private List<WSSecurityEngineResult> resultsList = null;
- private CallbackLookup callbackLookup = null;
- private Element securityHeader = null;
+ private Document doc;
+ private Crypto crypto;
+ private List<Element> tokenList;
+ private List<WSSecurityEngineResult> resultsList;
+ private CallbackLookup callbackLookup;
+ private Element securityHeader;
public WSDocInfo(Document doc) {
//
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.java
Wed Feb 27 23:14:34 2013
@@ -221,16 +221,16 @@ public class WSSConfig {
* child when generating Signatures using
WSConstants.C14N_EXCL_OMIT_COMMENTS.
* The default is true.
*/
- protected boolean addInclusivePrefixes = true;
+ private boolean addInclusivePrefixes = true;
/**
* Set the timestamp precision mode. If set to <code>true</code> then use
* timestamps with milliseconds, otherwise omit the milliseconds. As per
XML
* Date/Time specification the default is to include the milliseconds.
*/
- protected boolean precisionInMilliSeconds = true;
+ private boolean precisionInMilliSeconds = true;
- protected boolean enableSignatureConfirmation = false;
+ private boolean enableSignatureConfirmation;
/**
* If set to true then the timestamp handling will throw an exception if
the
@@ -239,44 +239,44 @@ public class WSSConfig {
* If set to false, no exception will be thrown, even if the semantics are
* expired.
*/
- protected boolean timeStampStrict = true;
+ private boolean timeStampStrict = true;
/**
* If this value is not null, then username token handling will throw an
* exception if the password type of the Username Token does not match
this value
*/
- protected String requiredPasswordType = null;
+ private String requiredPasswordType;
/**
* This variable controls whether a UsernameToken with no password element
is allowed.
* The default value is "false". Set it to "true" to allow deriving keys
from UsernameTokens
* or to support UsernameTokens for purposes other than authentication.
*/
- protected boolean allowUsernameTokenNoPassword = false;
+ private boolean allowUsernameTokenNoPassword;
/**
* The time in seconds between creation and expiry for a Timestamp. The
default
* is 300 seconds (5 minutes).
*/
- protected int timeStampTTL = 300;
+ private int timeStampTTL = 300;
/**
* The time in seconds in the future within which the Created time of an
incoming
* Timestamp is valid. The default is 60 seconds.
*/
- protected int timeStampFutureTTL = 60;
+ private int timeStampFutureTTL = 60;
/**
* The time in seconds between creation and expiry for a UsernameToken
Created
* element. The default is 300 seconds (5 minutes).
*/
- protected int utTTL = 300;
+ private int utTTL = 300;
/**
* The time in seconds in the future within which the Created time of an
incoming
* UsernameToken is valid. The default is 60 seconds.
*/
- protected int utFutureTTL = 60;
+ private int utFutureTTL = 60;
/**
* This variable controls whether types other than PasswordDigest or
PasswordText
@@ -285,7 +285,7 @@ public class WSSConfig {
* By default this is set to false so that the user doesn't have to
explicitly
* reject custom token types in the callback handler.
*/
- protected boolean handleCustomPasswordTypes = false;
+ private boolean handleCustomPasswordTypes;
/**
* This variable controls whether (wsse) namespace qualified password
types are
@@ -293,12 +293,12 @@ public class WSSConfig {
*
* By default this is set to false.
*/
- protected boolean allowNamespaceQualifiedPasswordTypes = false;
+ private boolean allowNamespaceQualifiedPasswordTypes;
/**
* The secret key length to be used for UT_SIGN.
*/
- protected int secretKeyLength = WSConstants.WSE_DERIVED_KEY_LEN;
+ private int secretKeyLength = WSConstants.WSE_DERIVED_KEY_LEN;
/**
* Whether the password should be treated as a binary value. This
@@ -311,7 +311,7 @@ public class WSSConfig {
*
* See https://issues.apache.org/jira/browse/WSS-239
*/
- protected boolean passwordsAreEncoded = false;
+ private boolean passwordsAreEncoded;
/**
* The default wsu:Id allocator is a simple "start at 1 and increment up"
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -49,13 +49,6 @@ public class WSSecurityEngine {
org.apache.commons.logging.LogFactory.getLog(WSSecurityEngine.class);
/**
- * The WSSConfig instance used by this SecurityEngine to
- * find Processors for processing security headers
- */
- private WSSConfig wssConfig = null;
- private boolean doDebug = false;
- private CallbackLookup callbackLookup = null;
- /**
* <code>wsse:BinarySecurityToken</code> as defined by WS Security
specification
*/
public static final QName BINARY_TOKEN =
@@ -136,6 +129,14 @@ public class WSSecurityEngine {
new QName(ConversationConstants.WSC_NS_05_12,
ConversationConstants.SECURITY_CONTEXT_TOKEN_LN);
/**
+ * The WSSConfig instance used by this SecurityEngine to
+ * find Processors for processing security headers
+ */
+ private WSSConfig wssConfig;
+ private boolean doDebug;
+ private CallbackLookup callbackLookup;
+
+ /**
* @return the WSSConfig object set on this instance
*/
public final WSSConfig
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -35,7 +35,7 @@ import java.util.ArrayList;
import java.util.List;
public class SignatureConfirmationAction implements Action {
- protected static final org.apache.commons.logging.Log log =
+ private static final org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(SignatureConfirmationAction.class);
@SuppressWarnings("unchecked")
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
Wed Feb 27 23:14:34 2013
@@ -51,43 +51,43 @@ import org.apache.wss4j.dom.validate.Val
*/
public class RequestData {
- private Object msgContext = null;
- private boolean noSerialization = false;
- private SOAPConstants soapConstants = null;
- private String actor = null;
- private String username = null;
+ private Object msgContext;
+ private boolean noSerialization ;
+ private SOAPConstants soapConstants ;
+ private String actor;
+ private String username ;
private String pwType = WSConstants.PASSWORD_DIGEST; // Make this the
default when no password type is given.
- private String[] utElements = null;
- private Crypto sigCrypto = null;
- private Crypto sigVerCrypto = null;
- private Crypto encCrypto = null;
- private Crypto decCrypto = null;
- private int sigKeyId = 0;
- private String sigAlgorithm = null;
- private String signatureDigestAlgorithm = null;
- private String encryptionDigestAlgorithm = null;
- private String encryptionMGFAlgorithm = null;
+ private String[] utElements;
+ private Crypto sigCrypto;
+ private Crypto sigVerCrypto;
+ private Crypto encCrypto;
+ private Crypto decCrypto;
+ private int sigKeyId;
+ private String sigAlgorithm;
+ private String signatureDigestAlgorithm;
+ private String encryptionDigestAlgorithm;
+ private String encryptionMGFAlgorithm ;
private List<WSEncryptionPart> signatureParts = new
ArrayList<WSEncryptionPart>();
- private int encKeyId = 0;
- private String encSymmAlgo = null;
- private String encKeyTransport = null;
- private String encUser = null;
- private String signatureUser = null;
+ private int encKeyId;
+ private String encSymmAlgo;
+ private String encKeyTransport;
+ private String encUser;
+ private String signatureUser ;
private List<WSEncryptionPart> encryptParts = new
ArrayList<WSEncryptionPart>();
- private X509Certificate encCert = null;
+ private X509Certificate encCert;
private int timeToLive = 300; // Timestamp: time in seconds between
creation and expiry
- private WSSConfig wssConfig = null;
+ private WSSConfig wssConfig;
private List<byte[]> signatureValues = new ArrayList<byte[]>();
- private WSSecHeader secHeader = null;
+ private WSSecHeader secHeader;
private boolean encSymmetricEncryptionKey = true;
private int secretKeyLength = WSConstants.WSE_DERIVED_KEY_LEN;
private boolean useDerivedKey = true;
private int derivedKeyIterations = UsernameToken.DEFAULT_ITERATION;
private boolean useDerivedKeyForMAC = true;
private boolean useSingleCert = true;
- private CallbackHandler callback = null;
- private boolean enableRevocation = false;
- protected boolean requireSignedEncryptedDataElements = false;
+ private CallbackHandler callback;
+ private boolean enableRevocation;
+ protected boolean requireSignedEncryptedDataElements;
private ReplayCache timestampReplayCache;
private ReplayCache nonceReplayCache;
private Collection<Pattern> subjectDNPatterns = new ArrayList<Pattern>();
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
Wed Feb 27 23:14:34 2013
@@ -36,15 +36,15 @@ import java.util.List;
* @author Werner Dittmann ([email protected])
*/
public class WSSecBase {
- protected String user = null;
+ protected String user;
- protected String password = null;
+ protected String password;
protected int keyIdentifierType = WSConstants.ISSUER_SERIAL;
- protected List<WSEncryptionPart> parts = null;
+ protected List<WSEncryptionPart> parts;
- protected boolean doDebug = false;
+ protected boolean doDebug;
protected CallbackLookup callbackLookup;
@@ -52,6 +52,7 @@ public class WSSecBase {
public WSSecBase() {
}
+
public WSSecBase(WSSConfig config) {
wssConfig = config;
}
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
Wed Feb 27 23:14:34 2013
@@ -50,6 +50,7 @@ public class WSSecDKEncrypt extends WSSe
public WSSecDKEncrypt() {
super();
}
+
public WSSecDKEncrypt(WSSConfig config) {
super(config);
}
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -66,11 +66,11 @@ public class WSSecDKSign extends WSSecDe
private String sigAlgo = WSConstants.HMAC_SHA1;
private String digestAlgo = WSConstants.SHA1;
private String canonAlgo = WSConstants.C14N_EXCL_OMIT_COMMENTS;
- private byte[] signatureValue = null;
+ private byte[] signatureValue;
- private String keyInfoUri = null;
- private SecurityTokenReference secRef = null;
- private String strUri = null;
+ private String keyInfoUri;
+ private SecurityTokenReference secRef;
+ private String strUri;
private WSDocInfo wsDocInfo;
private KeyInfoFactory keyInfoFactory;
@@ -78,7 +78,7 @@ public class WSSecDKSign extends WSSecDe
private XMLSignature sig;
private KeyInfo keyInfo;
private CanonicalizationMethod c14nMethod;
- private Element securityHeader = null;
+ private Element securityHeader;
public WSSecDKSign() {
super();
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java
Wed Feb 27 23:14:34 2013
@@ -56,17 +56,17 @@ public abstract class WSSecDerivedKeyBas
/**
* DerivedKeyToken of this builder
*/
- protected DerivedKeyToken dkt = null;
+ protected DerivedKeyToken dkt;
/**
* Raw bytes of the derived key
*/
- protected byte[] derivedKeyBytes = null;
+ protected byte[] derivedKeyBytes;
/**
* wsu:Id of the wsc:DerivedKeyToken
*/
- protected String dktId = null;
+ protected String dktId;
/**
* Client's label value
@@ -81,13 +81,13 @@ public abstract class WSSecDerivedKeyBas
/**
* soap:Envelope element
*/
- protected Element envelope = null;
+ protected Element envelope;
/**
* The Token identifier of the token that the <code>DerivedKeyToken</code>
* is (or to be) derived from.
*/
- private String tokenIdentifier = null;
+ private String tokenIdentifier;
/**
* True if the tokenIdentifier is a direct reference to a key identifier
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -59,14 +59,14 @@ public class WSSecEncrypt extends WSSecE
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(WSSecEncrypt.class);
- private byte[] embeddedKey = null;
+ private byte[] embeddedKey;
- private String embeddedKeyName = null;
+ private String embeddedKeyName;
/**
* SecurityTokenReference to be inserted into EncryptedData/keyInfo
element.
*/
- private SecurityTokenReference securityTokenReference = null;
+ private SecurityTokenReference securityTokenReference ;
/**
* Indicates whether to encrypt the symmetric key into an EncryptedKey
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -72,7 +72,7 @@ public class WSSecEncryptedKey extends W
/**
* soap:Envelope element
*/
- protected Element envelope = null;
+ protected Element envelope;
/**
* Session key used as the secret in key derivation
@@ -82,7 +82,7 @@ public class WSSecEncryptedKey extends W
/**
* Symmetric key used in the EncryptedKey.
*/
- protected SecretKey symmetricKey = null;
+ protected SecretKey symmetricKey;
/**
* Encrypted bytes of the ephemeral key
@@ -103,24 +103,24 @@ public class WSSecEncryptedKey extends W
* Digest Algorithm to be used with RSA-OAEP. The default is SHA-1 (which
is not
* written out unless it is explicitly configured).
*/
- private String digestAlgo = null;
+ private String digestAlgo;
/**
* MGF Algorithm to be used with RSA-OAEP. The default is MGF-SHA-1 (which
is not
* written out unless it is explicitly configured).
*/
- private String mgfAlgo = null;
+ private String mgfAlgo;
/**
* xenc:EncryptedKey element
*/
- protected Element encryptedKeyElement = null;
+ protected Element encryptedKeyElement;
/**
* The Token identifier of the token that the <code>DerivedKeyToken</code>
* is (or to be) derived from.
*/
- protected String encKeyId = null;
+ protected String encKeyId;
/**
* Custom token value
@@ -136,9 +136,9 @@ public class WSSecEncryptedKey extends W
* BinarySecurityToken to be included in the case where
BST_DIRECT_REFERENCE
* is used to refer to the asymmetric encryption cert
*/
- protected BinarySecurity bstToken = null;
+ protected BinarySecurity bstToken;
- protected X509Certificate useThisCert = null;
+ protected X509Certificate useThisCert;
public WSSecEncryptedKey() {
super();
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
Wed Feb 27 23:14:34 2013
@@ -36,11 +36,11 @@ import org.w3c.dom.Node;
* @author Werner Dittmann ([email protected])
*/
public class WSSecHeader {
- private String actor = null;
+ private String actor;
private boolean mustunderstand = true;
- private Element securityHeader = null;
+ private Element securityHeader;
/**
* Constructor.
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -38,13 +38,14 @@ public class WSSecSAMLToken extends WSSe
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(WSSecSAMLToken.class);
- private Document document = null;
+ private Document document;
- private SamlAssertionWrapper saml = null;
+ private SamlAssertionWrapper saml;
public WSSecSAMLToken() {
super();
}
+
public WSSecSAMLToken(WSSConfig config) {
super(config);
}
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -82,33 +82,33 @@ public class WSSecSignature extends WSSe
org.apache.commons.logging.LogFactory.getLog(WSSecSignature.class);
protected boolean useSingleCert = true;
- protected String sigAlgo = null;
+ protected String sigAlgo;
protected String canonAlgo = WSConstants.C14N_EXCL_OMIT_COMMENTS;
- protected byte[] signatureValue = null;
- protected Document document = null;
- protected WSDocInfo wsDocInfo = null;
- protected String certUri = null;
- protected String keyInfoUri = null;
- protected SecurityTokenReference secRef = null;
- protected String strUri = null;
- protected BinarySecurity bstToken = null;
+ protected byte[] signatureValue;
+ protected Document document;
+ protected WSDocInfo wsDocInfo;
+ protected String certUri;
+ protected String keyInfoUri;
+ protected SecurityTokenReference secRef;
+ protected String strUri;
+ protected BinarySecurity bstToken;
protected KeyInfoFactory keyInfoFactory;
protected XMLSignatureFactory signatureFactory;
protected KeyInfo keyInfo;
protected CanonicalizationMethod c14nMethod;
protected XMLSignature sig;
- protected byte[] secretKey = null;
+ protected byte[] secretKey;
protected String customTokenValueType;
protected String customTokenId;
- private String encrKeySha1value = null;
- private Crypto crypto = null;
+ private String encrKeySha1value;
+ private Crypto crypto;
private String digestAlgo = WSConstants.SHA1;
- private X509Certificate useThisCert = null;
- private Element securityHeader = null;
+ private X509Certificate useThisCert;
+ private Element securityHeader;
private boolean useCustomSecRef;
- private boolean bstAddedToSecurityHeader = false;
+ private boolean bstAddedToSecurityHeader;
public WSSecSignature() {
super();
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -55,6 +55,7 @@ public class WSSecSignatureBase extends
public WSSecSignatureBase() {
super();
}
+
public WSSecSignatureBase(WSSConfig config) {
super(config);
}
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -30,18 +30,18 @@ import org.w3c.dom.Element;
*
* @author Werner Dittmann ([email protected]).
*/
-
public class WSSecSignatureConfirmation extends WSSecBase {
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(WSSecSignatureConfirmation.class);
- private SignatureConfirmation sc = null;
+ private SignatureConfirmation sc;
- private byte[] signatureValue = null;
+ private byte[] signatureValue;
public WSSecSignatureConfirmation() {
super();
}
+
public WSSecSignatureConfirmation(WSSConfig config) {
super(config);
}
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -37,16 +37,18 @@ public class WSSecTimestamp extends WSSe
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(WSSecTimestamp.class);
- private Timestamp ts = null;
+ private Timestamp ts;
private int timeToLive = 300; // time between Created and Expires
public WSSecTimestamp() {
super();
}
+
public WSSecTimestamp(WSSConfig config) {
super(config);
}
+
/**
* Set the time to live. This is the time difference in seconds between the
* <code>Created</code> and the <code>Expires</code> in
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -41,15 +41,15 @@ public class WSSecUsernameToken extends
org.apache.commons.logging.LogFactory.getLog(WSSecUsernameToken.class);
private String passwordType = WSConstants.PASSWORD_DIGEST;
- private UsernameToken ut = null;
- private boolean nonce = false;
- private boolean created = false;
- private boolean useDerivedKey = false;
- private boolean useMac = false;
+ private UsernameToken ut;
+ private boolean nonce;
+ private boolean created;
+ private boolean useDerivedKey;
+ private boolean useMac;
private byte[] saltValue;
private int iteration = UsernameToken.DEFAULT_ITERATION;
private int secretKeyLength = WSConstants.WSE_DERIVED_KEY_LEN;
- private boolean passwordsAreEncoded = false;
+ private boolean passwordsAreEncoded;
public WSSecUsernameToken() {
super();
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java
Wed Feb 27 23:14:34 2013
@@ -51,7 +51,7 @@ public class BinarySecurity {
private static final org.apache.commons.logging.Log LOG =
org.apache.commons.logging.LogFactory.getLog(BinarySecurity.class);
- private Element element = null;
+ private Element element;
/**
* Constructor.
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -63,14 +63,14 @@ public class DerivedKeyToken {
org.apache.commons.logging.LogFactory.getLog(DerivedKeyToken.class);
// These are the elements that are used to create the SecurityContextToken
- private Element element = null;
- private Element elementSecurityTokenReference = null;
- private Element elementProperties = null;
- private Element elementGeneration = null;
- private Element elementOffset = null;
- private Element elementLength = null;
- private Element elementLabel = null;
- private Element elementNonce = null;
+ private Element element;
+ private Element elementSecurityTokenReference;
+ private Element elementProperties;
+ private Element elementGeneration;
+ private Element elementOffset;
+ private Element elementLength;
+ private Element elementLabel;
+ private Element elementNonce;
private String ns;
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Reference.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Reference.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Reference.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Reference.java
Wed Feb 27 23:14:34 2013
@@ -36,7 +36,7 @@ import org.w3c.dom.Node;
*/
public class Reference {
public static final QName TOKEN = new QName(WSConstants.WSSE_NS,
"Reference");
- private Element element = null;
+ private Element element;
/**
* Constructor.
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityContextToken.java
Wed Feb 27 23:14:34 2013
@@ -43,14 +43,14 @@ public class SecurityContextToken {
/**
* Security context token element
*/
- private Element element = null;
+ private Element element;
/**
* Identifier element
*/
- private Element elementIdentifier = null;
+ private Element elementIdentifier;
- private WSSConfig wssConfig = null;
+ private WSSConfig wssConfig;
private String tokenType = WSConstants.WSC_SCT;
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -67,10 +67,10 @@ public class SecurityTokenReference {
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(SecurityTokenReference.class);
- private Element element = null;
- private DOMX509IssuerSerial issuerSerial = null;
- private byte[] skiBytes = null;
- private Reference reference = null;
+ private Element element;
+ private DOMX509IssuerSerial issuerSerial;
+ private byte[] skiBytes;
+ private Reference reference;
/**
* Constructor.
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SignatureConfirmation.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SignatureConfirmation.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SignatureConfirmation.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SignatureConfirmation.java
Wed Feb 27 23:14:34 2013
@@ -43,8 +43,8 @@ import org.w3c.dom.Node;
public class SignatureConfirmation {
public static final String SC_VALUE_ATTR = "Value";
- private Element element = null;
- private byte[] signatureValue = null;
+ private Element element;
+ private byte[] signatureValue;
/**
* Constructs a <code>SignatureConfirmation</code> object and parses the
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
Wed Feb 27 23:14:34 2013
@@ -51,8 +51,8 @@ import org.w3c.dom.Text;
*/
public class Timestamp {
- private Element element = null;
- private List<Element> customElements = null;
+ private Element element;
+ private List<Element> customElements;
private Date createdDate;
private Date expiresDate;
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
Wed Feb 27 23:14:34 2013
@@ -79,17 +79,17 @@ public class UsernameToken {
org.apache.commons.logging.LogFactory.getLog(UsernameToken.class);
private static final boolean DO_DEBUG = LOG.isDebugEnabled();
- private Element element = null;
- private Element elementUsername = null;
- private Element elementPassword = null;
- private Element elementNonce = null;
- private Element elementCreated = null;
- private Element elementSalt = null;
- private Element elementIteration = null;
- private String passwordType = null;
+ private Element element ;
+ private Element elementUsername;
+ private Element elementPassword;
+ private Element elementNonce;
+ private Element elementCreated;
+ private Element elementSalt;
+ private Element elementIteration;
+ private String passwordType;
private boolean hashed = true;
private String rawPassword; // enhancement by Alberto Coletti
- private boolean passwordsAreEncoded = false;
+ private boolean passwordsAreEncoded;
private Date createdDate;
/**
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java
Wed Feb 27 23:14:34 2013
@@ -45,7 +45,7 @@ public class X509Security extends Binary
* Stores the associated X.509 Certificate. This saves numerous
* crypto loadCertificate operations
*/
- private X509Certificate cachedCert = null;
+ private X509Certificate cachedCert;
/**
* This constructor creates a new X509 certificate object and initializes
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -61,15 +61,15 @@ public class WSSecSignatureSAML extends
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(WSSecSignatureSAML.class);
- private boolean senderVouches = false;
- private SecurityTokenReference secRefSaml = null;
- private String secRefID = null;
- private Element samlToken = null;
- private Crypto userCrypto = null;
- private Crypto issuerCrypto = null;
- private String issuerKeyName = null;
- private String issuerKeyPW = null;
- private boolean useDirectReferenceToAssertion = false;
+ private boolean senderVouches;
+ private SecurityTokenReference secRefSaml;
+ private String secRefID;
+ private Element samlToken;
+ private Crypto userCrypto;
+ private Crypto issuerCrypto;
+ private String issuerKeyName;
+ private String issuerKeyPW;
+ private boolean useDirectReferenceToAssertion;
/**
* Constructor.
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=1451027&r1=1451026&r2=1451027&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 Feb 27 23:14:34 2013
@@ -72,12 +72,12 @@ public final class WSSecurityUtil {
* generator is required to overcome punitive
* overhead.
*/
- private static SecureRandom random = null;
+ private static SecureRandom random;
/**
* A cached MessageDigest object
*/
- private static MessageDigest digest = null;
+ private static MessageDigest digest;
private WSSecurityUtil() {
// Complete
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java?rev=1451027&r1=1451026&r2=1451027&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java
Wed Feb 27 23:14:34 2013
@@ -41,7 +41,7 @@ public class JAASUsernameTokenValidator
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(JAASUsernameTokenValidator.class);
- private String contextName = null;
+ private String contextName;
public void setContextName(String name) {
contextName = name;
