ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1706982 - in /webservices/wss4j/trunk: integration/src/test/java/org/apache/wss4j/integration/test/kerberos/ ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/ ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ ws-securi...
Date Tue, 06 Oct 2015 10:49:30 GMT
Author: coheigea
Date: Tue Oct  6 10:49:30 2015
New Revision: 1706982

URL: http://svn.apache.org/viewvc?rev=1706982&view=rev
Log:
More refactoring

Modified:
    webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.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/saml/WSSSAMLKeyInfoProcessor.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java

Modified: webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
(original)
+++ webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
Tue Oct  6 10:49:30 2015
@@ -406,7 +406,7 @@ public class KerberosTest extends Abstra
         KerberosTokenValidator validator = new KerberosTokenValidator();
         validator.setContextName("bob");
         validator.setServiceName("bob@service.ws.apache.org");
-        wssConfig.setValidator(WSSecurityEngine.BINARY_TOKEN, validator);
+        wssConfig.setValidator(WSConstants.BINARY_TOKEN, validator);
         WSSecurityEngine secEngine = new WSSecurityEngine();
         secEngine.setWssConfig(wssConfig);
         
@@ -484,7 +484,7 @@ public class KerberosTest extends Abstra
         KerberosTokenValidator validator = new KerberosTokenValidator();
         validator.setContextName("bob");
         validator.setServiceName("bob@service.ws.apache.org");
-        wssConfig.setValidator(WSSecurityEngine.BINARY_TOKEN, validator);
+        wssConfig.setValidator(WSConstants.BINARY_TOKEN, validator);
         WSSecurityEngine secEngine = new WSSecurityEngine();
         secEngine.setWssConfig(wssConfig);
         
@@ -557,7 +557,7 @@ public class KerberosTest extends Abstra
         KerberosTokenValidator validator = new KerberosTokenValidator();
         validator.setContextName("bob");
         validator.setServiceName("bob@service.ws.apache.org");
-        wssConfig.setValidator(WSSecurityEngine.BINARY_TOKEN, validator);
+        wssConfig.setValidator(WSConstants.BINARY_TOKEN, validator);
         WSSecurityEngine secEngine = new WSSecurityEngine();
         secEngine.setWssConfig(wssConfig);
         
@@ -630,7 +630,7 @@ public class KerberosTest extends Abstra
         KerberosTokenValidator validator = new KerberosTokenValidator();
         validator.setContextName("bob");
         validator.setServiceName("bob@service.ws.apache.org");
-        wssConfig.setValidator(WSSecurityEngine.BINARY_TOKEN, validator);
+        wssConfig.setValidator(WSConstants.BINARY_TOKEN, validator);
         WSSecurityEngine secEngine = new WSSecurityEngine();
         secEngine.setWssConfig(wssConfig);
         
@@ -705,7 +705,7 @@ public class KerberosTest extends Abstra
         KerberosTokenValidator validator = new KerberosTokenValidator();
         validator.setContextName("bob");
         validator.setServiceName("bob@service.ws.apache.org");
-        wssConfig.setValidator(WSSecurityEngine.BINARY_TOKEN, validator);
+        wssConfig.setValidator(WSConstants.BINARY_TOKEN, validator);
         WSSecurityEngine secEngine = new WSSecurityEngine();
         secEngine.setWssConfig(wssConfig);
         
@@ -775,7 +775,7 @@ public class KerberosTest extends Abstra
             KerberosTokenValidator validator = new KerberosTokenValidator();
             validator.setContextName("bob");
             validator.setServiceName("bob@service.ws.apache.org");
-            wssConfig.setValidator(WSSecurityEngine.BINARY_TOKEN, validator);
+            wssConfig.setValidator(WSConstants.BINARY_TOKEN, validator);
             WSSecurityEngine secEngine = new WSSecurityEngine();
             secEngine.setWssConfig(wssConfig);
 
@@ -1041,7 +1041,7 @@ public class KerberosTest extends Abstra
             KerberosTokenValidator validator = new KerberosTokenValidator();
             validator.setContextName("bob");
             validator.setServiceName("bob@service.ws.apache.org");
-            wssConfig.setValidator(WSSecurityEngine.BINARY_TOKEN, validator);
+            wssConfig.setValidator(WSConstants.BINARY_TOKEN, validator);
             WSSecurityEngine secEngine = new WSSecurityEngine();
             secEngine.setWssConfig(wssConfig);
 

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
Tue Oct  6 10:49:30 2015
@@ -137,63 +137,63 @@ public class WSSConfig {
         final Map<QName, Class<?>> tmp = new HashMap<>();
         try {
             tmp.put(
-                WSSecurityEngine.SAML_TOKEN,
+                WSConstants.SAML_TOKEN,
                 org.apache.wss4j.dom.processor.SAMLTokenProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.SAML2_TOKEN,
+                WSConstants.SAML2_TOKEN,
                 org.apache.wss4j.dom.processor.SAMLTokenProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.ENCRYPTED_ASSERTION,
+                WSConstants.ENCRYPTED_ASSERTION,
                 org.apache.wss4j.dom.processor.EncryptedAssertionProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.ENCRYPTED_KEY,
+                WSConstants.ENCRYPTED_KEY,
                 org.apache.wss4j.dom.processor.EncryptedKeyProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.SIGNATURE,
+                WSConstants.SIGNATURE,
                 org.apache.wss4j.dom.processor.SignatureProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.TIMESTAMP,
+                WSConstants.TIMESTAMP,
                 org.apache.wss4j.dom.processor.TimestampProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.USERNAME_TOKEN,
+                WSConstants.USERNAME_TOKEN,
                 org.apache.wss4j.dom.processor.UsernameTokenProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.REFERENCE_LIST,
+                WSConstants.REFERENCE_LIST,
                 org.apache.wss4j.dom.processor.ReferenceListProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.SIGNATURE_CONFIRMATION,
+                WSConstants.SIGNATURE_CONFIRMATION,
                 org.apache.wss4j.dom.processor.SignatureConfirmationProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.DERIVED_KEY_TOKEN_05_02,
+                WSConstants.DERIVED_KEY_TOKEN_05_02,
                 org.apache.wss4j.dom.processor.DerivedKeyTokenProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.DERIVED_KEY_TOKEN_05_12,
-                tmp.get(WSSecurityEngine.DERIVED_KEY_TOKEN_05_02)
+                WSConstants.DERIVED_KEY_TOKEN_05_12,
+                tmp.get(WSConstants.DERIVED_KEY_TOKEN_05_02)
             );
             tmp.put(
-                WSSecurityEngine.SECURITY_CONTEXT_TOKEN_05_02,
+                WSConstants.SECURITY_CONTEXT_TOKEN_05_02,
                 org.apache.wss4j.dom.processor.SecurityContextTokenProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.SECURITY_CONTEXT_TOKEN_05_12,
-                tmp.get(WSSecurityEngine.SECURITY_CONTEXT_TOKEN_05_02)
+                WSConstants.SECURITY_CONTEXT_TOKEN_05_12,
+                tmp.get(WSConstants.SECURITY_CONTEXT_TOKEN_05_02)
             );
             tmp.put(
-                WSSecurityEngine.BINARY_TOKEN,
+                WSConstants.BINARY_TOKEN,
                 org.apache.wss4j.dom.processor.BinarySecurityTokenProcessor.class
             );
             tmp.put(
-                WSSecurityEngine.ENCRYPTED_DATA,
+                WSConstants.ENCRYPTED_DATA,
                 org.apache.wss4j.dom.processor.EncryptedDataProcessor.class
             );
         } catch (final Exception ex) {
@@ -212,23 +212,23 @@ public class WSSConfig {
         final Map<QName, Class<?>> tmp = new HashMap<>();
         try {
             tmp.put(
-                WSSecurityEngine.SAML_TOKEN,
+                WSConstants.SAML_TOKEN,
                 org.apache.wss4j.dom.validate.SamlAssertionValidator.class
             );
             tmp.put(
-                WSSecurityEngine.SAML2_TOKEN,
+                WSConstants.SAML2_TOKEN,
                 org.apache.wss4j.dom.validate.SamlAssertionValidator.class
             );
             tmp.put(
-                WSSecurityEngine.SIGNATURE,
+                WSConstants.SIGNATURE,
                 org.apache.wss4j.dom.validate.SignatureTrustValidator.class
             );
             tmp.put(
-                WSSecurityEngine.TIMESTAMP,
+                WSConstants.TIMESTAMP,
                 org.apache.wss4j.dom.validate.TimestampValidator.class
             );
             tmp.put(
-                WSSecurityEngine.USERNAME_TOKEN,
+                WSConstants.USERNAME_TOKEN,
                 org.apache.wss4j.dom.validate.UsernameTokenValidator.class
             );
         } catch (final Exception ex) {

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
Tue Oct  6 10:49:30 2015
@@ -72,7 +72,6 @@ import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
 import org.apache.wss4j.dom.WSDocInfo;
 import org.apache.wss4j.dom.callback.CallbackLookup;
-import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.message.token.Timestamp;
@@ -132,7 +131,7 @@ public class SignatureProcessor implemen
         REFERENCE_TYPE referenceType = null;
 
         Credential credential = new Credential();
-        Validator validator = data.getValidator(WSSecurityEngine.SIGNATURE);
+        Validator validator = data.getValidator(WSConstants.SIGNATURE);
         if (keyInfoElement == null) {
             certs = getDefaultCerts(data.getSigVerCrypto());
             principal = certs[0].getSubjectX500Principal();

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=1706982&r1=1706981&r2=1706982&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
Tue Oct  6 10:49:30 2015
@@ -24,7 +24,6 @@ import java.util.List;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDocInfo;
-import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.message.token.Timestamp;
@@ -58,7 +57,7 @@ public class TimestampProcessor implemen
             result.put(WSSecurityEngineResult.TAG_ID, tokenId);
         }
         
-        Validator validator = data.getValidator(WSSecurityEngine.TIMESTAMP);
+        Validator validator = data.getValidator(WSConstants.TIMESTAMP);
         if (validator != null) {
             validator.validate(credential, data);
             

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=1706982&r1=1706981&r2=1706982&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
Tue Oct  6 10:49:30 2015
@@ -30,7 +30,6 @@ import org.apache.wss4j.common.cache.Rep
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDocInfo;
-import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.message.token.UsernameToken;
@@ -63,7 +62,7 @@ public class UsernameTokenProcessor impl
             }
         }
         
-        Validator validator = data.getValidator(WSSecurityEngine.USERNAME_TOKEN);
+        Validator validator = data.getValidator(WSConstants.USERNAME_TOKEN);
         Credential credential = handleUsernameToken(elem, validator, data);
         UsernameToken token = credential.getUsernametoken();
         

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSSAMLKeyInfoProcessor.java
Tue Oct  6 10:49:30 2015
@@ -34,8 +34,8 @@ import org.apache.wss4j.common.principal
 import org.apache.wss4j.common.saml.SAMLKeyInfo;
 import org.apache.wss4j.common.saml.SAMLKeyInfoProcessor;
 import org.apache.wss4j.common.token.SecurityTokenReference;
+import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDocInfo;
-import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.processor.EncryptedKeyProcessor;
@@ -79,7 +79,7 @@ public class WSSSAMLKeyInfoProcessor imp
         while (node != null) {
             if (Node.ELEMENT_NODE == node.getNodeType()) {
                 QName el = new QName(node.getNamespaceURI(), node.getLocalName());
-                if (el.equals(WSSecurityEngine.ENCRYPTED_KEY)) {
+                if (el.equals(WSConstants.ENCRYPTED_KEY)) {
                     EncryptedKeyProcessor proc = new EncryptedKeyProcessor();
                     List<WSSecurityEngineResult> result =
                         proc.handleToken((Element)node, data, docInfo, data.getSamlAlgorithmSuite());

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/EncryptedKeySTRParser.java
Tue Oct  6 10:49:30 2015
@@ -35,7 +35,6 @@ import org.apache.wss4j.common.token.X50
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDocInfo;
-import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
@@ -167,7 +166,7 @@ public class EncryptedKeySTRParser imple
 
             // at this point ... check token type: Binary
             QName el = new QName(bstElement.getNamespaceURI(), bstElement.getLocalName());
-            if (el.equals(WSSecurityEngine.BINARY_TOKEN)) {
+            if (el.equals(WSConstants.BINARY_TOKEN)) {
                 X509Security token = new X509Security(bstElement, data.getBSPEnforcer());
                 STRParserUtil.checkBinarySecurityBSPCompliance(secRef, token, data.getBSPEnforcer());
                 parserResult.setCerts(new X509Certificate[]{token.getX509Certificate(crypto)});

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
Tue Oct  6 10:49:30 2015
@@ -38,7 +38,6 @@ import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDocInfo;
 import org.apache.wss4j.dom.callback.CallbackLookup;
 import org.apache.wss4j.dom.callback.DOMCallbackLookup;
-import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.message.token.KerberosSecurity;
@@ -110,7 +109,7 @@ public final class STRParserUtil {
                     WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"
                 );
             }
-            Processor proc = request.getWssConfig().getProcessor(WSSecurityEngine.SAML_TOKEN);
+            Processor proc = request.getWssConfig().getProcessor(WSConstants.SAML_TOKEN);
             List<WSSecurityEngineResult> samlResult =
                 proc.handleToken(token, request, wsDocInfo);
             return 

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SecurityTokenRefSTRParser.java
Tue Oct  6 10:49:30 2015
@@ -36,7 +36,6 @@ import org.apache.wss4j.common.util.KeyU
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDocInfo;
-import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.message.token.DerivedKeyToken;
@@ -185,8 +184,8 @@ public class SecurityTokenRefSTRParser i
                     STRParserUtil.getTokenElement(strElement.getOwnerDocument(), wsDocInfo,
data.getCallbackHandler(),
                                                   uri, reference.getValueType());
                 QName el = new QName(token.getNamespaceURI(), token.getLocalName());
-                if (el.equals(WSSecurityEngine.BINARY_TOKEN)) {
-                    Processor proc = data.getWssConfig().getProcessor(WSSecurityEngine.BINARY_TOKEN);
+                if (el.equals(WSConstants.BINARY_TOKEN)) {
+                    Processor proc = data.getWssConfig().getProcessor(WSConstants.BINARY_TOKEN);
                     List<WSSecurityEngineResult> bstResult =
                             proc.handleToken(token, data, wsDocInfo);
                     BinarySecurity bstToken = 

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/SignatureSTRParser.java
Tue Oct  6 10:49:30 2015
@@ -44,7 +44,6 @@ import org.apache.wss4j.common.util.KeyU
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDocInfo;
-import org.apache.wss4j.dom.engine.WSSecurityEngine;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.message.token.DerivedKeyToken;
@@ -361,8 +360,8 @@ public class SignatureSTRParser implemen
                     STRParserUtil.getTokenElement(strElement.getOwnerDocument(), wsDocInfo,
data.getCallbackHandler(),
                                                   uri, reference.getValueType());
                 QName el = new QName(token.getNamespaceURI(), token.getLocalName());
-                if (el.equals(WSSecurityEngine.BINARY_TOKEN)) {
-                    Processor proc = data.getWssConfig().getProcessor(WSSecurityEngine.BINARY_TOKEN);
+                if (el.equals(WSConstants.BINARY_TOKEN)) {
+                    Processor proc = data.getWssConfig().getProcessor(WSConstants.BINARY_TOKEN);
                     List<WSSecurityEngineResult> bstResult =
                         proc.handleToken(token, parameters.getData(), parameters.getWsDocInfo());
                     BinarySecurity bstToken = 
@@ -375,9 +374,8 @@ public class SignatureSTRParser implemen
                         (X509Certificate[])bstResult.get(0).get(WSSecurityEngineResult.TAG_X509_CERTIFICATES));
                     secretKey = (byte[])bstResult.get(0).get(WSSecurityEngineResult.TAG_SECRET);
                     principal = (Principal)bstResult.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
-                } else if (el.equals(WSSecurityEngine.SAML_TOKEN) 
-                    || el.equals(WSSecurityEngine.SAML2_TOKEN)) {
-                    Processor proc = data.getWssConfig().getProcessor(WSSecurityEngine.SAML_TOKEN);
+                } else if (el.equals(WSConstants.SAML_TOKEN) || el.equals(WSConstants.SAML2_TOKEN))
{
+                    Processor proc = data.getWssConfig().getProcessor(WSConstants.SAML_TOKEN);
                     //
                     // Just check to see whether the token was processed or not
                     //
@@ -410,9 +408,9 @@ public class SignatureSTRParser implemen
                     }
                     secretKey = keyInfo.getSecret();
                     principal = createPrincipalFromSAML(samlAssertion, parserResult);
-                } else if (el.equals(WSSecurityEngine.ENCRYPTED_KEY)) {
+                } else if (el.equals(WSConstants.ENCRYPTED_KEY)) {
                     STRParserUtil.checkEncryptedKeyBSPCompliance(secRef, data.getBSPEnforcer());
-                    Processor proc = data.getWssConfig().getProcessor(WSSecurityEngine.ENCRYPTED_KEY);
+                    Processor proc = data.getWssConfig().getProcessor(WSConstants.ENCRYPTED_KEY);
                     List<WSSecurityEngineResult> encrResult =
                         proc.handleToken(token, data, wsDocInfo);
                     secretKey = 

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
Tue Oct  6 10:49:30 2015
@@ -88,7 +88,7 @@ public class CustomActionProcessorTest e
         WSSConfig cfg = WSSConfig.getNewInstance();
         String p = "org.apache.wss4j.dom.common.CustomProcessor";
         cfg.setProcessor(
-            WSSecurityEngine.SIGNATURE,
+            WSConstants.SIGNATURE,
             org.apache.wss4j.dom.common.CustomProcessor.class
         );
         final WSSecurityEngine engine = new WSSecurityEngine();
@@ -134,10 +134,8 @@ public class CustomActionProcessorTest e
         // Check to make sure we can install/replace and use our own processor
         //
         WSSConfig cfg = WSSConfig.getNewInstance();
-        cfg.setProcessor(
-            WSSecurityEngine.SIGNATURE,
-            CustomProcessor.class
-        );
+        cfg.setProcessor(WSConstants.SIGNATURE, CustomProcessor.class);
+        
         final WSSecurityEngine engine = new WSSecurityEngine();
         engine.setWssConfig(cfg);
         final WSHandlerResult results = 

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
Tue Oct  6 10:49:30 2015
@@ -466,8 +466,8 @@ public class ReplayTest extends org.juni
         WSSConfig wssConfig = WSSConfig.getNewInstance();
         SamlAssertionValidator assertionValidator = new SamlAssertionValidator();
         assertionValidator.setRequireBearerSignature(false);
-        wssConfig.setValidator(WSSecurityEngine.SAML_TOKEN, assertionValidator);
-        wssConfig.setValidator(WSSecurityEngine.SAML2_TOKEN, assertionValidator);
+        wssConfig.setValidator(WSConstants.SAML_TOKEN, assertionValidator);
+        wssConfig.setValidator(WSConstants.SAML2_TOKEN, assertionValidator);
         
         RequestData data = new RequestData();
         data.setWssConfig(wssConfig);
@@ -519,8 +519,8 @@ public class ReplayTest extends org.juni
         WSSConfig wssConfig = WSSConfig.getNewInstance();
         SamlAssertionValidator assertionValidator = new SamlAssertionValidator();
         assertionValidator.setRequireBearerSignature(false);
-        wssConfig.setValidator(WSSecurityEngine.SAML_TOKEN, assertionValidator);
-        wssConfig.setValidator(WSSecurityEngine.SAML2_TOKEN, assertionValidator);
+        wssConfig.setValidator(WSConstants.SAML_TOKEN, assertionValidator);
+        wssConfig.setValidator(WSConstants.SAML2_TOKEN, assertionValidator);
         
         RequestData data = new RequestData();
         data.setWssConfig(wssConfig);

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
Tue Oct  6 10:49:30 2015
@@ -667,7 +667,7 @@ public class TimestampTest extends org.j
         // is rejecting the Timestamp
         //
         WSSConfig wssConfig = WSSConfig.getNewInstance();
-        wssConfig.setValidator(WSSecurityEngine.TIMESTAMP, new NoOpValidator());
+        wssConfig.setValidator(WSConstants.TIMESTAMP, new NoOpValidator());
         try {
             verify(doc, wssConfig, new ArrayList<BSPRule>());
             fail("The timestamp validation should have failed");
@@ -724,7 +724,7 @@ public class TimestampTest extends org.j
         
         // Now it should pass...
         WSSConfig wssConfig = WSSConfig.getNewInstance();
-        wssConfig.setValidator(WSSecurityEngine.TIMESTAMP, new NoOpValidator());
+        wssConfig.setValidator(WSConstants.TIMESTAMP, new NoOpValidator());
         verify(doc, wssConfig, Collections.singletonList(BSPRule.R3225));
     }
     

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
Tue Oct  6 10:49:30 2015
@@ -236,7 +236,7 @@ public class BSTKerberosTest extends org
         
         WSSecurityEngine customEngine = new WSSecurityEngine();
         WSSConfig wssConfig = WSSConfig.getNewInstance();
-        wssConfig.setValidator(WSSecurityEngine.BINARY_TOKEN, new KerberosValidator());
+        wssConfig.setValidator(WSConstants.BINARY_TOKEN, new KerberosValidator());
         customEngine.setWssConfig(wssConfig);
         customEngine.processSecurityHeader(doc, null, callbackHandler, crypto);
         

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
Tue Oct  6 10:49:30 2015
@@ -121,7 +121,7 @@ public class PrincipalTest extends org.j
             LOG.debug(outputString);
         }
         WSHandlerResult results = 
-            verify(signedDoc, new DummyValidator(), WSSecurityEngine.USERNAME_TOKEN, null);
+            verify(signedDoc, new DummyValidator(), WSConstants.USERNAME_TOKEN, null);
         
         Principal principal = 
             (Principal)results.getResults().get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
@@ -245,7 +245,7 @@ public class PrincipalTest extends org.j
         }
         
         WSHandlerResult results = 
-            verify(unsignedDoc, new DummyValidator(), WSSecurityEngine.SAML_TOKEN, null);
+            verify(unsignedDoc, new DummyValidator(), WSConstants.SAML_TOKEN, null);
         
         List<WSSecurityEngineResult> samlResults = 
             results.getActionResults().get(WSConstants.ST_UNSIGNED);
@@ -288,7 +288,7 @@ public class PrincipalTest extends org.j
         }
         
         WSHandlerResult results = 
-            verify(doc, new DummyValidator(), WSSecurityEngine.BINARY_TOKEN, crypto);
+            verify(doc, new DummyValidator(), WSConstants.BINARY_TOKEN, crypto);
         
         List<WSSecurityEngineResult> bstResults = 
             results.getActionResults().get(WSConstants.BST);

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
Tue Oct  6 10:49:30 2015
@@ -26,6 +26,7 @@ import org.apache.wss4j.common.saml.SAML
 import org.apache.wss4j.common.saml.SAMLUtil;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.XMLUtils;
+import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.common.CustomSamlAssertionValidator;
 import org.apache.wss4j.dom.common.SAML1CallbackHandler;
 import org.apache.wss4j.dom.common.SAML2CallbackHandler;
@@ -55,8 +56,8 @@ public class SamlAuthnTest extends org.j
 
     public SamlAuthnTest() {
         WSSConfig config = WSSConfig.getNewInstance();
-        config.setValidator(WSSecurityEngine.SAML_TOKEN, new CustomSamlAssertionValidator());
-        config.setValidator(WSSecurityEngine.SAML2_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML2_TOKEN, new CustomSamlAssertionValidator());
         secEngine.setWssConfig(config);
     }
     

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
Tue Oct  6 10:49:30 2015
@@ -36,6 +36,7 @@ import org.apache.wss4j.common.saml.bean
 import org.apache.wss4j.common.saml.bean.ProxyRestrictionBean;
 import org.apache.wss4j.common.saml.builder.SAML2Constants;
 import org.apache.wss4j.common.util.XMLUtils;
+import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.common.CustomSamlAssertionValidator;
 import org.apache.wss4j.dom.common.SAML1CallbackHandler;
 import org.apache.wss4j.dom.common.SAML2CallbackHandler;
@@ -65,8 +66,8 @@ public class SamlConditionsTest extends
 
     public SamlConditionsTest() {
         WSSConfig config = WSSConfig.getNewInstance();
-        config.setValidator(WSSecurityEngine.SAML_TOKEN, new CustomSamlAssertionValidator());
-        config.setValidator(WSSecurityEngine.SAML2_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML2_TOKEN, new CustomSamlAssertionValidator());
         secEngine.setWssConfig(config);
     }
     

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
Tue Oct  6 10:49:30 2015
@@ -61,8 +61,8 @@ public class SamlTokenActionTest extends
     public SamlTokenActionTest() throws WSSecurityException {
         WSSConfig config = WSSConfig.getNewInstance();
         crypto = CryptoFactory.getInstance("wss40.properties");
-        config.setValidator(WSSecurityEngine.SAML_TOKEN, new CustomSamlAssertionValidator());
-        config.setValidator(WSSecurityEngine.SAML2_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML2_TOKEN, new CustomSamlAssertionValidator());
         secEngine.setWssConfig(config);
     }
     

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
Tue Oct  6 10:49:30 2015
@@ -295,8 +295,8 @@ public class SamlTokenCustomSignatureTes
         
         WSSecurityEngine secEngine = new WSSecurityEngine();
         WSSConfig config = secEngine.getWssConfig();
-        config.setValidator(WSSecurityEngine.SAML_TOKEN, validator);
-        config.setValidator(WSSecurityEngine.SAML2_TOKEN, validator);
+        config.setValidator(WSConstants.SAML_TOKEN, validator);
+        config.setValidator(WSConstants.SAML2_TOKEN, validator);
         
         WSHandlerResult results = 
             secEngine.processSecurityHeader(

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
Tue Oct  6 10:49:30 2015
@@ -97,8 +97,8 @@ public class SamlTokenTest extends org.j
 
     public SamlTokenTest() {
         WSSConfig config = WSSConfig.getNewInstance();
-        config.setValidator(WSSecurityEngine.SAML_TOKEN, new CustomSamlAssertionValidator());
-        config.setValidator(WSSecurityEngine.SAML2_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML2_TOKEN, new CustomSamlAssertionValidator());
         secEngine.setWssConfig(config);
     }
     
@@ -827,8 +827,8 @@ public class SamlTokenTest extends org.j
         WSSecurityEngine newEngine = new WSSecurityEngine();
         
         WSSConfig config = WSSConfig.getNewInstance();
-        config.setValidator(WSSecurityEngine.SAML_TOKEN, new CustomSamlAssertionValidator());
-        config.setValidator(WSSecurityEngine.SAML2_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML_TOKEN, new CustomSamlAssertionValidator());
+        config.setValidator(WSConstants.SAML2_TOKEN, new CustomSamlAssertionValidator());
         newEngine.setWssConfig(config);
         
         WSHandlerResult results = newEngine.processSecurityHeader(doc, data);
@@ -917,8 +917,8 @@ public class SamlTokenTest extends org.j
         WSSConfig config = WSSConfig.getNewInstance();
         SamlAssertionValidator assertionValidator = new SamlAssertionValidator();
         assertionValidator.setRequiredSubjectConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES);
-        config.setValidator(WSSecurityEngine.SAML_TOKEN, assertionValidator);
-        config.setValidator(WSSecurityEngine.SAML2_TOKEN, assertionValidator);
+        config.setValidator(WSConstants.SAML_TOKEN, assertionValidator);
+        config.setValidator(WSConstants.SAML2_TOKEN, assertionValidator);
         
         WSSecurityEngine newEngine = new WSSecurityEngine();
         newEngine.setWssConfig(config);
@@ -980,8 +980,8 @@ public class SamlTokenTest extends org.j
         WSSConfig config = WSSConfig.getNewInstance();
         SamlAssertionValidator assertionValidator = new SamlAssertionValidator();
         assertionValidator.setRequireStandardSubjectConfirmationMethod(false);
-        config.setValidator(WSSecurityEngine.SAML_TOKEN, assertionValidator);
-        config.setValidator(WSSecurityEngine.SAML2_TOKEN, assertionValidator);
+        config.setValidator(WSConstants.SAML_TOKEN, assertionValidator);
+        config.setValidator(WSConstants.SAML2_TOKEN, assertionValidator);
         
         newEngine.setWssConfig(config);
         
@@ -1022,8 +1022,8 @@ public class SamlTokenTest extends org.j
         WSSConfig config = WSSConfig.getNewInstance();
         SamlAssertionValidator assertionValidator = new SamlAssertionValidator();
         assertionValidator.setRequireBearerSignature(false);
-        config.setValidator(WSSecurityEngine.SAML_TOKEN, assertionValidator);
-        config.setValidator(WSSecurityEngine.SAML2_TOKEN, assertionValidator);
+        config.setValidator(WSConstants.SAML_TOKEN, assertionValidator);
+        config.setValidator(WSConstants.SAML2_TOKEN, assertionValidator);
         
         newEngine.setWssConfig(config);
         

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java?rev=1706982&r1=1706981&r2=1706982&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
(original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
Tue Oct  6 10:49:30 2015
@@ -97,7 +97,7 @@ public class ValidatorTest extends org.j
         }
 
         // Now switch out the default Timestamp validator
-        wssConfig.setValidator(WSSecurityEngine.TIMESTAMP, NoOpValidator.class);
+        wssConfig.setValidator(WSConstants.TIMESTAMP, NoOpValidator.class);
         verify(createdDoc, wssConfig, null, null);
     }
     
@@ -139,7 +139,7 @@ public class ValidatorTest extends org.j
         
         // Now switch out the default signature validator
         WSSConfig config = WSSConfig.getNewInstance();
-        config.setValidator(WSSecurityEngine.SIGNATURE, NoOpValidator.class);
+        config.setValidator(WSConstants.SIGNATURE, NoOpValidator.class);
         newEngine.setWssConfig(config);
         data.setWssConfig(config);
         newEngine.processSecurityHeader(signedDoc, data);
@@ -176,7 +176,7 @@ public class ValidatorTest extends org.j
         }
         
         // Now switch out the default UsernameToken validator
-        wssConfig.setValidator(WSSecurityEngine.USERNAME_TOKEN, NoOpValidator.class);
+        wssConfig.setValidator(WSConstants.USERNAME_TOKEN, NoOpValidator.class);
         verify(signedDoc, wssConfig, new UsernamePasswordCallbackHandler(), null);
     }
     
@@ -208,7 +208,7 @@ public class ValidatorTest extends org.j
         }
         
         WSSConfig config = WSSConfig.getNewInstance();
-        config.setValidator(WSSecurityEngine.BINARY_TOKEN, new BSTValidator());
+        config.setValidator(WSConstants.BINARY_TOKEN, new BSTValidator());
         WSSecurityEngine secEngine = new WSSecurityEngine();
         secEngine.setWssConfig(config);
         WSHandlerResult results = 
@@ -260,7 +260,7 @@ public class ValidatorTest extends org.j
             // expected
         }
         
-        config.setValidator(WSSecurityEngine.BINARY_TOKEN, new BSTValidator());
+        config.setValidator(WSConstants.BINARY_TOKEN, new BSTValidator());
         WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, null, crypto);
         




Mime
View raw message