diff --git a/security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java b/security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java
index c197b851..bb5d4ac1 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java
@@ -35,6 +35,7 @@ import org.springframework.ws.soap.server.SoapEndpointInterceptor;
* are on.
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInterceptor {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java b/security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java
index 02ffb34d..b1b1d774 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java
@@ -23,6 +23,7 @@ import org.springframework.ws.WebServiceException;
* and validation.
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public abstract class WsSecurityException extends WebServiceException {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java b/security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java
index 0dfb1ca5..b5d73d99 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java
@@ -23,6 +23,7 @@ package org.springframework.ws.soap.security;
* fail. Failure to secure a message is usually not a fatal problem.
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public abstract class WsSecuritySecurementException extends WsSecurityException {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java b/security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java
index c41e2e85..26bb13b5 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java
@@ -23,6 +23,7 @@ package org.springframework.ws.soap.security;
* fail. Failure to validate a message is usually not a fatal problem.
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public abstract class WsSecurityValidationException extends WsSecurityException {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java b/security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java
index b1f4e4fd..982934e6 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java
@@ -23,7 +23,6 @@ import java.security.KeyStore;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
@@ -37,6 +36,7 @@ import org.springframework.util.StringUtils;
*
* @author Arjen Poutsma
* @see #setLocation(org.springframework.core.io.Resource)
+ * @since 1.0.0
*/
public class KeyStoreFactoryBean implements FactoryBean, InitializingBean {
@@ -55,7 +55,7 @@ public class KeyStoreFactoryBean implements FactoryBean, InitializingBean {
/**
* Sets the location of the key store to use. If this is not set, a new, empty key store will be used.
*
- * @see KeyStore#load(java.io.InputStream, char[])
+ * @see KeyStore#load(java.io.InputStream,char[])
*/
public void setLocation(Resource location) {
this.location = location;
@@ -71,9 +71,7 @@ public class KeyStoreFactoryBean implements FactoryBean, InitializingBean {
}
}
- /**
- * Sets the provider of the key store to use. If this is not set, the default is used.
- */
+ /** Sets the provider of the key store to use. If this is not set, the default is used. */
public void setProvider(String provider) {
this.provider = provider;
}
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
index 4cceef8b..421ae3bb 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
@@ -54,6 +54,7 @@ import org.springframework.ws.soap.security.xwss.callback.CallbackHandlerChain;
* @see com.sun.xml.wss.impl.callback.XWSSCallback
* @see org.springframework.ws.soap.saaj.SaajSoapMessageFactory
* @see XWSS
+ * @since 1.0.0
*/
public class XwsSecurityInterceptor extends AbstractWsSecurityInterceptor implements InitializingBean {
@@ -85,9 +86,7 @@ public class XwsSecurityInterceptor extends AbstractWsSecurityInterceptor implem
this.callbackHandler = new CallbackHandlerChain(callbackHandler);
}
- /**
- * Sets the policy configuration to use for XWSS. Required.
- */
+ /** Sets the policy configuration to use for XWSS. Required. */
public void setPolicyConfiguration(Resource policyConfiguration) {
this.policyConfiguration = policyConfiguration;
}
@@ -100,7 +99,7 @@ public class XwsSecurityInterceptor extends AbstractWsSecurityInterceptor implem
InputStream is = null;
try {
if (logger.isInfoEnabled()) {
- logger.info("Loading policy configuration from from '" + policyConfiguration.getFilename() + "'");
+ logger.info("Loading policy configuration from from '" + policyConfiguration + "'");
}
is = policyConfiguration.getInputStream();
processor = processorFactory.createProcessorForSecurityConfiguration(is, callbackHandler);
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/AbstractCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/AbstractCallbackHandler.java
index c787fea1..1fbf5153 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/AbstractCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/AbstractCallbackHandler.java
@@ -17,7 +17,6 @@
package org.springframework.ws.soap.security.xwss.callback;
import java.io.IOException;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -29,12 +28,11 @@ import org.apache.commons.logging.LogFactory;
* Abstract implementation of a CallbackHandler.
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public abstract class AbstractCallbackHandler implements CallbackHandler {
- /**
- * Logger available to subclasses.
- */
+ /** Logger available to subclasses. */
protected final Log logger = LogFactory.getLog(getClass());
protected AbstractCallbackHandler() {
@@ -52,8 +50,6 @@ public abstract class AbstractCallbackHandler implements CallbackHandler {
}
}
- /**
- * Template method that should be implemented by subclasses.
- */
+ /** Template method that should be implemented by subclasses. */
protected abstract void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException;
}
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CallbackHandlerChain.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CallbackHandlerChain.java
index 931b63a5..60f1aa09 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CallbackHandlerChain.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CallbackHandlerChain.java
@@ -18,7 +18,6 @@ package org.springframework.ws.soap.security.xwss.callback;
import java.io.IOException;
import java.security.cert.X509Certificate;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -32,6 +31,7 @@ import com.sun.xml.wss.impl.callback.TimestampValidationCallback;
* handler throws a UnsupportedCallbackException, the next handler is tried.
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public class CallbackHandlerChain extends AbstractCallbackHandler {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java
index b9abbead..fa627616 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java
@@ -17,7 +17,6 @@
package org.springframework.ws.soap.security.xwss.callback;
import java.io.IOException;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -33,6 +32,7 @@ import com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback;
* so you only need to override those you need.
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public class CryptographyCallbackHandler extends AbstractCallbackHandler {
@@ -80,9 +80,9 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* implementation delegates to specific handling methods.
*
* @see #handlePrivateKeyRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.DecryptionKeyCallback.PrivateKeyRequest)
+ *com.sun.xml.wss.impl.callback.DecryptionKeyCallback.PrivateKeyRequest)
* @see #handleSymmetricKeyRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.DecryptionKeyCallback.SymmetricKeyRequest)
+ *com.sun.xml.wss.impl.callback.DecryptionKeyCallback.SymmetricKeyRequest)
*/
protected final void handleDecryptionKeyCallback(DecryptionKeyCallback callback)
throws IOException, UnsupportedCallbackException {
@@ -102,13 +102,13 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* handleDecryptionKeyCallback(). Default implementation delegates to specific handling methods.
*
* @see #handlePublicKeyBasedPrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
- * com.sun.xml.wss.impl.callback.SignatureKeyCallback.PublicKeyBasedPrivKeyCertRequest)
+ *com.sun.xml.wss.impl.callback.SignatureKeyCallback.PublicKeyBasedPrivKeyCertRequest)
* @see #handleX509CertificateBasedRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509CertificateBasedRequest)
+ *com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509CertificateBasedRequest)
* @see #handleX509IssuerSerialBasedRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509IssuerSerialBasedRequest)
+ *com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509IssuerSerialBasedRequest)
* @see #handleX509SubjectKeyIdentifierBasedRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509SubjectKeyIdentifierBasedRequest)
+ *com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509SubjectKeyIdentifierBasedRequest)
*/
protected final void handlePrivateKeyRequest(DecryptionKeyCallback callback,
DecryptionKeyCallback.PrivateKeyRequest request)
@@ -180,7 +180,7 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* handleDecryptionKeyCallback(). Default implementation delegates to specific handling methods.
*
* @see #handleAliasSymmetricKeyRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.DecryptionKeyCallback.AliasSymmetricKeyRequest)
+ *com.sun.xml.wss.impl.callback.DecryptionKeyCallback.AliasSymmetricKeyRequest)
*/
protected final void handleSymmetricKeyRequest(DecryptionKeyCallback callback,
DecryptionKeyCallback.SymmetricKeyRequest request)
@@ -215,9 +215,9 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* implementation delegates to specific handling methods.
*
* @see #handleSymmetricKeyRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.EncryptionKeyCallback.SymmetricKeyRequest)
+ *com.sun.xml.wss.impl.callback.EncryptionKeyCallback.SymmetricKeyRequest)
* @see #handleX509CertificateRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.EncryptionKeyCallback.X509CertificateRequest)
+ *com.sun.xml.wss.impl.callback.EncryptionKeyCallback.X509CertificateRequest)
*/
protected final void handleEncryptionKeyCallback(EncryptionKeyCallback callback)
throws IOException, UnsupportedCallbackException {
@@ -239,7 +239,7 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* handleEncryptionKeyCallback(). Default implementation delegates to specific handling methods.
*
* @see #handleAliasSymmetricKeyRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.EncryptionKeyCallback.AliasSymmetricKeyRequest)
+ *com.sun.xml.wss.impl.callback.EncryptionKeyCallback.AliasSymmetricKeyRequest)
*/
protected final void handleSymmetricKeyRequest(EncryptionKeyCallback callback,
EncryptionKeyCallback.SymmetricKeyRequest request)
@@ -265,11 +265,11 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* handleEncryptionKeyCallback(). Default implementation delegates to specific handling methods.
*
* @see #handleAliasX509CertificateRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.EncryptionKeyCallback.AliasX509CertificateRequest)
+ *com.sun.xml.wss.impl.callback.EncryptionKeyCallback.AliasX509CertificateRequest)
* @see #handleDefaultX509CertificateRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.EncryptionKeyCallback.DefaultX509CertificateRequest)
+ *com.sun.xml.wss.impl.callback.EncryptionKeyCallback.DefaultX509CertificateRequest)
* @see #handlePublicKeyBasedRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
- * com.sun.xml.wss.impl.callback.EncryptionKeyCallback.PublicKeyBasedRequest)
+ *com.sun.xml.wss.impl.callback.EncryptionKeyCallback.PublicKeyBasedRequest)
*/
protected final void handleX509CertificateRequest(EncryptionKeyCallback callback,
EncryptionKeyCallback.X509CertificateRequest request)
@@ -331,7 +331,7 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* implementation delegates to specific handling methods.
*
* @see #handlePrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
- * com.sun.xml.wss.impl.callback.SignatureKeyCallback.PrivKeyCertRequest)
+ *com.sun.xml.wss.impl.callback.SignatureKeyCallback.PrivKeyCertRequest)
*/
protected final void handleSignatureKeyCallback(SignatureKeyCallback callback)
throws IOException, UnsupportedCallbackException {
@@ -348,11 +348,11 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* handleSignatureKeyCallback(). Default implementation delegates to specific handling methods.
*
* @see #handleDefaultPrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
- * com.sun.xml.wss.impl.callback.SignatureKeyCallback.DefaultPrivKeyCertRequest)
+ *com.sun.xml.wss.impl.callback.SignatureKeyCallback.DefaultPrivKeyCertRequest)
* @see #handleAliasPrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
- * com.sun.xml.wss.impl.callback.SignatureKeyCallback.AliasPrivKeyCertRequest)
+ *com.sun.xml.wss.impl.callback.SignatureKeyCallback.AliasPrivKeyCertRequest)
* @see #handlePublicKeyBasedPrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
- * com.sun.xml.wss.impl.callback.SignatureKeyCallback.PublicKeyBasedPrivKeyCertRequest)
+ *com.sun.xml.wss.impl.callback.SignatureKeyCallback.PublicKeyBasedPrivKeyCertRequest)
*/
protected final void handlePrivKeyCertRequest(SignatureKeyCallback cb,
SignatureKeyCallback.PrivKeyCertRequest request)
@@ -413,7 +413,7 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* Default implementation delegates to specific handling methods.
*
* @see #handleX509CertificateRequest(com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback,
- * com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509CertificateRequest)
+ *com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509CertificateRequest)
*/
protected final void handleSignatureVerificationKeyCallback(SignatureVerificationKeyCallback callback)
throws UnsupportedCallbackException, IOException {
@@ -432,11 +432,11 @@ public class CryptographyCallbackHandler extends AbstractCallbackHandler {
* handling methods.
*
* @see #handlePublicKeyBasedRequest(com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback,
- * com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.PublicKeyBasedRequest)
+ *com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.PublicKeyBasedRequest)
* @see #handleX509IssuerSerialBasedRequest(com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback,
- * com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509IssuerSerialBasedRequest)
+ *com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509IssuerSerialBasedRequest)
* @see #handleX509SubjectKeyIdentifierBasedRequest(com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback,
- * com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509SubjectKeyIdentifierBasedRequest)
+ *com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509SubjectKeyIdentifierBasedRequest)
*/
protected final void handleX509CertificateRequest(SignatureVerificationKeyCallback callback,
SignatureVerificationKeyCallback.X509CertificateRequest request)
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidator.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidator.java
index 074c6ef4..8e10e245 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidator.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidator.java
@@ -29,6 +29,7 @@ import com.sun.xml.wss.impl.callback.TimestampValidationCallback;
* in the JWSDP samples.
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public class DefaultTimestampValidator implements TimestampValidationCallback.TimestampValidator {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java
index b2241a03..a5b93dad 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java
@@ -18,7 +18,6 @@ package org.springframework.ws.soap.security.xwss.callback;
import java.io.IOException;
import java.security.cert.X509Certificate;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -35,6 +34,7 @@ import com.sun.xml.wss.impl.callback.PasswordValidationCallback;
* throws an UnsupportedCallbackException for others
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public class MockValidationCallbackHandler extends AbstractCallbackHandler {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java
index be2f6a60..1dc70b37 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java
@@ -16,17 +16,17 @@
package org.springframework.ws.soap.security.xwss.callback;
-import com.sun.xml.wss.impl.callback.PasswordValidationCallback;
-import com.sun.xml.wss.impl.callback.TimestampValidationCallback;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.Assert;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.UnsupportedCallbackException;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import com.sun.xml.wss.impl.callback.PasswordValidationCallback;
+import com.sun.xml.wss.impl.callback.TimestampValidationCallback;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
/**
* Simple callback handler that validates passwords agains a in-memory Properties object. Password
@@ -37,14 +37,13 @@ import java.util.Properties;
*
* @author Arjen Poutsma
* @see #setUsers(java.util.Properties)
+ * @since 1.0.0
*/
public class SimplePasswordValidationCallbackHandler extends AbstractCallbackHandler implements InitializingBean {
private Properties users = new Properties();
- /**
- * Sets the users to validate against. Property names are usernames, property values are passwords.
- */
+ /** Sets the users to validate against. Property names are usernames, property values are passwords. */
public void setUsers(Properties users) {
this.users = users;
}
@@ -58,17 +57,20 @@ public class SimplePasswordValidationCallbackHandler extends AbstractCallbackHan
PasswordValidationCallback passwordCallback = (PasswordValidationCallback) callback;
if (passwordCallback.getRequest() instanceof PasswordValidationCallback.PlainTextPasswordRequest) {
passwordCallback.setValidator(new SimplePlainTextPasswordValidator());
- } else if (passwordCallback.getRequest() instanceof PasswordValidationCallback.DigestPasswordRequest) {
+ }
+ else if (passwordCallback.getRequest() instanceof PasswordValidationCallback.DigestPasswordRequest) {
PasswordValidationCallback.DigestPasswordRequest digestPasswordRequest =
(PasswordValidationCallback.DigestPasswordRequest) passwordCallback.getRequest();
String password = users.getProperty(digestPasswordRequest.getUsername());
digestPasswordRequest.setPassword(password);
passwordCallback.setValidator(new PasswordValidationCallback.DigestPasswordValidator());
}
- } else if (callback instanceof TimestampValidationCallback) {
+ }
+ else if (callback instanceof TimestampValidationCallback) {
TimestampValidationCallback timestampCallback = (TimestampValidationCallback) callback;
timestampCallback.setValidator(new DefaultTimestampValidator());
- } else {
+ }
+ else {
throw new UnsupportedCallbackException(callback);
}
}
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java
index 64263a3e..82294c5f 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java
@@ -17,13 +17,11 @@
package org.springframework.ws.soap.security.xwss.callback;
import java.io.IOException;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
import com.sun.xml.wss.impl.callback.PasswordCallback;
import com.sun.xml.wss.impl.callback.UsernameCallback;
-
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
@@ -36,6 +34,7 @@ import org.springframework.util.Assert;
* @author Arjen Poutsma
* @see #setUsername(String)
* @see #setPassword(String)
+ * @since 1.0.0
*/
public class SimpleUsernamePasswordCallbackHandler extends AbstractCallbackHandler implements InitializingBean {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandler.java
index be6ef2fa..d8a75845 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandler.java
@@ -18,7 +18,6 @@ package org.springframework.ws.soap.security.xwss.callback.acegi;
import java.io.IOException;
import java.security.cert.X509Certificate;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -28,7 +27,6 @@ import org.acegisecurity.AuthenticationException;
import org.acegisecurity.AuthenticationManager;
import org.acegisecurity.context.SecurityContextHolder;
import org.acegisecurity.providers.x509.X509AuthenticationToken;
-
import org.springframework.util.Assert;
import org.springframework.ws.soap.security.xwss.callback.AbstractCallbackHandler;
@@ -49,6 +47,7 @@ import org.springframework.ws.soap.security.xwss.callback.AbstractCallbackHandle
* @see org.acegisecurity.providers.x509.X509AuthenticationProvider
* @see org.acegisecurity.ui.x509.X509ProcessingFilter
* @see CertificateValidationCallback
+ * @since 1.0.0
*/
public class AcegiCertificateValidationCallbackHandler extends AbstractCallbackHandler {
@@ -56,9 +55,7 @@ public class AcegiCertificateValidationCallbackHandler extends AbstractCallbackH
private boolean ignoreFailure = false;
- /**
- * Sets the Acegi authentication manager. Required.
- */
+ /** Sets the Acegi authentication manager. Required. */
public void setAuthenticationManager(AuthenticationManager authenticationManager) {
this.authenticationManager = authenticationManager;
}
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java
index 3ef35dc9..7e77d2fa 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java
@@ -49,6 +49,7 @@ import org.springframework.ws.soap.security.xwss.callback.DefaultTimestampValida
* @see PasswordValidationCallback
* @see com.sun.xml.wss.impl.callback.PasswordValidationCallback.DigestPasswordRequest
* @see org.acegisecurity.ui.digestauth.DigestProcessingFilter
+ * @since 1.0.0
*/
public class AcegiDigestPasswordValidationCallbackHandler extends AbstractCallbackHandler {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java
index aa0d41ff..b35b7170 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java
@@ -17,7 +17,6 @@
package org.springframework.ws.soap.security.xwss.callback.acegi;
import java.io.IOException;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -27,7 +26,6 @@ import org.acegisecurity.AuthenticationException;
import org.acegisecurity.AuthenticationManager;
import org.acegisecurity.context.SecurityContextHolder;
import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-
import org.springframework.util.Assert;
import org.springframework.ws.soap.security.xwss.callback.AbstractCallbackHandler;
@@ -47,6 +45,7 @@ import org.springframework.ws.soap.security.xwss.callback.AbstractCallbackHandle
* @see PasswordValidationCallback
* @see com.sun.xml.wss.impl.callback.PasswordValidationCallback.PlainTextPasswordRequest
* @see org.acegisecurity.ui.basicauth.BasicProcessingFilter
+ * @since 1.0.0
*/
public class AcegiPlainTextPasswordValidationCallbackHandler extends AbstractCallbackHandler {
@@ -54,9 +53,7 @@ public class AcegiPlainTextPasswordValidationCallbackHandler extends AbstractCal
private boolean ignoreFailure = false;
- /**
- * Sets the Acegi authentication manager. Required.
- */
+ /** Sets the Acegi authentication manager. Required. */
public void setAuthenticationManager(AuthenticationManager authenticationManager) {
this.authenticationManager = authenticationManager;
}
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/AbstractJaasValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/AbstractJaasValidationCallbackHandler.java
index c6fa32cd..1cbd2747 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/AbstractJaasValidationCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/AbstractJaasValidationCallbackHandler.java
@@ -24,6 +24,7 @@ import org.springframework.ws.soap.security.xwss.callback.AbstractCallbackHandle
* Abstract base class for integrating with JAAS. Provides a login context name property.
*
* @author Arjen Poutsma
+ * @since 1.0.0
*/
public abstract class AbstractJaasValidationCallbackHandler extends AbstractCallbackHandler
implements InitializingBean {
@@ -33,16 +34,12 @@ public abstract class AbstractJaasValidationCallbackHandler extends AbstractCall
protected AbstractJaasValidationCallbackHandler() {
}
- /**
- * Returns the login context name.
- */
+ /** Returns the login context name. */
public String getLoginContextName() {
return loginContextName;
}
- /**
- * Sets the login context name.
- */
+ /** Sets the login context name. */
public void setLoginContextName(String loginContextName) {
this.loginContextName = loginContextName;
}
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java
index 118a200d..edd3f44c 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java
@@ -17,7 +17,6 @@
package org.springframework.ws.soap.security.xwss.callback.jaas;
import java.security.cert.X509Certificate;
-
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -36,6 +35,7 @@ import com.sun.xml.wss.impl.callback.CertificateValidationCallback;
* @author Arjen Poutsma
* @see javax.security.auth.x500.X500Principal
* @see #setLoginContextName(String)
+ * @since 1.0.0
*/
public class JaasCertificateValidationCallbackHandler extends AbstractJaasValidationCallbackHandler {
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java
index 63583042..51d89f83 100644
--- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java
+++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java
@@ -25,7 +25,6 @@ import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import com.sun.xml.wss.impl.callback.PasswordValidationCallback;
-
import org.springframework.ws.soap.security.xwss.callback.AbstractCallbackHandler;
/**
@@ -36,6 +35,7 @@ import org.springframework.ws.soap.security.xwss.callback.AbstractCallbackHandle
*
* @author Arjen Poutsma
* @see #getLoginContextName()
+ * @since 1.0.0
*/
public class JaasPlainTextPasswordValidationCallbackHandler extends AbstractJaasValidationCallbackHandler {