This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/saml-refactor-new
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/coheigea/saml-refactor-new by
this push:
new 4333e349d Moving WSDataRef to ws-security-common
4333e349d is described below
commit 4333e349d599ff333c096826c57bf3f2510cd332
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Jun 17 09:23:08 2025 +0100
Moving WSDataRef to ws-security-common
---
.../java/org/apache/wss4j/common}/WSDataRef.java | 2 +-
.../wss4j/dom/engine/WSSecurityEngineResult.java | 71 +++++++++-------------
.../dom/processor/EncryptedAssertionProcessor.java | 2 +-
.../dom/processor/EncryptedDataProcessor.java | 2 +-
.../wss4j/dom/processor/EncryptedKeyProcessor.java | 2 +-
.../dom/processor/ReferenceListProcessor.java | 2 +-
.../wss4j/dom/processor/SAMLTokenProcessor.java | 8 ++-
.../processor/SecurityContextTokenProcessor.java | 4 +-
.../processor/SignatureConfirmationProcessor.java | 4 +-
.../wss4j/dom/processor/SignatureProcessor.java | 2 +-
.../wss4j/dom/processor/TimestampProcessor.java | 4 +-
.../dom/processor/UsernameTokenProcessor.java | 3 +-
.../org/apache/wss4j/dom/saml/DOMSAMLUtil.java | 2 +-
.../org/apache/wss4j/dom/util/EncryptionUtils.java | 2 +-
.../org/apache/wss4j/dom/util/SignatureUtils.java | 2 +-
.../wss4j/dom/message/EncryptionGCMTest.java | 2 +-
.../wss4j/dom/message/EncryptionPartsTest.java | 2 +-
.../apache/wss4j/dom/message/EncryptionTest.java | 2 +-
.../wss4j/dom/message/SignatureEncryptionTest.java | 2 +-
.../wss4j/dom/message/SignaturePartsTest.java | 2 +-
.../dom/processor/EncryptedKeyDataRefTest.java | 2 +-
.../dom/processor/ReferenceListDataRefTest.java | 2 +-
.../apache/wss4j/dom/saml/SamlReferenceTest.java | 2 +-
.../wss4j/dom/saml/SamlTokenDerivedTest.java | 2 +-
.../org/apache/wss4j/dom/saml/SamlTokenSVTest.java | 2 +-
.../wss4j/dom/saml/SignedSamlTokenHOKTest.java | 2 +-
26 files changed, 61 insertions(+), 73 deletions(-)
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDataRef.java
b/ws-security-common/src/main/java/org/apache/wss4j/common/WSDataRef.java
similarity index 99%
rename from ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDataRef.java
rename to
ws-security-common/src/main/java/org/apache/wss4j/common/WSDataRef.java
index b5c9dddd9..8ddd6ab5b 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDataRef.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/WSDataRef.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom;
+package org.apache.wss4j.common;
/**
* WSDataRef stores information about decrypted/signed elements
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngineResult.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngineResult.java
index 885f92610..089917a9b 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngineResult.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngineResult.java
@@ -19,13 +19,9 @@
package org.apache.wss4j.dom.engine;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.common.token.BinarySecurity;
-import org.apache.wss4j.dom.WSDataRef;
-import org.apache.wss4j.dom.message.token.SecurityContextToken;
-import org.apache.wss4j.dom.message.token.SignatureConfirmation;
-import org.apache.wss4j.dom.message.token.Timestamp;
-import org.apache.wss4j.dom.message.token.UsernameToken;
+import org.w3c.dom.Element;
import java.security.Principal;
import java.security.cert.X509Certificate;
@@ -239,16 +235,6 @@ public class WSSecurityEngineResult extends
java.util.HashMap<String, Object> {
put(TAG_ACTION, act);
}
- public WSSecurityEngineResult(
- int act,
- SamlAssertionWrapper ass
- ) {
- put(TAG_ACTION, act);
- put(TAG_SAML_ASSERTION, ass);
- put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
- put(TAG_TOKEN_ELEMENT, ass.getElement());
- }
-
public WSSecurityEngineResult(
int act,
Principal princ,
@@ -314,49 +300,48 @@ public class WSSecurityEngineResult extends
java.util.HashMap<String, Object> {
put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
}
- public WSSecurityEngineResult(int act, Timestamp tstamp) {
+ public WSSecurityEngineResult(int act, BinarySecurity token,
X509Certificate[] certs) {
put(TAG_ACTION, act);
- put(TAG_TIMESTAMP, tstamp);
+ put(TAG_BINARY_SECURITY_TOKEN, token);
+ put(TAG_X509_CERTIFICATES, certs);
+ if (certs != null && certs.length > 0) {
+ put(TAG_X509_CERTIFICATE, certs[0]);
+ }
put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
- put(TAG_TOKEN_ELEMENT, tstamp.getElement());
+ put(TAG_TOKEN_ELEMENT, token.getElement());
}
- public WSSecurityEngineResult(int act, SecurityContextToken sct) {
- put(TAG_ACTION, act);
- put(TAG_SECURITY_CONTEXT_TOKEN, sct);
+ public void addSAMLAssertionResult(
+ Object assertion,
+ Element assertionElement
+ ) {
+ put(TAG_SAML_ASSERTION, assertion);
put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
- put(TAG_TOKEN_ELEMENT, sct.getElement());
+ put(TAG_TOKEN_ELEMENT, assertionElement);
}
- public WSSecurityEngineResult(int act, SignatureConfirmation sc) {
- put(TAG_ACTION, act);
- put(TAG_SIGNATURE_CONFIRMATION, sc);
+ public void addTimestampResult(Object tstamp, Element tstampElement) {
+ put(TAG_TIMESTAMP, tstamp);
put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
- put(TAG_TOKEN_ELEMENT, sc.getElement());
+ put(TAG_TOKEN_ELEMENT, tstampElement);
}
- public WSSecurityEngineResult(int act, UsernameToken usernameToken) {
- this(act, usernameToken, null);
+ public void addSecurityContextTokenResult(Object sct, Element sctElement) {
+ put(TAG_SECURITY_CONTEXT_TOKEN, sct);
+ put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
+ put(TAG_TOKEN_ELEMENT, sctElement);
}
- public WSSecurityEngineResult(int act, UsernameToken usernameToken,
Principal principal) {
- put(TAG_ACTION, act);
- put(TAG_USERNAME_TOKEN, usernameToken);
- put(TAG_PRINCIPAL, principal);
+ public void addSignatureConfirmationResult(Object sc, Element scElement) {
+ put(TAG_SIGNATURE_CONFIRMATION, sc);
put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
- put(TAG_TOKEN_ELEMENT, usernameToken.getElement());
+ put(TAG_TOKEN_ELEMENT, scElement);
}
- public WSSecurityEngineResult(int act, BinarySecurity token,
X509Certificate[] certs) {
- put(TAG_ACTION, act);
- put(TAG_BINARY_SECURITY_TOKEN, token);
- put(TAG_X509_CERTIFICATES, certs);
- if (certs != null && certs.length > 0) {
- put(TAG_X509_CERTIFICATE, certs[0]);
- }
+ public void addUsernameTokenResult(Object usernameToken, Element
usernameTokenElement) {
+ put(TAG_USERNAME_TOKEN, usernameToken);
put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
- put(TAG_TOKEN_ELEMENT, token.getElement());
+ put(TAG_TOKEN_ELEMENT, usernameTokenElement);
}
-
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java
index 2faad4365..2166880bd 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Node;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
index 44763811e..3a545bec3 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
@@ -37,7 +37,7 @@ import
org.apache.wss4j.common.principal.WSDerivedKeyTokenPrincipal;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
index 8f3028da5..4831192ec 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
@@ -62,7 +62,7 @@ import org.apache.wss4j.common.token.SecurityTokenReference;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.WSDocInfo;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
index aa062bfac..ca77057bc 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
@@ -40,7 +40,7 @@ import org.apache.wss4j.common.token.SecurityTokenReference;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.str.STRParser;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
index 491c655d9..7457f95e0 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
@@ -44,7 +44,7 @@ import org.apache.wss4j.common.saml.SAMLUtil;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor;
@@ -117,11 +117,13 @@ public class SAMLTokenProcessor implements Processor {
data.getWsDocInfo().addTokenElement(elem);
WSSecurityEngineResult result = null;
if (samlAssertion.isSigned()) {
- result = new WSSecurityEngineResult(WSConstants.ST_SIGNED,
samlAssertion);
+ result = new WSSecurityEngineResult(WSConstants.ST_SIGNED);
+ result.addSAMLAssertionResult(samlAssertion,
samlAssertion.getElement());
result.put(WSSecurityEngineResult.TAG_DATA_REF_URIS, dataRefs);
result.put(WSSecurityEngineResult.TAG_SIGNATURE_VALUE,
samlAssertion.getSignatureValue());
} else {
- result = new WSSecurityEngineResult(WSConstants.ST_UNSIGNED,
samlAssertion);
+ result = new WSSecurityEngineResult(WSConstants.ST_UNSIGNED);
+ result.addSAMLAssertionResult(samlAssertion,
samlAssertion.getElement());
}
if (id.length() != 0) {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java
index ae1db72e9..c0fd59b30 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java
@@ -52,8 +52,8 @@ public class SecurityContextTokenProcessor implements
Processor {
Validator validator =
data.getValidator(new QName(elem.getNamespaceURI(),
elem.getLocalName()));
- WSSecurityEngineResult result =
- new WSSecurityEngineResult(WSConstants.SCT, sct);
+ WSSecurityEngineResult result = new
WSSecurityEngineResult(WSConstants.SCT);
+ result.addSecurityContextTokenResult(sct, sct.getElement());
if (validator != null) {
// Hook to allow the user to validate the SecurityContextToken
Credential credential = new Credential();
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
index cbf850260..34af51ca9 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
@@ -42,8 +42,8 @@ public class SignatureConfirmationProcessor implements
Processor {
//
SignatureConfirmation sigConf = new SignatureConfirmation(elem,
data.getBSPEnforcer());
- WSSecurityEngineResult result =
- new WSSecurityEngineResult(WSConstants.SC, sigConf);
+ WSSecurityEngineResult result = new
WSSecurityEngineResult(WSConstants.SC);
+ result.addSignatureConfirmationResult(sigConf, sigConf.getElement());
String tokenId = sigConf.getID();
if (tokenId.length() != 0) {
result.put(WSSecurityEngineResult.TAG_ID, tokenId);
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
index 2f2a55490..14f80dc76 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
@@ -62,7 +62,7 @@ import org.apache.wss4j.common.token.SecurityTokenReference;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.WSDocInfo;
import org.apache.wss4j.dom.callback.CallbackLookup;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
index c6d2fbe80..3ad92d2c9 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
@@ -46,8 +46,8 @@ public class TimestampProcessor implements Processor {
Credential credential = new Credential();
credential.setTimestamp(timestamp);
- WSSecurityEngineResult result =
- new WSSecurityEngineResult(WSConstants.TS, timestamp);
+ WSSecurityEngineResult result = new
WSSecurityEngineResult(WSConstants.TS);
+ result.addTimestampResult(timestamp, timestamp.getElement());
String tokenId = timestamp.getID();
if (tokenId.length() != 0) {
result.put(WSSecurityEngineResult.TAG_ID, tokenId);
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
index ea3835f97..903ede996 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
@@ -74,7 +74,8 @@ public class UsernameTokenProcessor implements Processor {
secretKey = token.getDerivedKey(data.getBSPEnforcer(),
rawPassword);
}
}
- WSSecurityEngineResult result = new WSSecurityEngineResult(action,
token);
+ WSSecurityEngineResult result = new WSSecurityEngineResult(action);
+ result.addUsernameTokenResult(token, token.getElement());
String tokenId = token.getID();
if (tokenId.length() != 0) {
result.put(WSSecurityEngineResult.TAG_ID, tokenId);
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
index 9ebaadad8..e128e7639 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
@@ -33,7 +33,7 @@ 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.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.w3c.dom.Element;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
index f01f07a1b..956867f1e 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
@@ -26,7 +26,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.AttachmentUtils;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.WSDocInfo;
import org.apache.wss4j.dom.callback.CallbackLookup;
import org.apache.xml.security.algorithms.JCEMapper;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/SignatureUtils.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/SignatureUtils.java
index 343797912..14c53d367 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/SignatureUtils.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/SignatureUtils.java
@@ -26,7 +26,7 @@ import java.util.Set;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.WSDocInfo;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.w3c.dom.Element;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
index 40c210f04..e109fbd92 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
@@ -26,7 +26,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
index ae041a67e..f50837fcd 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
@@ -21,7 +21,7 @@ package org.apache.wss4j.dom.message;
import org.apache.wss4j.common.SOAPConstants;
import org.apache.wss4j.common.util.SOAPUtil;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
index 9bca837c1..5d0b02fc1 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
@@ -39,7 +39,7 @@ import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.*;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SecretKeyCallbackHandler;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
index 38ef0c49f..5c5beccf1 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
@@ -21,7 +21,7 @@ package org.apache.wss4j.dom.message;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
index 073e28172..a4bae3241 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
@@ -23,7 +23,7 @@ import org.apache.wss4j.common.SOAPConstants;
import org.apache.wss4j.common.WSEncryptionPart;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
index 1bc712238..3807811f6 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
@@ -27,7 +27,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
index ea7a40fa9..33f842c04 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
@@ -27,7 +27,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
index d19e724d2..9e93f025d 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
@@ -23,7 +23,7 @@ import org.apache.wss4j.common.WSEncryptionPart;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
index 44dae2cbb..97117b1fc 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
@@ -37,7 +37,7 @@ import org.apache.wss4j.common.token.SecurityTokenReference;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
index 4e541994f..aaefe4815 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
@@ -22,7 +22,7 @@ package org.apache.wss4j.dom.saml;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
index f556528d1..19ff7ff43 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
@@ -22,7 +22,7 @@ package org.apache.wss4j.dom.saml;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSDataRef;
+import org.apache.wss4j.common.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
