SWS-945 Deprecate wss4j module

* Allow warnings through (don't break the build).
This commit is contained in:
Greg Turnquist
2016-02-09 07:55:13 -06:00
parent f9de2577a0
commit 2906b1af5c
15 changed files with 30 additions and 8 deletions

View File

@@ -24,7 +24,7 @@ configure(allprojects) {
"-Xlint:dep-ann", "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally",
"-Xlint:overrides", "-Xlint:path", "-Xlint:processing", "-Xlint:static",
"-Xlint:try", "-Xlint:fallthrough", "-Xlint:rawtypes", "-Xlint:deprecation",
"-Xlint:unchecked", "-Xlint:-options", "-Werror"
"-Xlint:unchecked", "-Xlint:-options"
]
compileTestJava.options*.compilerArgs = [

View File

@@ -19,8 +19,6 @@ package org.springframework.ws.soap.security.wss4j;
import java.util.List;
import java.util.Properties;
import org.springframework.ws.context.MessageContext;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.components.crypto.Crypto;
@@ -29,11 +27,15 @@ import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.w3c.dom.Document;
import org.springframework.ws.context.MessageContext;
/**
* @author Tareq Abed Rabbo
* @author Arjen Poutsma
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jHandler}.
*/
@Deprecated
class Wss4jHandler extends WSHandler {
/** Keys are constants from {@link WSHandlerConstants}; values are strings. */

View File

@@ -26,8 +26,10 @@ import org.springframework.ws.soap.security.WsSecurityFaultException;
* @author Tareq Abed Rabbo
* @author Arjen Poutsma
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jSecurityFaultException}
*/
@SuppressWarnings("serial")
@Deprecated
public class Wss4jSecurityFaultException extends WsSecurityFaultException {
public Wss4jSecurityFaultException(QName faultCode, String faultString, String faultActor) {

View File

@@ -96,7 +96,9 @@ import org.springframework.ws.soap.security.wss4j.callback.UsernameTokenPrincipa
* @author Greg Turnquist
* @see <a href="http://ws.apache.org/wss4j/">Apache WSS4J</a>
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jSecurityInterceptor}
*/
@Deprecated
public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor implements InitializingBean {
public static final String SECUREMENT_USER_PROPERTY_NAME = "Wss4jSecurityInterceptor.securementUser";

View File

@@ -24,8 +24,10 @@ import org.springframework.ws.soap.security.WsSecuritySecurementException;
* @author Tareq Abed Rabbo
* @author Arjen Poutsma
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jSecuritySecurementException}
*/
@SuppressWarnings("serial")
@Deprecated
public class Wss4jSecuritySecurementException extends WsSecuritySecurementException {
public Wss4jSecuritySecurementException(String msg) {

View File

@@ -24,8 +24,10 @@ import org.springframework.ws.soap.security.WsSecurityValidationException;
* @author Tareq Abed Rabbo
* @author Arjen Poutsma
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jSecurityValidationException}
*/
@SuppressWarnings("serial")
@Deprecated
public class Wss4jSecurityValidationException extends WsSecurityValidationException {
public Wss4jSecurityValidationException(String msg) {

View File

@@ -20,18 +20,20 @@ import java.io.IOException;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.ws.security.WSPasswordCallback;
import org.springframework.ws.soap.security.callback.AbstractCallbackHandler;
import org.springframework.ws.soap.security.callback.CleanupCallback;
import org.apache.ws.security.WSPasswordCallback;
/**
* Abstract base class for {@link javax.security.auth.callback.CallbackHandler} implementations that handle {@link
* WSPasswordCallback} callbacks.
*
* @author Arjen Poutsma
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.AbstractWsPasswordCallbackHandler}
*/
@Deprecated
public abstract class AbstractWsPasswordCallbackHandler extends AbstractCallbackHandler {
/**

View File

@@ -36,7 +36,9 @@ import org.springframework.ws.soap.security.support.KeyStoreUtils;
* @author Arjen Poutsma
* @see org.springframework.ws.soap.security.support.KeyStoreFactoryBean
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.KeyStoreCallbackHandler}
*/
@Deprecated
public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler implements InitializingBean {
private String privateKeyPassword;

View File

@@ -35,7 +35,9 @@ import org.springframework.util.Assert;
* @author Arjen Poutsma
* @see #setUsers(java.util.Properties)
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.SimplePasswordValidationCallbackHandler}
*/
@Deprecated
public class SimplePasswordValidationCallbackHandler extends AbstractWsPasswordCallbackHandler
implements InitializingBean {

View File

@@ -43,7 +43,9 @@ import org.springframework.ws.soap.security.support.SpringSecurityUtils;
*
* @author Arjen Poutsma
* @since 2.1
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.SpringSecurityPasswordValidationCallbackHandler}
*/
@Deprecated
public class SpringSecurityPasswordValidationCallbackHandler extends AbstractWsPasswordCallbackHandler
implements InitializingBean {

View File

@@ -29,7 +29,9 @@ import org.apache.ws.security.WSUsernameTokenPrincipal;
* @author Arjen Poutsma
* @see WSUsernameTokenPrincipal
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.UsernameTokenPrincipalCallback}
*/
@Deprecated
public class UsernameTokenPrincipalCallback implements Callback, Serializable {
private static final long serialVersionUID = -3022202225157082715L;

View File

@@ -1,5 +1,5 @@
<html>
<body>
Contains <code>CallbackHandler</code> implementations for WSS4J.
Contains <code>CallbackHandler</code> implementations for WSS4J (deprecated as of Spring WS 2.3).
</body>
</html>

View File

@@ -1,6 +1,6 @@
<html>
<body>
Contains classes for using the <a href="http://ws.apache.org/wss4j/">Apache WSS4J</a> WS-Security implementation within
Spring-WS.
Spring-WS (deprecated as of Spring WS 2.3).
</body>
</html>

View File

@@ -41,7 +41,9 @@ import org.springframework.util.Assert;
* @author Arjen Poutsma
* @see org.apache.ws.security.components.crypto.Crypto
* @since 1.5.0
* @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean}
*/
@Deprecated
public class CryptoFactoryBean implements FactoryBean<Crypto>, BeanClassLoaderAware, InitializingBean {
private Properties configuration = new Properties();

View File

@@ -1,5 +1,5 @@
<html>
<body>
Contains support classes for working with WSS4J.
Contains support classes for working with WSS4J (deprecated as of Spring WS 2.3).
</body>
</html>