You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/04 19:35:09 UTC
[09/12] cxf git commit: Fix static references to appropraite class
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
index 2eaf438..aa6d0a0 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
@@ -49,6 +49,7 @@ import org.apache.cxf.ws.security.wss4j.AbstractSecurityTest;
import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
import org.apache.cxf.ws.security.wss4j.saml.AbstractSAMLCallbackHandler.Statement;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.principal.SAMLTokenPrincipal;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
@@ -83,11 +84,11 @@ public class SamlTokenTest extends AbstractSecurityTest {
private SecurityContext testSaml1Token(boolean allowUnsignedPrincipal) throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -122,19 +123,19 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml1TokenSignedSenderVouches() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -165,11 +166,11 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2Token() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -199,19 +200,19 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2TokenSignedSenderVouches() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -246,22 +247,22 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml1TokenHOK() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -302,22 +303,22 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2TokenHOK() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -366,24 +367,24 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2TokenWithRoles() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
callbackHandler.setStatement(Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED
+ ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -424,24 +425,24 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml2TokenWithRolesSingleValue() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler(false);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
callbackHandler.setStatement(Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED
+ ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -481,24 +482,24 @@ public class SamlTokenTest extends AbstractSecurityTest {
@Test
public void testSaml1TokenWithRoles() throws Exception {
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
- outProperties.put(WSHandlerConstants.USER, "alice");
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+ outProperties.put(ConfigurationConstants.USER, "alice");
outProperties.put("password", "password");
- outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
+ outProperties.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
callbackHandler.setSignAssertion(true);
callbackHandler.setStatement(Statement.ATTR);
callbackHandler.setConfirmationMethod(SAML1Constants.CONF_BEARER);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED
+ ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a5dd7fa0/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
index 905f96b..4d35b94 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
@@ -46,7 +46,6 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
@@ -64,7 +63,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -101,7 +100,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -137,10 +136,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -181,10 +180,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -219,7 +218,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -257,7 +256,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Service service = createService();
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -294,10 +293,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -339,10 +338,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_UNSIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
validator.setRequireSAML1Assertion(false);
@@ -379,10 +378,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -439,10 +438,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -492,10 +491,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -560,10 +559,10 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(
- WSHandlerConstants.ACTION,
- WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
+ ConfigurationConstants.ACTION,
+ ConfigurationConstants.SAML_TOKEN_SIGNED + " " + ConfigurationConstants.SIGNATURE
);
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");
final Map<QName, Object> customMap = new HashMap<>();
CustomSamlValidator validator = new CustomSamlValidator();
customMap.put(WSConstants.SAML_TOKEN, validator);