Repository: cxf
Updated Branches:
  refs/heads/master c6ec59987 -> ff2a2793e


http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
----------------------------------------------------------------------
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index 0d5af95..ed4069c 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -60,13 +60,13 @@ import org.apache.cxf.sts.token.provider.TokenProvider;
 import org.apache.cxf.sts.token.provider.TokenProviderParameters;
 import org.apache.cxf.sts.token.provider.TokenProviderResponse;
 import org.apache.cxf.ws.security.tokenstore.TokenStore;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 import org.apache.wss4j.common.util.DateUtil;
-import org.apache.wss4j.dom.WSConstants;
 import org.junit.BeforeClass;
 
 
@@ -95,7 +95,7 @@ public class SAMLTokenValidatorTest extends org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
         CallbackHandler callbackHandler = new PasswordCallbackHandler();
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
+            createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
 
@@ -128,7 +128,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
         CallbackHandler callbackHandler = new PasswordCallbackHandler();
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
+            createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
 
@@ -165,7 +165,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         CallbackHandler callbackHandler = new PasswordCallbackHandler();
         Element samlToken =
             createSAMLAssertionWithClaimsProvider(
-                WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", 
callbackHandler
+                WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", 
callbackHandler
             );
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
@@ -196,7 +196,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEveCryptoProperties());
         CallbackHandler callbackHandler = new EveCallbackHandler();
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"eve", callbackHandler);
+            createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"eve", callbackHandler);
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
 
@@ -229,7 +229,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEveCryptoProperties());
         CallbackHandler callbackHandler = new EveCallbackHandler();
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"eve", callbackHandler);
+            createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"eve", callbackHandler);
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
 
@@ -263,7 +263,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
         CallbackHandler callbackHandler = new PasswordCallbackHandler();
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler, 50);
+            createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler, 50);
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
 
@@ -293,7 +293,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
         CallbackHandler callbackHandler = new PasswordCallbackHandler();
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler, 50);
+            createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler, 50);
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
 
@@ -325,7 +325,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
         CallbackHandler callbackHandler = new PasswordCallbackHandler();
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
+            createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
 
@@ -364,7 +364,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
         CallbackHandler callbackHandler = new PasswordCallbackHandler();
         Element samlToken =
-            createSAMLAssertionWithRoles(WSConstants.WSS_SAML2_TOKEN_TYPE, 
crypto, "mystskey",
+            createSAMLAssertionWithRoles(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 
crypto, "mystskey",
                                          callbackHandler, "manager");
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
@@ -401,7 +401,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
         CallbackHandler callbackHandler = new PasswordCallbackHandler();
         Element samlToken =
-            createSAMLAssertionWithRoles(WSConstants.WSS_SAML2_TOKEN_TYPE, 
crypto, "mystskey",
+            createSAMLAssertionWithRoles(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 
crypto, "mystskey",
                                          callbackHandler, "employee");
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
@@ -438,7 +438,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
         Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
         CallbackHandler callbackHandler = new PasswordCallbackHandler();
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
+            createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey", callbackHandler);
         Document doc = samlToken.getOwnerDocument();
         samlToken = (Element)doc.appendChild(samlToken);
 
@@ -456,7 +456,7 @@ public class SAMLTokenValidatorTest extends 
org.junit.Assert {
 
         // Replace "alice" with "bob".
         Element nameID =
-            (Element)samlToken.getElementsByTagNameNS(WSConstants.SAML2_NS, 
"NameID").item(0);
+            (Element)samlToken.getElementsByTagNameNS(WSS4JConstants.SAML2_NS, 
"NameID").item(0);
         nameID.setTextContent("bob");
 
         // Now validate again

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
----------------------------------------------------------------------
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
index 83cfb39..9cca59f 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/UsernameTokenValidatorTest.java
@@ -41,11 +41,11 @@ import 
org.apache.cxf.ws.security.sts.provider.model.secext.AttributedString;
 import org.apache.cxf.ws.security.sts.provider.model.secext.EncodedString;
 import org.apache.cxf.ws.security.sts.provider.model.secext.PasswordString;
 import org.apache.cxf.ws.security.sts.provider.model.secext.UsernameTokenType;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
-import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.message.token.UsernameToken;
 
 
@@ -89,7 +89,7 @@ public class UsernameTokenValidatorTest extends 
org.junit.Assert {
         // Add a password
         PasswordString password = new PasswordString();
         password.setValue("clarinet");
-        password.setType(WSConstants.PASSWORD_TEXT);
+        password.setType(WSS4JConstants.PASSWORD_TEXT);
         JAXBElement<PasswordString> passwordType =
             new JAXBElement<PasswordString>(
                 QNameConstants.PASSWORD, PasswordString.class, password
@@ -127,7 +127,7 @@ public class UsernameTokenValidatorTest extends 
org.junit.Assert {
         // Add a password
         PasswordString password = new PasswordString();
         password.setValue("clarinet");
-        password.setType(WSConstants.PASSWORD_TEXT);
+        password.setType(WSS4JConstants.PASSWORD_TEXT);
         JAXBElement<PasswordString> passwordType =
             new JAXBElement<PasswordString>(
                 QNameConstants.PASSWORD, PasswordString.class, password
@@ -177,7 +177,7 @@ public class UsernameTokenValidatorTest extends 
org.junit.Assert {
 
         // Create a WSS4J UsernameToken
         Document doc = DOMUtils.createDocument();
-        UsernameToken ut = new UsernameToken(true, doc, 
WSConstants.PASSWORD_DIGEST);
+        UsernameToken ut = new UsernameToken(true, doc, 
WSS4JConstants.PASSWORD_DIGEST);
         ut.setName("alice");
         ut.setPassword("clarinet");
         ut.addNonce(doc);
@@ -186,7 +186,7 @@ public class UsernameTokenValidatorTest extends 
org.junit.Assert {
         // Add a password
         PasswordString password = new PasswordString();
         password.setValue(ut.getPassword());
-        password.setType(WSConstants.PASSWORD_DIGEST);
+        password.setType(WSS4JConstants.PASSWORD_DIGEST);
         JAXBElement<PasswordString> passwordType =
             new JAXBElement<PasswordString>(
                 QNameConstants.PASSWORD, PasswordString.class, password
@@ -196,7 +196,7 @@ public class UsernameTokenValidatorTest extends 
org.junit.Assert {
         // Add a nonce
         EncodedString nonce = new EncodedString();
         nonce.setValue(ut.getNonce());
-        nonce.setEncodingType(WSConstants.SOAPMESSAGE_NS + "#Base64Binary");
+        nonce.setEncodingType(WSS4JConstants.SOAPMESSAGE_NS + "#Base64Binary");
         JAXBElement<EncodedString> nonceType =
             new JAXBElement<EncodedString>(
                 QNameConstants.NONCE, EncodedString.class, nonce
@@ -205,8 +205,8 @@ public class UsernameTokenValidatorTest extends 
org.junit.Assert {
 
         // Add Created value
         String created = ut.getCreated();
-        Element createdElement = doc.createElementNS(WSConstants.WSU_NS, 
"Created");
-        createdElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns", 
WSConstants.WSU_NS);
+        Element createdElement = doc.createElementNS(WSS4JConstants.WSU_NS, 
"Created");
+        createdElement.setAttributeNS(WSS4JConstants.XMLNS_NS, "xmlns", 
WSS4JConstants.WSU_NS);
         createdElement.setTextContent(created);
         usernameToken.getAny().add(createdElement);
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
----------------------------------------------------------------------
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
index e8d43d1..782c44e 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/X509TokenValidatorTest.java
@@ -36,12 +36,12 @@ import org.apache.cxf.sts.request.ReceivedToken;
 import org.apache.cxf.sts.request.ReceivedToken.STATE;
 import org.apache.cxf.sts.request.TokenRequirements;
 import 
org.apache.cxf.ws.security.sts.provider.model.secext.BinarySecurityTokenType;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
-import org.apache.wss4j.dom.WSConstants;
 
 
 /**
@@ -88,7 +88,7 @@ public class X509TokenValidatorTest extends org.junit.Assert {
         assertTrue(validatorResponse.getToken() != null);
         assertTrue(validatorResponse.getToken().getState() == STATE.INVALID);
 
-        binarySecurityToken.setEncodingType(WSConstants.SOAPMESSAGE_NS + 
"#Base64Binary");
+        binarySecurityToken.setEncodingType(WSS4JConstants.SOAPMESSAGE_NS + 
"#Base64Binary");
 
         validatorResponse = 
x509TokenValidator.validateToken(validatorParameters);
         assertTrue(validatorResponse.getToken() != null);
@@ -122,7 +122,7 @@ public class X509TokenValidatorTest extends 
org.junit.Assert {
 
         
binarySecurityToken.setValue(Base64.getMimeEncoder().encodeToString(certs[0].getEncoded()));
         binarySecurityToken.setValueType(X509TokenValidator.X509_V3_TYPE);
-        binarySecurityToken.setEncodingType(WSConstants.SOAPMESSAGE_NS + 
"#Base64Binary");
+        binarySecurityToken.setEncodingType(WSS4JConstants.SOAPMESSAGE_NS + 
"#Base64Binary");
 
         ReceivedToken validateTarget = new ReceivedToken(tokenType);
         tokenRequirements.setValidateTarget(validateTarget);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
index dc0527c..391a591 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
@@ -91,6 +91,7 @@ import org.apache.cxf.ws.security.trust.TrustException;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyComponent;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
@@ -99,7 +100,6 @@ import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.token.Reference;
 import org.apache.wss4j.common.util.DateUtil;
 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.WSSConfig;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -714,7 +714,7 @@ public class SimpleBatchSTSClient implements Configurable, 
InterceptorProvider {
         W3CDOMStreamWriter writer
     ) throws XMLStreamException {
         writer.writeStartElement("wst", "BinaryExchange", namespace);
-        writer.writeAttribute("EncodingType", WSConstants.BASE64_ENCODING);
+        writer.writeAttribute("EncodingType", WSS4JConstants.BASE64_ENCODING);
         writer.writeAttribute("ValueType", namespace + "/spnego");
         writer.writeCharacters(binaryExchange);
         writer.writeEndElement();
@@ -799,12 +799,12 @@ public class SimpleBatchSTSClient implements 
Configurable, InterceptorProvider {
         Instant expirationTime = creationTime.plusSeconds(ttl);
 
         writer.writeStartElement("wst", "Lifetime", namespace);
-        writer.writeNamespace("wsu", WSConstants.WSU_NS);
-        writer.writeStartElement("wsu", "Created", WSConstants.WSU_NS);
+        writer.writeNamespace("wsu", WSS4JConstants.WSU_NS);
+        writer.writeStartElement("wsu", "Created", WSS4JConstants.WSU_NS);
         
writer.writeCharacters(creationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
         writer.writeEndElement();
 
-        writer.writeStartElement("wsu", "Expires", WSConstants.WSU_NS);
+        writer.writeStartElement("wsu", "Expires", WSS4JConstants.WSU_NS);
         
writer.writeCharacters(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
         writer.writeEndElement();
         writer.writeEndElement();
@@ -897,7 +897,7 @@ public class SimpleBatchSTSClient implements Configurable, 
InterceptorProvider {
                 // First check for the binary secret
                 String b64Secret = DOMUtils.getContent(child);
                 secret = Base64.getMimeDecoder().decode(b64Secret);
-            } else if (childQname.equals(new QName(WSConstants.ENC_NS, 
WSConstants.ENC_KEY_LN))) {
+            } else if (childQname.equals(new QName(WSS4JConstants.ENC_NS, 
WSS4JConstants.ENC_KEY_LN))) {
                 secret = decryptKey(child);
             } else if (childQname.equals(new QName(namespace, "ComputedKey"))) 
{
                 // Handle the computed key
@@ -906,7 +906,7 @@ public class SimpleBatchSTSClient implements Configurable, 
InterceptorProvider {
 
                 if (computedKeyChild != null) {
                     QName computedKeyChildQName = 
DOMUtils.getElementQName(computedKeyChild);
-                    if (computedKeyChildQName.equals(new 
QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN))) {
+                    if (computedKeyChildQName.equals(new 
QName(WSS4JConstants.ENC_NS, WSS4JConstants.ENC_KEY_LN))) {
                         serviceEntr = decryptKey(computedKeyChild);
                     } else if (computedKeyChildQName.equals(new 
QName(namespace, "BinarySecret"))) {
                         String content = DOMUtils.getContent(computedKeyChild);
@@ -948,11 +948,11 @@ public class SimpleBatchSTSClient implements 
Configurable, InterceptorProvider {
         if (encryptionAlgorithm != null && 
encryptionAlgorithm.endsWith("spnego#GSS_Wrap")) {
             // Get the CipherValue
             Element tmpE =
-                XMLUtils.getDirectChildElement(child, "CipherData", 
WSConstants.ENC_NS);
+                XMLUtils.getDirectChildElement(child, "CipherData", 
WSS4JConstants.ENC_NS);
             byte[] cipherValue = null;
             if (tmpE != null) {
                 tmpE =
-                    XMLUtils.getDirectChildElement(tmpE, "CipherValue", 
WSConstants.ENC_NS);
+                    XMLUtils.getDirectChildElement(tmpE, "CipherValue", 
WSS4JConstants.ENC_NS);
                 if (tmpE != null) {
                     String content = DOMUtils.getContent(tmpE);
                     cipherValue = Base64.getMimeDecoder().decode(content);
@@ -1054,10 +1054,10 @@ public class SimpleBatchSTSClient implements 
Configurable, InterceptorProvider {
         String id = null;
         if (rst != null) {
             QName elName = DOMUtils.getElementQName(rst);
-            if (elName.equals(new QName(WSConstants.SAML_NS, "Assertion"))
+            if (elName.equals(new QName(WSS4JConstants.SAML_NS, "Assertion"))
                 && rst.hasAttributeNS(null, "AssertionID")) {
                 id = rst.getAttributeNS(null, "AssertionID");
-            } else if (elName.equals(new QName(WSConstants.SAML2_NS, 
"Assertion"))
+            } else if (elName.equals(new QName(WSS4JConstants.SAML2_NS, 
"Assertion"))
                 && rst.hasAttributeNS(null, "ID")) {
                 id = rst.getAttributeNS(null, "ID");
             }
@@ -1072,7 +1072,7 @@ public class SimpleBatchSTSClient implements 
Configurable, InterceptorProvider {
             id = this.getIDFromSTR(rur);
         }
         if (id == null && rst != null) {
-            id = rst.getAttributeNS(WSConstants.WSU_NS, "Id");
+            id = rst.getAttributeNS(WSS4JConstants.WSU_NS, "Id");
         }
         return id;
     }
@@ -1083,8 +1083,8 @@ public class SimpleBatchSTSClient implements 
Configurable, InterceptorProvider {
             return null;
         }
         QName elName = DOMUtils.getElementQName(child);
-        if (elName.equals(new QName(WSConstants.SIG_NS, "KeyInfo"))
-            || elName.equals(new QName(WSConstants.WSSE_NS, "KeyIdentifier"))) 
{
+        if (elName.equals(new QName(WSS4JConstants.SIG_NS, "KeyInfo"))
+            || elName.equals(new QName(WSS4JConstants.WSSE_NS, 
"KeyIdentifier"))) {
             return DOMUtils.getContent(child);
         } else if (elName.equals(Reference.TOKEN)) {
             return child.getAttributeNS(null, "URI");

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
index 496dbaf..045d42b 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java
@@ -29,10 +29,10 @@ import org.apache.cxf.sts.claims.ProcessedClaim;
 import org.apache.cxf.sts.claims.ProcessedClaimCollection;
 import org.apache.cxf.sts.token.provider.AttributeStatementProvider;
 import org.apache.cxf.sts.token.provider.TokenProviderParameters;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.saml.bean.AttributeBean;
 import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
 import org.apache.wss4j.common.saml.builder.SAML2Constants;
-import org.apache.wss4j.dom.WSConstants;
 
 public class CustomAttributeStatementProvider implements 
AttributeStatementProvider {
 
@@ -80,8 +80,8 @@ public class CustomAttributeStatementProvider implements 
AttributeStatementProvi
             AttributeBean attributeBean = new AttributeBean();
 
             URI claimType = claim.getClaimType();
-            if (WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType)
-                || WSConstants.SAML2_NS.equals(tokenType)) {
+            if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType)
+                || WSS4JConstants.SAML2_NS.equals(tokenType)) {
                 attributeBean.setQualifiedName(claimType.toString());
                 attributeBean.setNameFormat(nameFormat);
             } else {

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/CustomUsernameTokenProvider.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/CustomUsernameTokenProvider.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/CustomUsernameTokenProvider.java
index 371a07d..d763090 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/CustomUsernameTokenProvider.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/CustomUsernameTokenProvider.java
@@ -27,7 +27,7 @@ import 
org.apache.cxf.sts.token.provider.TokenProviderParameters;
 import org.apache.cxf.sts.token.provider.TokenProviderResponse;
 import org.apache.cxf.ws.security.sts.provider.STSException;
 import org.apache.cxf.ws.security.tokenstore.SecurityToken;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.dom.message.token.UsernameToken;
 
 /**
@@ -51,7 +51,7 @@ public class CustomUsernameTokenProvider implements 
TokenProvider {
             Document doc = DOMUtils.createDocument();
 
             // Mock up a UsernameToken
-            UsernameToken usernameToken = new UsernameToken(true, doc, 
WSConstants.PASSWORD_TEXT);
+            UsernameToken usernameToken = new UsernameToken(true, doc, 
WSS4JConstants.PASSWORD_TEXT);
             usernameToken.setName("alice");
             usernameToken.setPassword("password");
             String id = "UT-1234";

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
index 5f46498..2f999bc 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
@@ -34,7 +34,7 @@ import 
org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.tokenstore.SecurityToken;
 import org.apache.cxf.ws.security.trust.STSClient;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
@@ -98,7 +98,7 @@ public class SAMLRenewUnitTest extends 
AbstractBusClientServerTestBase {
 
         // Request the token
         SecurityToken token =
-            requestSecurityToken(bus, wsdlLocation, 
WSConstants.WSS_SAML_TOKEN_TYPE, 2, true);
+            requestSecurityToken(bus, wsdlLocation, 
WSS4JConstants.WSS_SAML_TOKEN_TYPE, 2, true);
         assertNotNull(token);
         // Sleep to expire the token
         Thread.sleep(2100);
@@ -135,7 +135,7 @@ public class SAMLRenewUnitTest extends 
AbstractBusClientServerTestBase {
 
         // Request the token
         SecurityToken token =
-            requestSecurityToken(bus, wsdlLocation, 
WSConstants.WSS_SAML2_TOKEN_TYPE, 2, true);
+            requestSecurityToken(bus, wsdlLocation, 
WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 2, true);
         assertNotNull(token);
         // Sleep to expire the token
         Thread.sleep(2100);
@@ -172,7 +172,7 @@ public class SAMLRenewUnitTest extends 
AbstractBusClientServerTestBase {
 
         // Request the token
         SecurityToken token =
-            requestSecurityToken(bus, wsdlLocation, 
WSConstants.WSS_SAML2_TOKEN_TYPE, 2, false);
+            requestSecurityToken(bus, wsdlLocation, 
WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 2, false);
         assertNotNull(token);
         // Sleep to expire the token
         Thread.sleep(2100);
@@ -202,7 +202,7 @@ public class SAMLRenewUnitTest extends 
AbstractBusClientServerTestBase {
 
         // Request the token
         SecurityToken token =
-            requestSecurityToken(bus, wsdlLocation, 
WSConstants.WSS_SAML_TOKEN_TYPE, 300, false);
+            requestSecurityToken(bus, wsdlLocation, 
WSS4JConstants.WSS_SAML_TOKEN_TYPE, 300, false);
         assertNotNull(token);
 
         // Validate the token
@@ -234,7 +234,7 @@ public class SAMLRenewUnitTest extends 
AbstractBusClientServerTestBase {
 
         // Request the token
         SecurityToken token =
-            requestSecurityToken(bus, wsdlLocation, 
WSConstants.WSS_SAML2_TOKEN_TYPE, 2, true);
+            requestSecurityToken(bus, wsdlLocation, 
WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 2, true);
         assertNotNull(token);
         // Sleep to expire the token
         Thread.sleep(2100);
@@ -265,7 +265,7 @@ public class SAMLRenewUnitTest extends 
AbstractBusClientServerTestBase {
 
         // Request the token
         SecurityToken token =
-            requestSecurityToken(bus, wsdlLocation, 
WSConstants.WSS_SAML_TOKEN_TYPE, 300, false, false);
+            requestSecurityToken(bus, wsdlLocation, 
WSS4JConstants.WSS_SAML_TOKEN_TYPE, 300, false, false);
         assertNotNull(token);
 
         // Validate the token

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
index 3e990b5..86d5c02 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
@@ -45,6 +45,7 @@ import 
org.apache.cxf.sts.token.provider.TokenProviderParameters;
 import org.apache.cxf.sts.token.provider.TokenProviderResponse;
 import org.apache.cxf.sts.token.validator.SCTValidator;
 import org.apache.cxf.ws.security.sts.provider.STSException;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.saml.SAMLCallback;
 import org.apache.wss4j.common.saml.SAMLUtil;
@@ -52,7 +53,6 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
 import org.apache.wss4j.common.saml.bean.ConditionsBean;
 import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.dom.WSConstants;
 
 /**
  * A TokenProvider implementation that provides a SAML Token that contains a 
Symmetric Key that is obtained
@@ -72,8 +72,8 @@ public class SCTSAMLTokenProvider implements TokenProvider {
      * that corresponds to the given TokenType.
      */
     public boolean canHandleToken(String tokenType) {
-        return WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) || 
WSConstants.SAML2_NS.equals(tokenType)
-            || WSConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) || 
WSConstants.SAML_NS.equals(tokenType);
+        return WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) || 
WSS4JConstants.SAML2_NS.equals(tokenType)
+            || WSS4JConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) || 
WSS4JConstants.SAML_NS.equals(tokenType);
     }
 
     public boolean canHandleToken(String tokenType, String realm) {
@@ -104,8 +104,8 @@ public class SCTSAMLTokenProvider implements TokenProvider {
             TokenProviderResponse response = new TokenProviderResponse();
             response.setToken(token);
             String tokenType = tokenRequirements.getTokenType();
-            if (WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType)
-                    || WSConstants.SAML2_NS.equals(tokenType)) {
+            if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType)
+                    || WSS4JConstants.SAML2_NS.equals(tokenType)) {
                 response.setTokenId(token.getAttributeNS(null, "ID"));
             } else {
                 response.setTokenId(token.getAttributeNS(null, "AssertionID"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/SVSubjectProvider.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/SVSubjectProvider.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/SVSubjectProvider.java
index eaab64d..280eb08 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/SVSubjectProvider.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/SVSubjectProvider.java
@@ -20,9 +20,9 @@ package org.apache.cxf.systest.sts.sts_sender_vouches;
 
 import org.apache.cxf.sts.STSConstants;
 import org.apache.cxf.sts.token.provider.DefaultSubjectProvider;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.saml.builder.SAML2Constants;
-import org.apache.wss4j.dom.WSConstants;
 
 /**
  */
@@ -33,8 +33,8 @@ public class SVSubjectProvider extends DefaultSubjectProvider 
{
      */
     @Override
     protected String getSubjectConfirmationMethod(String tokenType, String 
keyType) {
-        if (WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType)
-            || WSConstants.SAML2_NS.equals(tokenType)) {
+        if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType)
+            || WSS4JConstants.SAML2_NS.equals(tokenType)) {
             if (STSConstants.SYMMETRIC_KEY_KEYTYPE.equals(keyType)
                 || STSConstants.PUBLIC_KEY_KEYTYPE.equals(keyType)) {
                 return SAML2Constants.CONF_SENDER_VOUCHES;

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
index 3797bf2..8be3681 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
@@ -45,11 +45,11 @@ import 
org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.tokenstore.SecurityToken;
 import org.apache.cxf.ws.security.trust.STSClient;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
-import org.apache.wss4j.dom.WSConstants;
 import org.junit.BeforeClass;
 
 /**
@@ -175,7 +175,7 @@ public class SAMLDelegationTest extends 
AbstractBusClientServerTestBase {
 
         // Create SAML token
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE,
+            createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE,
                                 crypto, "eve", callbackHandler, "alice", 
"a-issuer");
 
         try {
@@ -208,7 +208,7 @@ public class SAMLDelegationTest extends 
AbstractBusClientServerTestBase {
 
         // Create SAML token
         Element samlToken =
-            createUnsignedSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE,
+            createUnsignedSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, 
STSConstants.BEARER_KEY_KEYTYPE,
                                 "alice", "a-issuer");
 
         try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index c19396f..5c65f16 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -57,6 +57,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.tokenstore.SecurityToken;
 import org.apache.cxf.ws.security.trust.STSClient;
 import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.ext.WSSecurityException;
@@ -64,7 +65,6 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 import org.apache.wss4j.common.saml.OpenSAMLUtil;
 import org.apache.wss4j.common.saml.SAMLKeyInfo;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDocInfo;
 import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.RequestData;
@@ -403,20 +403,20 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 
         //Create SAML token
         Element samlToken =
-            createSAMLAssertion(WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey",
+            createSAMLAssertion(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, 
"mystskey",
                     callbackHandler, null, "alice", "a-issuer");
 
         String id = null;
         QName elName = DOMUtils.getElementQName(samlToken);
-        if (elName.equals(new QName(WSConstants.SAML_NS, "Assertion"))
+        if (elName.equals(new QName(WSS4JConstants.SAML_NS, "Assertion"))
             && samlToken.hasAttributeNS(null, "AssertionID")) {
             id = samlToken.getAttributeNS(null, "AssertionID");
-        } else if (elName.equals(new QName(WSConstants.SAML2_NS, "Assertion"))
+        } else if (elName.equals(new QName(WSS4JConstants.SAML2_NS, 
"Assertion"))
             && samlToken.hasAttributeNS(null, "ID")) {
             id = samlToken.getAttributeNS(null, "ID");
         }
         if (id == null) {
-            id = samlToken.getAttributeNS(WSConstants.WSU_NS, "Id");
+            id = samlToken.getAttributeNS(WSS4JConstants.WSU_NS, "Id");
         }
 
         SecurityToken wstoken = new SecurityToken(id, samlToken, null, null);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
index f7bc2d4..de4e47e 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
@@ -50,7 +50,7 @@ import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.trust.STSClient;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.example.contract.doubleit.DoubleItPortType;
 
 import org.junit.BeforeClass;
@@ -340,7 +340,7 @@ public class SymmetricBindingTest extends 
AbstractBusClientServerTestBase {
         DocumentBuilder db = dbf.newDocumentBuilder();
         Document requestDoc = db.newDocument();
         Element root = 
requestDoc.createElementNS("http://www.example.org/schema/DoubleIt";, 
"ns2:DoubleIt");
-        root.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:ns2", 
"http://www.example.org/schema/DoubleIt";);
+        root.setAttributeNS(WSS4JConstants.XMLNS_NS, "xmlns:ns2", 
"http://www.example.org/schema/DoubleIt";);
         Element number = requestDoc.createElementNS(null, "numberToDouble");
         number.setTextContent("25");
         root.appendChild(number);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
----------------------------------------------------------------------
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index 7e0110b..f2c29d6 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -49,7 +49,7 @@ import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.trust.STSClient;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
@@ -424,7 +424,7 @@ public class TransportBindingTest extends 
AbstractBusClientServerTestBase {
         DocumentBuilder db = dbf.newDocumentBuilder();
         Document requestDoc = db.newDocument();
         Element root = 
requestDoc.createElementNS("http://www.example.org/schema/DoubleIt";, 
"ns2:DoubleIt");
-        root.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:ns2", 
"http://www.example.org/schema/DoubleIt";);
+        root.setAttributeNS(WSS4JConstants.XMLNS_NS, "xmlns:ns2", 
"http://www.example.org/schema/DoubleIt";);
         Element number = requestDoc.createElementNS(null, "numberToDouble");
         number.setTextContent("25");
         root.appendChild(number);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
index 5fbc699..0b8495b 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
@@ -36,7 +36,7 @@ import org.apache.cxf.systest.ws.common.TestParam;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
 import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
@@ -710,7 +710,7 @@ public class CryptoCoverageCheckerTest extends 
AbstractBusClientServerTestBase {
                      
"org.apache.cxf.systest.ws.common.KeystorePasswordCallback");
         outProps.put("encryptionParts",
                      "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;";
-                     + "{Element}{" + WSConstants.WSSE_NS + "}UsernameToken;");
+                     + "{Element}{" + WSS4JConstants.WSSE_NS + 
"}UsernameToken;");
 
         if (test.isStreaming()) {
             SecurityTestUtil.enableStreaming(port);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index 9265290..6f90606 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -40,7 +40,7 @@ import org.apache.cxf.jaxws.DispatchImpl;
 import org.apache.cxf.rt.security.SecurityConstants;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
 
@@ -186,7 +186,7 @@ public class FaultTest extends 
AbstractBusClientServerTestBase {
         DocumentBuilder db = dbf.newDocumentBuilder();
         Document requestDoc = db.newDocument();
         Element root = 
requestDoc.createElementNS("http://www.example.org/schema/DoubleIt";, 
"ns2:DoubleIt");
-        root.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:ns2", 
"http://www.example.org/schema/DoubleIt";);
+        root.setAttributeNS(WSS4JConstants.XMLNS_NS, "xmlns:ns2", 
"http://www.example.org/schema/DoubleIt";);
         Element number = requestDoc.createElementNS(null, "numberToDouble");
         number.setTextContent("25");
         root.appendChild(number);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
index 6423e8a..c28ca50 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
@@ -37,10 +37,10 @@ import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.util.DateUtil;
 import org.apache.wss4j.common.util.XMLUtils;
-import org.apache.wss4j.dom.WSConstants;
 import org.example.contract.doubleit.DoubleItFault;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
@@ -307,9 +307,9 @@ public class ModifiedRequestTest extends 
AbstractBusClientServerTestBase {
                 // Find the Timestamp + change it.
 
                 Element timestampElement =
-                    XMLUtils.findElement(securityHeader, "Timestamp", 
WSConstants.WSU_NS);
+                    XMLUtils.findElement(securityHeader, "Timestamp", 
WSS4JConstants.WSU_NS);
                 Element createdValue =
-                    XMLUtils.findElement(timestampElement, "Created", 
WSConstants.WSU_NS);
+                    XMLUtils.findElement(timestampElement, "Created", 
WSS4JConstants.WSU_NS);
                 
                 ZonedDateTime created = 
ZonedDateTime.parse(createdValue.getTextContent());
                 // Add 5 seconds
@@ -328,7 +328,7 @@ public class ModifiedRequestTest extends 
AbstractBusClientServerTestBase {
         public void modifySecurityHeader(Element securityHeader) {
             if (securityHeader != null) {
                 Element signatureElement =
-                    XMLUtils.findElement(securityHeader, "Signature", 
WSConstants.SIG_NS);
+                    XMLUtils.findElement(securityHeader, "Signature", 
WSS4JConstants.SIG_NS);
 
                 Node firstChild = signatureElement.getFirstChild();
                 while (!(firstChild instanceof Element) && firstChild != null) 
{
@@ -349,9 +349,9 @@ public class ModifiedRequestTest extends 
AbstractBusClientServerTestBase {
         public void modifySecurityHeader(Element securityHeader) {
             if (securityHeader != null) {
                 Element encryptedKey =
-                    XMLUtils.findElement(securityHeader, "EncryptedKey", 
WSConstants.ENC_NS);
+                    XMLUtils.findElement(securityHeader, "EncryptedKey", 
WSS4JConstants.ENC_NS);
                 Element cipherValue =
-                    XMLUtils.findElement(encryptedKey, "CipherValue", 
WSConstants.ENC_NS);
+                    XMLUtils.findElement(encryptedKey, "CipherValue", 
WSS4JConstants.ENC_NS);
                 String cipherText = cipherValue.getTextContent();
 
                 StringBuilder stringBuilder = new StringBuilder(cipherText);
@@ -383,7 +383,7 @@ public class ModifiedRequestTest extends 
AbstractBusClientServerTestBase {
         public void modifySOAPBody(Element soapBody) {
             if (soapBody != null) {
                 Element cipherValue =
-                    XMLUtils.findElement(soapBody, "CipherValue", 
WSConstants.ENC_NS);
+                    XMLUtils.findElement(soapBody, "CipherValue", 
WSS4JConstants.ENC_NS);
                 String cipherText = cipherValue.getTextContent();
 
                 StringBuilder stringBuilder = new StringBuilder(cipherText);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
index c952860..db939a8 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
@@ -33,7 +33,7 @@ import org.apache.neethi.Assertion;
 import org.apache.neethi.AssertionBuilderFactory;
 import org.apache.neethi.Policy;
 import org.apache.neethi.builders.xml.XMLPrimitiveAssertionBuilder;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.policy.SPConstants;
 import org.apache.wss4j.policy.model.AbstractSecurityAssertion;
 import org.apache.wss4j.policy.model.AlgorithmSuite;
@@ -80,7 +80,7 @@ public class MGF256AlgorithmSuiteLoader implements 
AlgorithmSuiteLoader {
                     SPConstants.SHA1,
                     "http://www.w3.org/2009/xmlenc11#aes256-gcm";,
                     SPConstants.KW_AES256,
-                    WSConstants.KEYTRANSPORT_RSAOAEP_XENC11,
+                    WSS4JConstants.KEYTRANSPORT_RSAOAEP_XENC11,
                     SPConstants.P_SHA1_L256,
                     SPConstants.P_SHA1_L192,
                     256, 192, 256, 256, 1024, 4096
@@ -93,14 +93,14 @@ public class MGF256AlgorithmSuiteLoader implements 
AlgorithmSuiteLoader {
                      SPConstants.SHA256,
                      "http://www.w3.org/2009/xmlenc11#aes256-gcm";,
                      SPConstants.KW_AES256,
-                     WSConstants.KEYTRANSPORT_RSAOAEP_XENC11,
+                     WSS4JConstants.KEYTRANSPORT_RSAOAEP_XENC11,
                      SPConstants.P_SHA1_L256,
                      SPConstants.P_SHA1_L192,
                      256, 192, 256, 256, 1024, 4096
                  )
             );
-            
ALGORITHM_SUITE_TYPES.get("Basic256GCMMGFSHA256").setMGFAlgo(WSConstants.MGF_SHA256);
-            
ALGORITHM_SUITE_TYPES.get("Basic256GCMMGFSHA256Digest").setMGFAlgo(WSConstants.MGF_SHA256);
+            
ALGORITHM_SUITE_TYPES.get("Basic256GCMMGFSHA256").setMGFAlgo(WSS4JConstants.MGF_SHA256);
+            
ALGORITHM_SUITE_TYPES.get("Basic256GCMMGFSHA256Digest").setMGFAlgo(WSS4JConstants.MGF_SHA256);
             
ALGORITHM_SUITE_TYPES.get("Basic256GCMMGFSHA256Digest").setEncryptionDigest(SPConstants.SHA256);
         }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
index e4b833d..c9ebc76 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
@@ -47,8 +47,7 @@ import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
 import org.apache.neethi.Constants;
 import org.apache.wss4j.common.ConfigurationConstants;
-import org.apache.wss4j.dom.WSConstants;
-
+import org.apache.wss4j.common.WSS4JConstants;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -394,7 +393,7 @@ public class JavaFirstPolicyServiceTest extends 
AbstractBusClientServerTestBase
 
         Map<String, Object> outProps = new HashMap<>();
         outProps.put(ConfigurationConstants.ACTION, 
ConfigurationConstants.USERNAME_TOKEN);
-        outProps.put(ConfigurationConstants.PASSWORD_TYPE, 
WSConstants.PW_TEXT);
+        outProps.put(ConfigurationConstants.PASSWORD_TYPE, 
WSS4JConstants.PW_TEXT);
         outProps.put(ConfigurationConstants.PW_CALLBACK_REF, callback);
         outProps.put(ConfigurationConstants.USER, username);
         return outProps;
@@ -403,7 +402,7 @@ public class JavaFirstPolicyServiceTest extends 
AbstractBusClientServerTestBase
     private Map<String, Object> getNoPasswordProperties(String username) {
         Map<String, Object> outProps = new HashMap<>();
         outProps.put(ConfigurationConstants.ACTION, 
ConfigurationConstants.USERNAME_TOKEN);
-        outProps.put(ConfigurationConstants.PASSWORD_TYPE, 
WSConstants.PW_NONE);
+        outProps.put(ConfigurationConstants.PASSWORD_TYPE, 
WSS4JConstants.PW_NONE);
         outProps.put(ConfigurationConstants.USER, username);
         return outProps;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
index a5e732b..af991dc 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
@@ -43,13 +43,13 @@ import 
org.apache.cxf.systest.ws.saml.client.SamlRoleCallbackHandler;
 import org.apache.cxf.systest.ws.ut.SecurityHeaderCacheInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.saml.bean.AudienceRestrictionBean;
 import org.apache.wss4j.common.saml.bean.ConditionsBean;
 import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
 import org.apache.wss4j.common.saml.builder.SAML1Constants;
 import org.apache.wss4j.common.saml.builder.SAML2Constants;
-import org.apache.wss4j.dom.WSConstants;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
@@ -1192,7 +1192,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
 
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, 
true);
         
callbackHandler.setSignatureAlgorithm("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";);
-        callbackHandler.setDigestAlgorithm(WSConstants.SHA256);
+        callbackHandler.setDigestAlgorithm(WSS4JConstants.SHA256);
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
         ((BindingProvider)saml2Port).getRequestContext().put(
             SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
index 317d628..60d9cc1 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
@@ -293,7 +293,7 @@ public class WSSCUnitTest extends 
AbstractBusClientServerTestBase {
         algSuitePolicy.addPolicyComponent(algSuitePolicyEa);
         All algSuitePolicyAll = new All();
         algSuitePolicyAll.addAssertion(
-            new PrimitiveAssertion(new QName(SP12Constants.SP_NS, 
SP12Constants.ALGO_SUITE_BASIC128)));
+            new PrimitiveAssertion(new QName(SP12Constants.SP_NS, 
SPConstants.ALGO_SUITE_BASIC128)));
         algSuitePolicyEa.addPolicyComponent(algSuitePolicyAll);
         AlgorithmSuite algorithmSuite = new 
AlgorithmSuite(SPConstants.SPVersion.SP12, algSuitePolicy);
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java
index 64a3b58..f225d73 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java
@@ -33,7 +33,7 @@ import org.apache.neethi.Assertion;
 import org.apache.neethi.AssertionBuilderFactory;
 import org.apache.neethi.Policy;
 import org.apache.neethi.builders.xml.XMLPrimitiveAssertionBuilder;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
 import org.apache.wss4j.policy.SPConstants;
 import org.apache.wss4j.policy.model.AbstractSecurityAssertion;
 import org.apache.wss4j.policy.model.AlgorithmSuite;
@@ -78,7 +78,7 @@ public class SHA512PolicyLoader implements 
AlgorithmSuiteLoader {
                 new AlgorithmSuiteType(
                     "Basic128RsaSha512",
                     "http://www.w3.org/2001/04/xmlenc#sha512";,
-                    WSConstants.AES_128,
+                    WSS4JConstants.AES_128,
                     SPConstants.KW_AES128,
                     SPConstants.KW_RSA_OAEP,
                     SPConstants.P_SHA1_L128,

Reply via email to